From b166ec2361980aeb9f288125afd5716099a21f7c Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 10 Jul 2014 12:42:05 +0200 Subject: solve TrustManagerRevocationCheck problem with legacy config import --- .../at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java index 864be253a..1240ed8f3 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java @@ -151,6 +151,8 @@ public class BuildFromLegacyConfig { if (genericConfiguration.containsKey(ConfigurationProvider.TRUST_MANAGER_REVOCATION_CHECKING)) authGeneral.setTrustManagerRevocationChecking( Boolean.valueOf((String)genericConfiguration.get(ConfigurationProvider.TRUST_MANAGER_REVOCATION_CHECKING))); + else + authGeneral.setTrustManagerRevocationChecking(true); if (genericConfiguration.containsKey(ConfigurationProvider.DIRECTORY_CERTSTORE_PARAMETER_PROPERTY)) authGeneral.setCertStoreDirectory( -- cgit v1.2.3 From 96407baacd66fef7f3581a5377180a152795bd78 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 14 Jul 2014 09:02:30 +0200 Subject: add additionl trustmanagerrevoationchecking default value --- .../gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java | 3 ++- .../java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java | 2 +- .../gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java index 681641834..f29780f05 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java @@ -159,7 +159,8 @@ public class GeneralMOAIDConfig { if (authgen != null) { alternativeSourceID = authgen.getAlternativeSourceID(); certStoreDirectory = authgen.getCertStoreDirectory(); - trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking(); + if (authgen.isTrustManagerRevocationChecking() != null) + trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking(); publicURLPrefix = authgen.getPublicURLPreFix(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java index 88ed7885f..24def1e02 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java @@ -124,7 +124,7 @@ public class ConfigurationProvider { protected String certstoreDirectory; - protected boolean trustmanagerrevoationchecking; + protected boolean trustmanagerrevoationchecking = true; /** * Returns the main configuration file directory used to configure MOA-ID diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java index 6fc1d28c1..32625ca03 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java @@ -1038,10 +1038,11 @@ public class AuthConfigurationProvider extends ConfigurationProvider { private void setTrustManagerRevocationChecking() throws ConfigurationException { AuthComponentGeneral auth = getAuthComponentGeneral(); - if (auth.getGeneralConfiguration() != null) + if (auth.getGeneralConfiguration() != null && + auth.getGeneralConfiguration().isTrustManagerRevocationChecking() != null) trustmanagerrevoationchecking = auth.getGeneralConfiguration().isTrustManagerRevocationChecking(); else { - Logger.warn("Error in MOA-ID Configuration. No CertStoreDirectory defined."); + Logger.warn("No TrustMangerRevoationChecking defined. Use default value = TRUE"); throw new ConfigurationException("config.02", null); } } -- cgit v1.2.3 From a25c112bc34957cdaaf7dbb950c229666da52499 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 15 Jul 2014 12:32:46 +0200 Subject: solve Sub-Target problems in MOA-ID-Configuration --- .../data/oa/OATargetConfiguration.java | 23 ++++++++++++++++++++-- .../webapp/jsp/snippets/OA/targetConfiguration.jsp | 4 ++-- pom.xml | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java index e988cc292..550844700 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java @@ -83,7 +83,6 @@ public class OATargetConfiguration implements IOnlineApplicationData { @Override public List parse(OnlineApplication dbOA, AuthenticatedUser authUser, HttpServletRequest request) { - subTargetSet = MiscUtil.isNotEmpty(getTarget_subsector()); String target_full = dbOA.getTarget(); if (MiscUtil.isNotEmpty(target_full)) { @@ -95,8 +94,10 @@ public class OATargetConfiguration implements IOnlineApplicationData { if (TargetValidator.isValidTarget(target_split[0])) { target = target_split[0]; - if (target_split.length > 1) + if (target_split.length > 1) { target_subsector = target_split[1]; + subTargetSet = true; + } } else { target = ""; @@ -367,4 +368,22 @@ public class OATargetConfiguration implements IOnlineApplicationData { public void setDeaktivededBusinessService(boolean deaktivededBusinessService) { this.deaktivededBusinessService = deaktivededBusinessService; } + + + /** + * @return the subTargetSet + */ + public boolean isSubTargetSet() { + return subTargetSet; + } + + + /** + * @param subTargetSet the subTargetSet to set + */ + public void setSubTargetSet(boolean subTargetSet) { + this.subTargetSet = subTargetSet; + } + + } diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp index 261966a86..b8bd1dc02 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp @@ -46,8 +46,8 @@ - 2.1.0 2.0.0 2.0.1 - 1.1.0 + 1.1.0.1 2.0.2 -- cgit v1.2.3 From 234f17d14f9f48655c27d54114df0aa2593cf6d8 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 18 Jul 2014 08:28:37 +0200 Subject: add gitignore file --- .gitignore | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..80cf5e7da --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +bin +gen +target +*~ +*.orig +*.log +.settings +.project +.classpath +.directory +.checkstyle -- cgit v1.2.3 From a9a7499e0158f437e26e20cb2a489f2d47281ea7 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 16 Sep 2014 16:49:25 +0200 Subject: solve problem with xml-apis.jar and xercesImpl.jar --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4010333eb..cac36a91c 100644 --- a/pom.xml +++ b/pom.xml @@ -445,7 +445,7 @@ xerces xercesImpl - 2.11.0 + 2.9.1 compile PVP SecClass mapping --- .../resources/resources/properties/pvp-stork_mapping.properties | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties b/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties index 1a8d8db58..a953d72e5 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties @@ -1,15 +1,19 @@ ##PVP role mapping viewer=CIRCABC/viewer CIRCABC-viewer=CIRCABC/viewer +CIRCABC-IGLeader=CIRCABC/IGLeader +CIRCABC-Secretary=CIRCABC/Secretary +CIRCABC-Access=CIRCABC/Access + ##PVP SecClass to STORK-QAA mapping secclass/0=http://www.stork.gov.eu/1.0/citizenQAALevel/1 secclass/0-1=http://www.stork.gov.eu/1.0/citizenQAALevel/2 -secclass/0-2=http://www.stork.gov.eu/1.0/citizenQAALevel/3 +secclass/0-2=http://www.stork.gov.eu/1.0/citizenQAALevel/4 secclass/0-3=http://www.stork.gov.eu/1.0/citizenQAALevel/4 ##STORK-QAA to PVP SecClass mapping citizenQAALevel/1=http://www.ref.gv.at/ns/names/agiz/pvp/secclass/0 citizenQAALevel/2=http://www.ref.gv.at/ns/names/agiz/pvp/secclass/0-1 citizenQAALevel/3=http://www.ref.gv.at/ns/names/agiz/pvp/secclass/0-2 -citizenQAALevel/4=http://www.ref.gv.at/ns/names/agiz/pvp/secclass/0-3 \ No newline at end of file +citizenQAALevel/4=http://www.ref.gv.at/ns/names/agiz/pvp/secclass/0-2 \ No newline at end of file -- cgit v1.2.3 From 856502356028dc85e19e1b47e0cc569095404c6e Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 07:46:05 +0100 Subject: add additional role mappping --- .../resources/properties/pvp-stork_mapping.properties | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties b/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties index a953d72e5..b552118d4 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties @@ -5,6 +5,16 @@ CIRCABC-IGLeader=CIRCABC/IGLeader CIRCABC-Secretary=CIRCABC/Secretary CIRCABC-Access=CIRCABC/Access +ecas-demo-EUROPEAN_COMMISSION=ecas-demo/EUROPEAN_COMMISSION +ecas-demo-EXTERNAL_INTRAMUROS=ecas-demo/EXTERNAL_INTRAMUROS +ecas-demo-INTERNET=ecas-demo/INTERNET +ecas-demo-LIVENEWS=ecas-demo/LIVENEWS + +DIGIT-EUROPEAN_COMMISSION=DIGIT/EUROPEAN_COMMISSION +DIGIT-EXTERNAL_INTRAMUROS=DIGIT/EXTERNAL_INTRAMUROS +DIGIT-INTERNET=DIGIT/INTERNET +DIGIT-LIVENEWS=DIGIT/LIVENEWS + ##PVP SecClass to STORK-QAA mapping secclass/0=http://www.stork.gov.eu/1.0/citizenQAALevel/1 -- cgit v1.2.3 From b39bc0239d1e4a4d4a8b0fe708ee24c7709b9454 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 08:14:16 +0100 Subject: add MSOrganisation attribute for ISA 1.18 --- .../conf/moa-id/stork/StorkSamlEngine_VIDP.xml | 1 + .../conf/moa-id/stork/StorkSamlEngine_incoming.xml | 6 ++++- .../moa-id/stork/StorkSamlEngine_incoming_attr.xml | 6 ++++- .../conf/moa-id/stork/StorkSamlEngine_outgoing.xml | 4 ++++ .../id/auth/builder/AuthenticationDataBuilder.java | 6 +++++ .../moa/id/data/AuthenticationData.java | 28 ++++++++++++++-------- .../at/gv/egovernment/moa/id/data/IAuthData.java | 7 ++++-- .../id/protocols/stork2/MOAAttributeProvider.java | 8 +++++-- .../moa/id/protocols/stork2/STORKPVPUtilits.java | 2 +- 9 files changed, 51 insertions(+), 17 deletions(-) diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml index ee4c636ce..b45b69054 100644 --- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml +++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml @@ -119,5 +119,6 @@ http://www.stork.gov.eu/1.1/ECApplicationRole + http://www.stork.gov.eu/1.1/MSOrganization diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml index 83e69ac23..3370978b3 100644 --- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml +++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming.xml @@ -90,5 +90,9 @@ http://www.stork.gov.eu/1.0/mandateContent http://www.stork.gov.eu/1.0/representative http://www.stork.gov.eu/1.0/represented - + + + http://www.stork.gov.eu/1.1/ECApplicationRole + http://www.stork.gov.eu/1.1/MSOrganization + diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml index 83e69ac23..33437c110 100644 --- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml +++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_incoming_attr.xml @@ -90,5 +90,9 @@ http://www.stork.gov.eu/1.0/mandateContent http://www.stork.gov.eu/1.0/representative http://www.stork.gov.eu/1.0/represented - + + + http://www.stork.gov.eu/1.1/ECApplicationRole + http://www.stork.gov.eu/1.1/MSOrganization + diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml index b095b9e7e..2b0c05b88 100644 --- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml +++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_outgoing.xml @@ -91,4 +91,8 @@ http://www.stork.gov.eu/1.0/representative http://www.stork.gov.eu/1.0/represented + + http://www.stork.gov.eu/1.1/ECApplicationRole + http://www.stork.gov.eu/1.1/MSOrganization + \ No newline at end of file diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java index bae5bb1f6..731925c1b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java @@ -767,6 +767,12 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { } } + //set PVP OU attribute + if (extractor.containsAttribute(PVPConstants.OU_NAME)) { + authData.setPvpAttribute_OU(extractor.getSingleAttributeValue(PVPConstants.OU_NAME)); + Logger.debug("Found PVP 'OU' attribute in response -> " + authData.getPvpAttribute_OU()); + + } //set STORK attributes if (extractor.containsAttribute(PVPConstants.EID_STORK_TOKEN_NAME)) { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java index 65c413ef9..05b008515 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java @@ -133,7 +133,9 @@ public class AuthenticationData implements IAuthData, Serializable { private String authBlock = null; private List encbPKList = null; + //ISA 1.18 attributes private List roles = null; + private String pvpAttribute_OU = null; private boolean useMandate = false; private MISMandate mandate = null; @@ -707,6 +709,7 @@ public class AuthenticationData implements IAuthData, Serializable { return roles; } + //ISA 1.18 attributes /** * @param roles the roles to set */ @@ -716,26 +719,31 @@ public class AuthenticationData implements IAuthData, Serializable { this.roles.add(role); } + + /** + * @return the pvpAttribute_OU + */ + public String getPvpAttribute_OU() { + return pvpAttribute_OU; + } + + /** + * @param pvpAttribute_OU the pvpAttribute_OU to set + */ + public void setPvpAttribute_OU(String pvpAttribute_OU) { + this.pvpAttribute_OU = pvpAttribute_OU; + } /* (non-Javadoc) * @see at.gv.egovernment.moa.id.data.IAuthData#isBusinessService() */ @Override public boolean isBusinessService() { - // TODO Auto-generated method stub return this.businessService; } public void setIsBusinessService(boolean flag) { this.businessService = flag; - } - - - - - - - - + } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java index ebbf62ce7..ccc90a031 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/IAuthData.java @@ -69,7 +69,9 @@ public interface IAuthData { IdentityLink getIdentityLink(); byte[] getSignerCertificate(); String getAuthBlock(); - + + //ISA 1.18 attributes + String getPvpAttribute_OU(); List getAuthenticationRoles(); boolean isPublicAuthority(); @@ -90,5 +92,6 @@ public interface IAuthData { String getCcc(); STORKAuthnRequest getStorkAuthnRequest(); String getStorkAuthnResponse(); - IPersonalAttributeList getStorkAttributes(); + IPersonalAttributeList getStorkAttributes(); + } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java index 755102bf3..499265319 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java @@ -59,13 +59,17 @@ public class MOAAttributeProvider { static { Map tempSimpleMap = new HashMap(); tempSimpleMap.put("givenName", "getGivenName"); - tempSimpleMap.put("surname", "getFamilyName"); + tempSimpleMap.put("surname", "getFamilyName"); + tempSimpleMap.put("MSOrganization", "getPvpAttribute_OU"); storkAttributeSimpleMapping = Collections.unmodifiableMap(tempSimpleMap); + Map tempFunctionMap = new HashMap(); tempFunctionMap.put("eIdentifier", "geteIdentifier"); tempFunctionMap.put("ECApplicationRole","getECApplicationRole"); tempFunctionMap.put("dateOfBirth", "getFormatedDateOfBirth"); + tempFunctionMap.put("MSOrganization", "getMSOrganization"); storkAttributeFunctionMapping = Collections.unmodifiableMap(tempFunctionMap); + } public MOAAttributeProvider(IAuthData authData, MOASTORKRequest moastorkRequest) { @@ -129,7 +133,7 @@ public class MOAAttributeProvider { } return storkRoles; } - + private String getFormatedDateOfBirth() { if (authData.getDateOfBirth() != null) { DateFormat fmt = new SimpleDateFormat("yyyyMMdd"); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKPVPUtilits.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKPVPUtilits.java index d923eccde..123d32af4 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKPVPUtilits.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKPVPUtilits.java @@ -32,7 +32,7 @@ import java.util.List; public class STORKPVPUtilits { public static final List attributesRequirePVPAuthentication = - Arrays.asList("ECApplicationRole"); + Arrays.asList("ECApplicationRole", "MSOrganization"); -- cgit v1.2.3 From 50416e97cfe3c633cf3e146b85856bc0b418bfd0 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 08:15:53 +0100 Subject: use OA target from request, if SAML1 is used. for legacy applications --- .../id/auth/parser/StartAuthentificationParameterParser.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java index 1bc3702e4..a123569d5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java @@ -132,12 +132,13 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{ String targetFriendlyNameConfig = oaParam.getTargetFriendlyName(); if (StringUtils.isEmpty(targetConfig) -// || (module.equals(SAML1Protocol.PATH) && -// !StringUtils.isEmpty(target)) + || (module.equals(SAML1Protocol.PATH) && + !StringUtils.isEmpty(target)) ) { - // no target attribut is given in OA config - // target is used from request - // check parameter + //INFO: ONLY SAML1 legacy mode + // if SAML1 is used and target attribute is given in request + // use requested target + // check target parameter if (!ParamValidatorUtils.isValidTarget(target)) { Logger.error("Selected target is invalid. Using target: " + target); throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.12"); -- cgit v1.2.3 From 306b421d07f29ed6a0e6a009a38c2f558a7e310d Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 09:29:34 +0100 Subject: fix configTool list OA problem --- .../at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java index 150483dd8..b66bf878a 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java @@ -60,7 +60,8 @@ public class FormDataHelper { for (OnlineApplication dboa : dbOAs) { - if ( !((dboa.isIsInterfederationIDP() != null && dboa.isIsInterfederationIDP()) || + if ( !((dboa.isIsInterfederationIDP() != null && dboa.isIsInterfederationIDP()) || + (dboa.isIsInterfederationGateway() != null && dboa.isIsInterfederationGateway()) || (dboa.getAuthComponentOA().getOASTORK() != null && dboa.getAuthComponentOA().getOASTORK().isVidpEnabled() != null && dboa.getAuthComponentOA().getOASTORK().isVidpEnabled()))) { -- cgit v1.2.3 From 720477bf5951aa4a307e1150e8a34d373f66e62b Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 09:29:51 +0100 Subject: fix problem with SLO and interfederation --- .../pvp2x/builder/SingleLogOutBuilder.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/SingleLogOutBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/SingleLogOutBuilder.java index 01139d95c..50f42d928 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/SingleLogOutBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/SingleLogOutBuilder.java @@ -43,6 +43,7 @@ import org.opensaml.saml2.core.StatusCode; import org.opensaml.saml2.core.StatusMessage; import org.opensaml.saml2.core.StatusResponseType; import org.opensaml.saml2.metadata.EntityDescriptor; +import org.opensaml.saml2.metadata.IDPSSODescriptor; import org.opensaml.saml2.metadata.SPSSODescriptor; import org.opensaml.saml2.metadata.SSODescriptor; import org.opensaml.saml2.metadata.SingleLogoutService; @@ -348,17 +349,29 @@ public class SingleLogOutBuilder { public static SingleLogoutService getResponseSLODescriptor(PVPTargetConfiguration spRequest) throws NoMetadataInformationException, NOSLOServiceDescriptorException { MOARequest moaReq = (MOARequest) spRequest.getRequest(); EntityDescriptor metadata = moaReq.getEntityMetadata(); - SPSSODescriptor spsso = metadata.getSPSSODescriptor(SAMLConstants.SAML20P_NS); + SSODescriptor ssodesc = metadata.getSPSSODescriptor(SAMLConstants.SAML20P_NS); + + if (ssodesc == null) { + Logger.debug("No PVP SPSSO descriptor found --> search IDPSSO descriptor"); + ssodesc = metadata.getIDPSSODescriptor(SAMLConstants.SAML20P_NS); + + } + + if (ssodesc == null) { + Logger.error("Found no SLO ServiceDescriptor in Metadata"); + throw new NOSLOServiceDescriptorException("NO SLO ServiceDescriptor", null); + } + SingleLogoutService sloService = null; - for (SingleLogoutService el : spsso.getSingleLogoutServices()) { + for (SingleLogoutService el : ssodesc.getSingleLogoutServices()) { if (el.getBinding().equals(spRequest.getBinding())) sloService = el; } if (sloService == null) { - if (spsso.getSingleLogoutServices().size() != 0) - sloService = spsso.getSingleLogoutServices().get(0); + if (ssodesc.getSingleLogoutServices().size() != 0) + sloService = ssodesc.getSingleLogoutServices().get(0); else { Logger.error("Found no SLO ServiceDescriptor in Metadata"); -- cgit v1.2.3 From 539feb77b1244e691f1735403a5c040cf11ebd9f Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 09:54:56 +0100 Subject: send SLO success statuscode if no active SSO session is found - no SSO session cookie - no SP information in session database for requested nameID --- .../egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java index b22941216..aa154b84b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java @@ -135,8 +135,10 @@ public class SingleLogOutAction implements IAction { if (MiscUtil.isEmpty(ssoID)) { Logger.warn("Can not find active Session. Single LogOut not possible!"); SingleLogoutService sloService = SingleLogOutBuilder.getResponseSLODescriptor(pvpReq); - LogoutResponse message = SingleLogOutBuilder.buildSLOErrorResponse(sloService, pvpReq, StatusCode.RESPONDER_URI); - SingleLogOutBuilder.sendFrontChannelSLOMessage(sloService, message, httpReq, httpResp, samlReq.getRelayState()); + //LogoutResponse message = SingleLogOutBuilder.buildSLOErrorResponse(sloService, pvpReq, StatusCode.RESPONDER_URI); + LogoutResponse message = SingleLogOutBuilder.buildSLOResponseMessage(sloService, pvpReq, null); + Logger.info("Sending SLO success message to requester ..."); + SingleLogOutBuilder.sendFrontChannelSLOMessage(sloService, message, httpReq, httpResp, samlReq.getRelayState()); return null; } else { @@ -147,7 +149,9 @@ public class SingleLogOutAction implements IAction { } catch (MOADatabaseException e) { Logger.warn("Can not find active Session. Single LogOut not possible!"); SingleLogoutService sloService = SingleLogOutBuilder.getResponseSLODescriptor(pvpReq); - LogoutResponse message = SingleLogOutBuilder.buildSLOErrorResponse(sloService, pvpReq, StatusCode.RESPONDER_URI); + //LogoutResponse message = SingleLogOutBuilder.buildSLOErrorResponse(sloService, pvpReq, StatusCode.RESPONDER_URI); + LogoutResponse message = SingleLogOutBuilder.buildSLOResponseMessage(sloService, pvpReq, null); + Logger.info("Sending SLO success message to requester ..."); SingleLogOutBuilder.sendFrontChannelSLOMessage(sloService, message, httpReq, httpResp, samlReq.getRelayState()); return null; -- cgit v1.2.3 From a904d1ef6313a7d510882ada132f7e90b39a0c64 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 14:33:54 +0100 Subject: fix possible problems with PVP roles and role parameters --- .../moa/id/data/AuthenticationRoleFactory.java | 35 +++++++++++++--------- .../egovernment/moa/id/util/PVPtoSTORKMapper.java | 9 ++++-- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java index 8915b2442..b3b29f6c5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; /** * @author tlenz @@ -51,23 +52,29 @@ public class AuthenticationRoleFactory { List param = Arrays.asList(params.split(",")); String test = new String(); for (String el : param) { - test = test.concat(el); - if (!test.endsWith("\\") || - (test.endsWith("\\\\") && !test.endsWith("\\\\\\")) ) { - String[] keyValue = test.split("="); - if (keyValue.length < 2) { - role.addParameter(keyValue[0].trim(), ""); - Logger.debug("Add authentication roleparameter with key=" + keyValue[0].trim()); + if (MiscUtil.isNotEmpty(el)) { + test = test.concat(el); + if (!test.endsWith("\\") || + (test.endsWith("\\\\") && !test.endsWith("\\\\\\")) ) { + String[] keyValue = test.split("="); + if (keyValue.length < 2) { + role.addParameter(keyValue[0].trim(), ""); + Logger.debug("Add authentication roleparameter with key=" + keyValue[0].trim()); - } else { - role.addParameter(keyValue[0].trim(), keyValue[1].trim()); - Logger.debug("Add authentication roleparameter with key=" + keyValue[0].trim() - + " value=" + keyValue[1].trim()); + } else { + role.addParameter(keyValue[0].trim(), keyValue[1].trim()); + Logger.debug("Add authentication roleparameter with key=" + keyValue[0].trim() + + " value=" + keyValue[1].trim()); - } + } - test = new String(); - } + test = new String(); + + } else { + test = test.substring(0, test.length()-1).concat(","); + + } + } } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/PVPtoSTORKMapper.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/PVPtoSTORKMapper.java index fe3b780fb..5ef9494f4 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/PVPtoSTORKMapper.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/PVPtoSTORKMapper.java @@ -113,13 +113,16 @@ public class PVPtoSTORKMapper { */ public String map(AuthenticationRole el) { if (mapping != null) { - String ecRole = mapping.getProperty(el.getRawRoleString()); + //String ecRole = mapping.getProperty(el.getRawRoleString()); + String ecRole = mapping.getProperty(el.getRoleName()); if (MiscUtil.isNotEmpty(ecRole)) { - Logger.info("Map PVPRole " + el.getRawRoleString() + " to ECRole " + ecRole); + //Logger.info("Map PVPRole " + el.getRawRoleString() + " to ECRole " + ecRole); + Logger.info("Map PVPRole " + el.getRoleName() + " to ECRole " + ecRole); return ecRole; } } - Logger.warn("NO mapping for PVPRole "+ el.getRawRoleString() + " !"); + //Logger.warn("NO mapping for PVPRole "+ el.getRawRoleString() + " !"); + Logger.warn("NO mapping for PVPRole "+ el.getRoleName() + " !"); return null; } } -- cgit v1.2.3 From ac46b082c7dc004f7c7237d8bda5d73cd646d861 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 16:29:30 +0100 Subject: add new A-Trust test CA certs --- ...Test-Sig-02.20141124-20141118.SerNo3969edc1.cer | Bin 0 -> 1029 bytes ...-Test-Qual-01.20141117-20241111.SerNo16120f.cer | 23 +++++++++++++++++++++ ...est-Qual-02.20141124-20141118.SerNo3969edbf.cer | Bin 0 -> 996 bytes ...-Test-Qual-01.20141117-20241111.SerNo16120f.cer | 23 +++++++++++++++++++++ ...-Test-Qual-01.20141117-20241111.SerNo16120f.cer | 23 +++++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer create mode 100644 id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-Test-Qual-02.20141124-20141118.SerNo3969edbf.cer create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer diff --git a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer new file mode 100644 index 000000000..1bb449441 Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer new file mode 100644 index 000000000..60bc9a557 --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2zCCAsOgAwIBAgIDFhIPMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRwwGgYDVQQLDBNhLXNpZ24tVEVT +VC1RdWFsLTAxMRwwGgYDVQQDDBNhLXNpZ24tVEVTVC1RdWFsLTAxMB4XDTE0MTEx +NzA3NDAzNloXDTI0MTExMTA2NDAzNlowgZMxCzAJBgNVBAYTAkFUMUgwRgYDVQQK +DD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4g +RGF0ZW52ZXJrZWhyIEdtYkgxHDAaBgNVBAsME2Etc2lnbi1URVNULVF1YWwtMDEx +HDAaBgNVBAMME2Etc2lnbi1URVNULVF1YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQD4TRgyXzhxJ2AkndX0RPY771f64dsJrReEeuShLRK5io0B +kJWc4t7wuD1B98cJ0MUPlMmOJ2Ckc/vuLhQUyY3qEUmhMhixCUIcdHQ5yH3H0yMV +HxyJxAG83fE8M25kpKA4TzzMW8KPd2S63wbpPElyEy7vrllrLxvdQRSDpMZMvRg8 +fvoDGAehxsnKKwlXZuMq1aSBzfMz3cMBDKxvqzDIz7yC1iWNkdiwog3a5a5PbViK +shhZ0h+bx9WFDpiN6ooPQgcGhjD+NqIDoiOr7CUFHp+HiC6xIsEFJaBHTf3dRZ61 +0r1FDABx0Yj8+wlXSQLYq/1nR/QMwsvH0Cz1qYTPAgMBAAGjNjA0MA8GA1UdEwEB +/wQFMAMBAf8wEQYDVR0OBAoECE8h1CulBqTdMA4GA1UdDwEB/wQEAwIBBjANBgkq +hkiG9w0BAQUFAAOCAQEAimFu+xTm3UdyU+fO+2hz4DS20OGSC9NBDkorjzhRPWoZ +IVhUi6yH5drqSBm4/2ZYS1Ba5npzfyJwm+cLO28ljxAApfRHlbN0y83hKv7c0I7g +zWTMRs8X8ar5Gd7d4O5jpC4PAaZ1ozSDoE06U5im6YMLaJy/0QYvf5EQBMvLdeoc +d1vl17JYKYqYzcX2dvayikrfiglFqDaZZ66yJPBSuiyNhXpPkbXsOoyyTPtV/0Bh +eKIQiQyJID5aZtR7D4fBAzKdp5wB9KLQXBZ80hrwqrIuy+ME0tFaBWYBi8dzQ1iq +/E3Qz0USfGmxPMm8y/zRqsDvxZCRiSuvzBkOXbGMdA== +-----END CERTIFICATE----- diff --git a/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-Test-Qual-02.20141124-20141118.SerNo3969edbf.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-Test-Qual-02.20141124-20141118.SerNo3969edbf.cer new file mode 100644 index 000000000..d71177a4e Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/A-Trust-Test-Qual-02.20141124-20141118.SerNo3969edbf.cer differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer new file mode 100644 index 000000000..60bc9a557 --- /dev/null +++ b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2zCCAsOgAwIBAgIDFhIPMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRwwGgYDVQQLDBNhLXNpZ24tVEVT +VC1RdWFsLTAxMRwwGgYDVQQDDBNhLXNpZ24tVEVTVC1RdWFsLTAxMB4XDTE0MTEx +NzA3NDAzNloXDTI0MTExMTA2NDAzNlowgZMxCzAJBgNVBAYTAkFUMUgwRgYDVQQK +DD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4g +RGF0ZW52ZXJrZWhyIEdtYkgxHDAaBgNVBAsME2Etc2lnbi1URVNULVF1YWwtMDEx +HDAaBgNVBAMME2Etc2lnbi1URVNULVF1YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQD4TRgyXzhxJ2AkndX0RPY771f64dsJrReEeuShLRK5io0B +kJWc4t7wuD1B98cJ0MUPlMmOJ2Ckc/vuLhQUyY3qEUmhMhixCUIcdHQ5yH3H0yMV +HxyJxAG83fE8M25kpKA4TzzMW8KPd2S63wbpPElyEy7vrllrLxvdQRSDpMZMvRg8 +fvoDGAehxsnKKwlXZuMq1aSBzfMz3cMBDKxvqzDIz7yC1iWNkdiwog3a5a5PbViK +shhZ0h+bx9WFDpiN6ooPQgcGhjD+NqIDoiOr7CUFHp+HiC6xIsEFJaBHTf3dRZ61 +0r1FDABx0Yj8+wlXSQLYq/1nR/QMwsvH0Cz1qYTPAgMBAAGjNjA0MA8GA1UdEwEB +/wQFMAMBAf8wEQYDVR0OBAoECE8h1CulBqTdMA4GA1UdDwEB/wQEAwIBBjANBgkq +hkiG9w0BAQUFAAOCAQEAimFu+xTm3UdyU+fO+2hz4DS20OGSC9NBDkorjzhRPWoZ +IVhUi6yH5drqSBm4/2ZYS1Ba5npzfyJwm+cLO28ljxAApfRHlbN0y83hKv7c0I7g +zWTMRs8X8ar5Gd7d4O5jpC4PAaZ1ozSDoE06U5im6YMLaJy/0QYvf5EQBMvLdeoc +d1vl17JYKYqYzcX2dvayikrfiglFqDaZZ66yJPBSuiyNhXpPkbXsOoyyTPtV/0Bh +eKIQiQyJID5aZtR7D4fBAzKdp5wB9KLQXBZ80hrwqrIuy+ME0tFaBWYBi8dzQ1iq +/E3Qz0USfGmxPMm8y/zRqsDvxZCRiSuvzBkOXbGMdA== +-----END CERTIFICATE----- diff --git a/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer new file mode 100644 index 000000000..60bc9a557 --- /dev/null +++ b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2zCCAsOgAwIBAgIDFhIPMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRwwGgYDVQQLDBNhLXNpZ24tVEVT +VC1RdWFsLTAxMRwwGgYDVQQDDBNhLXNpZ24tVEVTVC1RdWFsLTAxMB4XDTE0MTEx +NzA3NDAzNloXDTI0MTExMTA2NDAzNlowgZMxCzAJBgNVBAYTAkFUMUgwRgYDVQQK +DD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4g +RGF0ZW52ZXJrZWhyIEdtYkgxHDAaBgNVBAsME2Etc2lnbi1URVNULVF1YWwtMDEx +HDAaBgNVBAMME2Etc2lnbi1URVNULVF1YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQD4TRgyXzhxJ2AkndX0RPY771f64dsJrReEeuShLRK5io0B +kJWc4t7wuD1B98cJ0MUPlMmOJ2Ckc/vuLhQUyY3qEUmhMhixCUIcdHQ5yH3H0yMV +HxyJxAG83fE8M25kpKA4TzzMW8KPd2S63wbpPElyEy7vrllrLxvdQRSDpMZMvRg8 +fvoDGAehxsnKKwlXZuMq1aSBzfMz3cMBDKxvqzDIz7yC1iWNkdiwog3a5a5PbViK +shhZ0h+bx9WFDpiN6ooPQgcGhjD+NqIDoiOr7CUFHp+HiC6xIsEFJaBHTf3dRZ61 +0r1FDABx0Yj8+wlXSQLYq/1nR/QMwsvH0Cz1qYTPAgMBAAGjNjA0MA8GA1UdEwEB +/wQFMAMBAf8wEQYDVR0OBAoECE8h1CulBqTdMA4GA1UdDwEB/wQEAwIBBjANBgkq +hkiG9w0BAQUFAAOCAQEAimFu+xTm3UdyU+fO+2hz4DS20OGSC9NBDkorjzhRPWoZ +IVhUi6yH5drqSBm4/2ZYS1Ba5npzfyJwm+cLO28ljxAApfRHlbN0y83hKv7c0I7g +zWTMRs8X8ar5Gd7d4O5jpC4PAaZ1ozSDoE06U5im6YMLaJy/0QYvf5EQBMvLdeoc +d1vl17JYKYqYzcX2dvayikrfiglFqDaZZ66yJPBSuiyNhXpPkbXsOoyyTPtV/0Bh +eKIQiQyJID5aZtR7D4fBAzKdp5wB9KLQXBZ80hrwqrIuy+ME0tFaBWYBi8dzQ1iq +/E3Qz0USfGmxPMm8y/zRqsDvxZCRiSuvzBkOXbGMdA== +-----END CERTIFICATE----- -- cgit v1.2.3 From f02943b7b4257bb9f16bd2e9f9d9dfb5a2f17944 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 17:17:41 +0100 Subject: change interfederation with short SAML1 assertion: insert baseID if it is requested and available --- .../moa/id/protocols/saml1/SAML1AuthenticationServer.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java index 65e520cc3..c8a480cac 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java @@ -64,6 +64,7 @@ import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.Base64Utils; import at.gv.egovernment.moa.util.Constants; import at.gv.egovernment.moa.util.DOMUtils; +import at.gv.egovernment.moa.util.MiscUtil; import at.gv.egovernment.moa.util.StringUtils; import at.gv.util.xsd.persondata.IdentificationType; import at.gv.util.xsd.persondata.IdentificationType.Value; @@ -222,8 +223,14 @@ public class SAML1AuthenticationServer extends AuthenticationServer { Value value = new Value(); id.setValue(value ); - id.setType(Constants.URN_PREFIX_BASEID); - value.setValue(""); + id.setType(authData.getIdentificationType()); + //add baseID if it is requested and available + if ( MiscUtil.isNotEmpty(authData.getIdentificationValue()) && + saml1parameter.isProvideIdentityLink() ) + value.setValue(authData.getIdentificationValue()); + else + value.setValue(""); + familyName.setValue(authData.getFamilyName()); familyName.setPrimary("undefined"); name.getGivenName().add(authData.getGivenName()); -- cgit v1.2.3 From 9ebec8cfa0e56467314bbd983d87640411b12ce3 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 24 Nov 2014 17:19:27 +0100 Subject: rebuild SAML1 target parameter functionality for legacy applications --- .../id/auth/builder/AuthenticationDataBuilder.java | 27 ++++++++++++++-------- .../servlet/GenerateIFrameTemplateServlet.java | 17 ++++++++++---- .../moa/id/protocols/saml1/GetArtifactAction.java | 4 ++-- .../moa/id/protocols/saml1/SAML1Protocol.java | 11 ++++++--- 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java index 731925c1b..5fb4d6be8 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java @@ -215,7 +215,7 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { } else { //build AuthenticationData from MOASession - buildAuthDataFormMOASession(authdata, session, oaParam); + buildAuthDataFormMOASession(authdata, session, oaParam, protocolRequest); } @@ -323,7 +323,7 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { } //parse response information to authData - buildAuthDataFormInterfederationResponse(authdata, session, extractor, oaParam); + buildAuthDataFormInterfederationResponse(authdata, session, extractor, oaParam, req); } catch (SOAPException e) { throw new BuildException("builder.06", null, e); @@ -350,7 +350,8 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { AuthenticationData authData, AuthenticationSession session, AssertionAttributeExtractor extractor, - IOAAuthParameters oaParam) + IOAAuthParameters oaParam, + IRequest req) throws BuildException, AssertionAttributeExtractorExeption { Logger.debug("Build AuthData from assertion starts ...."); @@ -536,7 +537,7 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { } //build OA specific bPK/wbPK information - buildOAspecificbPK(oaParam, authData, + buildOAspecificbPK(req, oaParam, authData, authData.getIdentificationValue(), authData.getIdentificationType()); @@ -544,7 +545,7 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { if (MiscUtil.isEmpty(authData.getBPK())) { Logger.debug("Calcutlate bPK from baseID"); - buildOAspecificbPK(oaParam, authData, + buildOAspecificbPK(req, oaParam, authData, authData.getIdentificationValue(), authData.getIdentificationType()); @@ -845,7 +846,7 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { } private static void buildAuthDataFormMOASession(AuthenticationData authData, AuthenticationSession session, - IOAAuthParameters oaParam) throws BuildException, ConfigurationException { + IOAAuthParameters oaParam, IRequest protocolRequest) throws BuildException, ConfigurationException { IdentityLink identityLink = session.getIdentityLink(); @@ -959,7 +960,7 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { Logger.trace("Authenticated User is OW: " + mandate.getOWbPK()); } else { - buildOAspecificbPK(oaParam, authData, + buildOAspecificbPK(protocolRequest, oaParam, authData, identityLink.getIdentificationValue(), identityLink.getIdentificationType()); @@ -1003,7 +1004,7 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { } - private static void buildOAspecificbPK(IOAAuthParameters oaParam, AuthenticationData authData, String baseID, String baseIDType) throws BuildException { + private static void buildOAspecificbPK(IRequest protocolRequest, IOAAuthParameters oaParam, AuthenticationData authData, String baseID, String baseIDType) throws BuildException { if (oaParam.getBusinessService()) { //since we have foreigner, wbPK is not calculated in BKU @@ -1024,9 +1025,15 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { if (baseIDType.equals(Constants.URN_PREFIX_BASEID)) { // only compute bPK if online application is a public service and we have the Stammzahl - String bpkBase64 = new BPKBuilder().buildBPK(baseID, oaParam.getTarget()); + String target = null; + if (protocolRequest instanceof SAML1RequestImpl) + target = protocolRequest.getTarget(); + else + target = oaParam.getTarget(); + + String bpkBase64 = new BPKBuilder().buildBPK(baseID, target); authData.setBPK(bpkBase64); - authData.setBPKType(Constants.URN_PREFIX_CDID + "+" + oaParam.getTarget()); + authData.setBPKType(Constants.URN_PREFIX_CDID + "+" + target); } Logger.trace("Authenticate user with bPK " + authData.getBPK()); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java index 2ef8ab5ec..99a7dce89 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java @@ -45,6 +45,9 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.IRequest; +import at.gv.egovernment.moa.id.moduls.RequestStorage; +import at.gv.egovernment.moa.id.protocols.saml1.SAML1Protocol; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.MOAIDMessageProvider; import at.gv.egovernment.moa.logging.Logger; @@ -116,11 +119,15 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { else { - //load Parameters from config - String target = oaParam.getTarget(); - - - + //get Target from config or from request in case of SAML 1 + String target = null; + IRequest pendingReq = RequestStorage.getPendingRequest(pendingRequestID); + if (MiscUtil.isNotEmpty(pendingReq.getTarget()) && + pendingReq.requestedModule().equals(SAML1Protocol.PATH)) + target = pendingReq.getTarget(); + else + target = oaParam.getTarget(); + String bkuURL = oaParam.getBKUURL(bkuid); if (MiscUtil.isEmpty(bkuURL)) { Logger.info("No OA specific BKU defined. Use BKU from default configuration"); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java index 67f780b3a..4cdd1db01 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java @@ -83,7 +83,7 @@ public class GetArtifactAction implements IAction { String url = AuthConfigurationProvider.getInstance().getPublicURLPrefix() + "/RedirectServlet"; url = addURLParameter(url, RedirectServlet.REDIRCT_PARAM_URL, URLEncoder.encode(oaURL, "UTF-8")); if (!oaParam.getBusinessService()) - url = addURLParameter(url, PARAM_TARGET, URLEncoder.encode(oaParam.getTarget(), "UTF-8")); + url = addURLParameter(url, PARAM_TARGET, URLEncoder.encode(req.getTarget(), "UTF-8")); url = addURLParameter(url, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8")); url = httpResp.encodeRedirectURL(url); @@ -95,7 +95,7 @@ public class GetArtifactAction implements IAction { String redirectURL = oaURL; if (!oaParam.getBusinessService()) { redirectURL = addURLParameter(redirectURL, PARAM_TARGET, - URLEncoder.encode(oaParam.getTarget(), "UTF-8")); + URLEncoder.encode(req.getTarget(), "UTF-8")); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java index 8f7f17e2e..9934c339d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java @@ -132,7 +132,7 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants { if (!ParamValidatorUtils.isValidOA(oaURL)) throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.12"); - + config.setOAURL(oaURL); Logger.info("Dispatch SAML1 Request: OAURL=" + oaURL); @@ -156,8 +156,13 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants { new Object[] { null }); } - config.setSourceID(sourceID); - config.setTarget(oaParam.getTarget()); + config.setSourceID(sourceID); + if (MiscUtil.isNotEmpty(target)) + config.setTarget(target); + + else + config.setTarget(oaParam.getTarget()); + return config; } -- cgit v1.2.3 From b445b300db3a6895647f7f939f63e6b1f52ac0a3 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Tue, 25 Nov 2014 12:03:02 +0100 Subject: Fix build. - Remove svn metadata. - Fix local repository (inappropriate xalan-bin-dist dependency file names and copy-past error in dependency pom). - Switch jdk 1.5/1.6 to 1.7. - Exclude non working tests. --- id/ConfigWebTool/pom.xml | 4 +- id/oa/pom.xml | 4 +- id/server/idserverlib/pom.xml | 9 +- .../legacy-backup/stork2-commons/.svn/all-wcprops | 17 - .../stork2-commons/.svn/dir-prop-base | 10 - .../legacy-backup/stork2-commons/.svn/entries | 99 -- .../.svn/text-base/Releases.svn-base | 62 -- .../stork2-commons/.svn/text-base/pom.xml.svn-base | 213 ---- .../stork2-commons/src/.svn/all-wcprops | 5 - .../legacy-backup/stork2-commons/src/.svn/entries | 34 - .../stork2-commons/src/main/.svn/all-wcprops | 5 - .../stork2-commons/src/main/.svn/entries | 37 - .../src/main/config/.svn/all-wcprops | 5 - .../stork2-commons/src/main/config/.svn/entries | 31 - .../src/main/config/embedded/.svn/all-wcprops | 11 - .../src/main/config/embedded/.svn/entries | 62 -- .../.svn/text-base/pepsUtil.properties.svn-base | 267 ----- .../stork2-commons/src/main/java/.svn/all-wcprops | 5 - .../stork2-commons/src/main/java/.svn/entries | 31 - .../src/main/java/eu/.svn/all-wcprops | 5 - .../stork2-commons/src/main/java/eu/.svn/entries | 31 - .../src/main/java/eu/stork/.svn/all-wcprops | 5 - .../src/main/java/eu/stork/.svn/entries | 31 - .../src/main/java/eu/stork/peps/.svn/all-wcprops | 5 - .../src/main/java/eu/stork/peps/.svn/entries | 31 - .../main/java/eu/stork/peps/auth/.svn/all-wcprops | 5 - .../src/main/java/eu/stork/peps/auth/.svn/entries | 34 - .../eu/stork/peps/auth/commons/.svn/all-wcprops | 191 ---- .../java/eu/stork/peps/auth/commons/.svn/entries | 1085 -------------------- .../text-base/AttributeConstants.java.svn-base | 72 -- .../.svn/text-base/AttributeName.java.svn-base | 74 -- .../.svn/text-base/AttributeProvider.java.svn-base | 80 -- .../text-base/AttributeProvidersMap.java.svn-base | 96 -- .../.svn/text-base/AttributeSource.java.svn-base | 188 ---- .../.svn/text-base/AttributeUtil.java.svn-base | 231 ----- .../.svn/text-base/CitizenConsent.java.svn-base | 123 --- .../commons/.svn/text-base/Country.java.svn-base | 95 -- .../.svn/text-base/CountryCodes.java.svn-base | 79 -- .../commons/.svn/text-base/DateUtil.java.svn-base | 169 --- .../IAttributeListProcessor.java.svn-base | 148 --- .../text-base/IAttributeProvidersMap.java.svn-base | 82 -- .../text-base/IPersonalAttributeList.java.svn-base | 194 ---- .../.svn/text-base/IStorkLogger.java.svn-base | 239 ----- .../.svn/text-base/IStorkSession.java.svn-base | 85 -- .../commons/.svn/text-base/Linker.java.svn-base | 316 ------ .../.svn/text-base/PEPSErrors.java.svn-base | 392 ------- .../.svn/text-base/PEPSParameters.java.svn-base | 619 ----------- .../commons/.svn/text-base/PEPSUtil.java.svn-base | 353 ------- .../.svn/text-base/PEPSValues.java.svn-base | 329 ------ .../.svn/text-base/PersonalAttribute.java.svn-base | 348 ------- .../text-base/PersonalAttributeList.java.svn-base | 396 ------- .../text-base/STORKAttrQueryRequest.java.svn-base | 447 -------- .../text-base/STORKAttrQueryResponse.java.svn-base | 388 ------- .../.svn/text-base/STORKAuthnRequest.java.svn-base | 495 --------- .../text-base/STORKAuthnResponse.java.svn-base | 383 ------- .../text-base/STORKLogoutRequest.java.svn-base | 197 ---- .../text-base/STORKLogoutResponse.java.svn-base | 250 ----- .../.svn/text-base/STORKStatusCode.java.svn-base | 68 -- .../text-base/STORKSubStatusCode.java.svn-base | 71 -- .../.svn/text-base/package-info.java.svn-base | 9 - .../peps/auth/commons/exceptions/.svn/all-wcprops | 53 - .../peps/auth/commons/exceptions/.svn/entries | 300 ------ .../text-base/AbstractPEPSException.java.svn-base | 173 ---- .../.svn/text-base/CPEPSException.java.svn-base | 143 --- .../InternalErrorPEPSException.java.svn-base | 74 -- .../InvalidParameterPEPSException.java.svn-base | 54 - .../InvalidSessionPEPSException.java.svn-base | 46 - .../text-base/SecurityPEPSException.java.svn-base | 67 -- .../text-base/StorkPEPSException.java.svn-base | 53 - .../.svn/text-base/package-info.java.svn-base | 7 - .../eu/stork/peps/auth/specific/.svn/all-wcprops | 41 - .../java/eu/stork/peps/auth/specific/.svn/entries | 232 ----- .../.svn/text-base/IAUService.java.svn-base | 215 ---- .../text-base/ICheckAttributeValue.java.svn-base | 37 - .../.svn/text-base/IDeriveAttribute.java.svn-base | 40 - .../.svn/text-base/INormaliseValue.java.svn-base | 35 - .../text-base/ITranslatorService.java.svn-base | 100 -- .../.svn/text-base/package-info.java.svn-base | 8 - .../src/main/resources/.svn/all-wcprops | 11 - .../stork2-commons/src/main/resources/.svn/entries | 62 -- .../resources/.svn/text-base/log4j.xml.svn-base | 19 - .../stork2-commons/src/test/.svn/all-wcprops | 5 - .../stork2-commons/src/test/.svn/entries | 34 - .../stork2-commons/src/test/java/.svn/all-wcprops | 5 - .../stork2-commons/src/test/java/.svn/entries | 31 - .../src/test/java/eu/.svn/all-wcprops | 5 - .../stork2-commons/src/test/java/eu/.svn/entries | 31 - .../src/test/java/eu/stork/.svn/all-wcprops | 5 - .../src/test/java/eu/stork/.svn/entries | 31 - .../src/test/java/eu/stork/peps/.svn/all-wcprops | 5 - .../src/test/java/eu/stork/peps/.svn/entries | 31 - .../test/java/eu/stork/peps/tests/.svn/all-wcprops | 53 - .../src/test/java/eu/stork/peps/tests/.svn/entries | 300 ------ .../AttributeProvidersMapTestCase.java.svn-base | 134 --- .../AttributeSourceTestCase.java.svn-base | 88 -- .../text-base/AttributeUtilTestCase.java.svn-base | 537 ---------- .../.svn/text-base/DateUtilTestCase.java.svn-base | 294 ------ .../.svn/text-base/PEPSUtilTestCase.java.svn-base | 553 ---------- .../PersonalAttributeListTestCase.java.svn-base | 747 -------------- .../PersonalAttributeTestCase.java.svn-base | 182 ---- .../.svn/text-base/package-info.java.svn-base | 5 - .../src/test/resources/.svn/all-wcprops | 11 - .../stork2-commons/src/test/resources/.svn/entries | 62 -- .../resources/.svn/text-base/log4j.xml.svn-base | 19 - id/server/moa-id-commons/pom.xml | 8 +- id/server/proxy/pom.xml | 4 +- id/server/stork2-commons/.svn/all-wcprops | 17 - id/server/stork2-commons/.svn/dir-prop-base | 10 - id/server/stork2-commons/.svn/entries | 99 -- .../.svn/text-base/Releases.svn-base | 73 -- .../stork2-commons/.svn/text-base/pom.xml.svn-base | 213 ---- id/server/stork2-commons/pom.xml | 7 +- id/server/stork2-commons/src/.svn/all-wcprops | 5 - id/server/stork2-commons/src/.svn/entries | 34 - id/server/stork2-commons/src/main/.svn/all-wcprops | 5 - id/server/stork2-commons/src/main/.svn/entries | 37 - .../src/main/config/.svn/all-wcprops | 5 - .../stork2-commons/src/main/config/.svn/entries | 31 - .../src/main/config/embedded/.svn/all-wcprops | 11 - .../src/main/config/embedded/.svn/entries | 62 -- .../.svn/text-base/pepsUtil.properties.svn-base | 269 ----- .../stork2-commons/src/main/java/.svn/all-wcprops | 5 - .../stork2-commons/src/main/java/.svn/entries | 31 - .../src/main/java/eu/.svn/all-wcprops | 5 - .../stork2-commons/src/main/java/eu/.svn/entries | 31 - .../src/main/java/eu/stork/.svn/all-wcprops | 5 - .../src/main/java/eu/stork/.svn/entries | 31 - .../src/main/java/eu/stork/peps/.svn/all-wcprops | 5 - .../src/main/java/eu/stork/peps/.svn/entries | 34 - .../main/java/eu/stork/peps/auth/.svn/all-wcprops | 5 - .../src/main/java/eu/stork/peps/auth/.svn/entries | 34 - .../eu/stork/peps/auth/commons/.svn/all-wcprops | 191 ---- .../java/eu/stork/peps/auth/commons/.svn/entries | 1085 -------------------- .../text-base/AttributeConstants.java.svn-base | 72 -- .../.svn/text-base/AttributeName.java.svn-base | 74 -- .../.svn/text-base/AttributeProvider.java.svn-base | 123 --- .../text-base/AttributeProvidersMap.java.svn-base | 96 -- .../.svn/text-base/AttributeSource.java.svn-base | 188 ---- .../.svn/text-base/AttributeUtil.java.svn-base | 231 ----- .../.svn/text-base/CitizenConsent.java.svn-base | 123 --- .../commons/.svn/text-base/Country.java.svn-base | 95 -- .../.svn/text-base/CountryCodes.java.svn-base | 79 -- .../commons/.svn/text-base/DateUtil.java.svn-base | 169 --- .../IAttributeListProcessor.java.svn-base | 148 --- .../text-base/IAttributeProvidersMap.java.svn-base | 82 -- .../text-base/IPersonalAttributeList.java.svn-base | 194 ---- .../.svn/text-base/IStorkLogger.java.svn-base | 239 ----- .../.svn/text-base/IStorkSession.java.svn-base | 85 -- .../commons/.svn/text-base/Linker.java.svn-base | 316 ------ .../.svn/text-base/PEPSErrors.java.svn-base | 392 ------- .../.svn/text-base/PEPSParameters.java.svn-base | 625 ----------- .../commons/.svn/text-base/PEPSUtil.java.svn-base | 391 ------- .../.svn/text-base/PEPSValues.java.svn-base | 342 ------ .../.svn/text-base/PersonalAttribute.java.svn-base | 348 ------- .../text-base/PersonalAttributeList.java.svn-base | 396 ------- .../text-base/STORKAttrQueryRequest.java.svn-base | 447 -------- .../text-base/STORKAttrQueryResponse.java.svn-base | 388 ------- .../.svn/text-base/STORKAuthnRequest.java.svn-base | 495 --------- .../text-base/STORKAuthnResponse.java.svn-base | 383 ------- .../text-base/STORKLogoutRequest.java.svn-base | 197 ---- .../text-base/STORKLogoutResponse.java.svn-base | 250 ----- .../.svn/text-base/STORKStatusCode.java.svn-base | 68 -- .../text-base/STORKSubStatusCode.java.svn-base | 71 -- .../.svn/text-base/package-info.java.svn-base | 9 - .../peps/auth/commons/exceptions/.svn/all-wcprops | 53 - .../peps/auth/commons/exceptions/.svn/entries | 300 ------ .../text-base/AbstractPEPSException.java.svn-base | 173 ---- .../.svn/text-base/CPEPSException.java.svn-base | 143 --- .../InternalErrorPEPSException.java.svn-base | 74 -- .../InvalidParameterPEPSException.java.svn-base | 54 - .../InvalidSessionPEPSException.java.svn-base | 46 - .../text-base/SecurityPEPSException.java.svn-base | 67 -- .../text-base/StorkPEPSException.java.svn-base | 53 - .../.svn/text-base/package-info.java.svn-base | 7 - .../eu/stork/peps/auth/specific/.svn/all-wcprops | 41 - .../java/eu/stork/peps/auth/specific/.svn/entries | 232 ----- .../.svn/text-base/IAUService.java.svn-base | 215 ---- .../text-base/ICheckAttributeValue.java.svn-base | 37 - .../.svn/text-base/IDeriveAttribute.java.svn-base | 40 - .../.svn/text-base/INormaliseValue.java.svn-base | 35 - .../text-base/ITranslatorService.java.svn-base | 100 -- .../.svn/text-base/package-info.java.svn-base | 8 - .../java/eu/stork/peps/complex/.svn/all-wcprops | 5 - .../main/java/eu/stork/peps/complex/.svn/entries | 31 - .../stork/peps/complex/attributes/.svn/all-wcprops | 125 --- .../eu/stork/peps/complex/attributes/.svn/entries | 708 ------------- .../.svn/text-base/AcTitleType.java.svn-base | 89 -- .../text-base/AttributeStatusType.java.svn-base | 61 -- .../text-base/CanonicalAddressType.java.svn-base | 264 ----- .../.svn/text-base/Habilitation.java.svn-base | 89 -- .../.svn/text-base/HabilitationType.java.svn-base | 89 -- .../text-base/HasAccountInBankType.java.svn-base | 89 -- .../.svn/text-base/HasDegreeType.java.svn-base | 174 ---- .../text-base/IsAcademicStaffType.java.svn-base | 145 --- .../.svn/text-base/IsAdminStaffType.java.svn-base | 89 -- .../IsCourseCoordinatorType.java.svn-base | 89 -- .../.svn/text-base/IsHCPType.java.svn-base | 145 --- .../IsHealthCareProfessionalType.java.svn-base | 145 --- .../.svn/text-base/IsStudentType.java.svn-base | 146 --- .../.svn/text-base/IsTeacherOfType.java.svn-base | 145 --- .../text-base/MandateContentType.java.svn-base | 233 ----- .../.svn/text-base/MandateType.java.svn-base | 125 --- .../.svn/text-base/ObjectFactory.java.svn-base | 433 -------- .../RepresentationPersonType.java.svn-base | 289 ------ .../text-base/RequestedAttributeType.java.svn-base | 212 ---- .../.svn/text-base/package-info.java.svn-base | 9 - .../src/main/resources/.svn/all-wcprops | 17 - .../stork2-commons/src/main/resources/.svn/entries | 96 -- .../text-base/StorkcomplexAttributes.xsd.svn-base | 305 ------ .../resources/.svn/text-base/log4j.xml.svn-base | 19 - id/server/stork2-commons/src/test/.svn/all-wcprops | 5 - id/server/stork2-commons/src/test/.svn/entries | 34 - .../stork2-commons/src/test/java/.svn/all-wcprops | 5 - .../stork2-commons/src/test/java/.svn/entries | 31 - .../src/test/java/eu/.svn/all-wcprops | 5 - .../stork2-commons/src/test/java/eu/.svn/entries | 31 - .../src/test/java/eu/stork/.svn/all-wcprops | 5 - .../src/test/java/eu/stork/.svn/entries | 31 - .../src/test/java/eu/stork/peps/.svn/all-wcprops | 5 - .../src/test/java/eu/stork/peps/.svn/entries | 31 - .../test/java/eu/stork/peps/tests/.svn/all-wcprops | 59 -- .../src/test/java/eu/stork/peps/tests/.svn/entries | 334 ------ .../AttributeProvidersMapTestCase.java.svn-base | 134 --- .../AttributeSourceTestCase.java.svn-base | 88 -- .../text-base/AttributeUtilTestCase.java.svn-base | 537 ---------- .../ComplexAttributesMarshalling.java.svn-base | 187 ---- .../.svn/text-base/DateUtilTestCase.java.svn-base | 294 ------ .../.svn/text-base/PEPSUtilTestCase.java.svn-base | 553 ---------- .../PersonalAttributeListTestCase.java.svn-base | 747 -------------- .../PersonalAttributeTestCase.java.svn-base | 182 ---- .../.svn/text-base/package-info.java.svn-base | 5 - .../src/test/resources/.svn/all-wcprops | 11 - .../stork2-commons/src/test/resources/.svn/entries | 62 -- .../resources/.svn/text-base/log4j.xml.svn-base | 19 - id/server/stork2-saml-engine/pom.xml | 4 +- pom.xml | 55 +- .../xml-apis/2.11.0/xml-apis-2.11.0.jar | Bin 0 -> 220536 bytes .../xml-apis/2.11.0/xml-apis-2.11.0.pom | 9 + .../xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar | Bin 220536 -> 0 bytes .../xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom | 9 - spss/server/serverlib/pom.xml | 5 +- spss/server/tools/pom.xml | 4 +- 242 files changed, 84 insertions(+), 33197 deletions(-) delete mode 100644 id/server/legacy-backup/stork2-commons/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/.svn/dir-prop-base delete mode 100644 id/server/legacy-backup/stork2-commons/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/.svn/text-base/Releases.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/.svn/text-base/pom.xml.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/config/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/config/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/resources/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/resources/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/resources/.svn/all-wcprops delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries delete mode 100644 id/server/legacy-backup/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base delete mode 100644 id/server/stork2-commons/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/.svn/dir-prop-base delete mode 100644 id/server/stork2-commons/.svn/entries delete mode 100644 id/server/stork2-commons/.svn/text-base/Releases.svn-base delete mode 100644 id/server/stork2-commons/.svn/text-base/pom.xml.svn-base delete mode 100644 id/server/stork2-commons/src/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/config/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/config/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/config/embedded/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/config/embedded/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AcTitleType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AttributeStatusType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/CanonicalAddressType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/Habilitation.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HabilitationType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasAccountInBankType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasDegreeType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAcademicStaffType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAdminStaffType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsCourseCoordinatorType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHCPType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHealthCareProfessionalType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsStudentType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsTeacherOfType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateContentType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/ObjectFactory.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RepresentationPersonType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RequestedAttributeType.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/stork2-commons/src/main/resources/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/main/resources/.svn/entries delete mode 100644 id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base delete mode 100644 id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base delete mode 100644 id/server/stork2-commons/src/test/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/test/.svn/entries delete mode 100644 id/server/stork2-commons/src/test/java/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/test/java/.svn/entries delete mode 100644 id/server/stork2-commons/src/test/java/eu/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/test/java/eu/.svn/entries delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/.svn/entries delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/entries delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/ComplexAttributesMarshalling.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base delete mode 100644 id/server/stork2-commons/src/test/resources/.svn/all-wcprops delete mode 100644 id/server/stork2-commons/src/test/resources/.svn/entries delete mode 100644 id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base create mode 100644 repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.jar create mode 100644 repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.pom delete mode 100644 repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar delete mode 100644 repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 18bd1306b..b7e4f5969 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -197,8 +197,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 93993c8a4..c97db6db2 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -56,8 +56,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 65004490b..fc48d87ac 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -432,8 +432,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 @@ -462,11 +462,10 @@ - http://java.sun.com/j2se/1.4/docs/api/ - http://java.sun.com/j2se/1.5.0/docs/api/ + http://docs.oracle.com/javase/7/docs/api/ http://logging.apache.org/log4j/docs/api/ - 1.5 + 1.7 diff --git a/id/server/legacy-backup/stork2-commons/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/.svn/all-wcprops deleted file mode 100644 index 256ae0266..000000000 --- a/id/server/legacy-backup/stork2-commons/.svn/all-wcprops +++ /dev/null @@ -1,17 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 45 -/CITnet/svn/STORK2/!svn/ver/493/trunk/Commons -END -Releases -K 25 -svn:wc:ra_dav:version-url -V 54 -/CITnet/svn/STORK2/!svn/ver/493/trunk/Commons/Releases -END -pom.xml -K 25 -svn:wc:ra_dav:version-url -V 53 -/CITnet/svn/STORK2/!svn/ver/493/trunk/Commons/pom.xml -END diff --git a/id/server/legacy-backup/stork2-commons/.svn/dir-prop-base b/id/server/legacy-backup/stork2-commons/.svn/dir-prop-base deleted file mode 100644 index 9dc541cfd..000000000 --- a/id/server/legacy-backup/stork2-commons/.svn/dir-prop-base +++ /dev/null @@ -1,10 +0,0 @@ -K 10 -svn:ignore -V 44 -.classpath -.project -.settings -report -target - -END diff --git a/id/server/legacy-backup/stork2-commons/.svn/entries b/id/server/legacy-backup/stork2-commons/.svn/entries deleted file mode 100644 index 148e40ca3..000000000 --- a/id/server/legacy-backup/stork2-commons/.svn/entries +++ /dev/null @@ -1,99 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T19:49:15.801345Z -493 -emferreri -has-props - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -Releases -file - - - - -2014-01-21T08:38:55.424702Z -5baf63f5379c354181f211dc4da29a64 -2014-01-15T19:49:15.801345Z -493 -emferreri - - - - - - - - - - - - - - - - - - - - - -2402 - -src -dir - -pom.xml -file - - - - -2014-01-21T08:38:55.428702Z -dc8551a0a1e6a9a3a63052bd0dd3de55 -2014-01-15T19:49:15.801345Z -493 -emferreri - - - - - - - - - - - - - - - - - - - - - -5777 - diff --git a/id/server/legacy-backup/stork2-commons/.svn/text-base/Releases.svn-base b/id/server/legacy-backup/stork2-commons/.svn/text-base/Releases.svn-base deleted file mode 100644 index 54aeb9313..000000000 --- a/id/server/legacy-backup/stork2-commons/.svn/text-base/Releases.svn-base +++ /dev/null @@ -1,62 +0,0 @@ -Created 06-04-2011 - -Branch : STORKCommons_0_5_UPDATE_06042011 -Date : 06-04-2011 -Changes: No changes. - -Branch : STORKCommons_0_5_UPDATE_07072011 -Date : 07-07-2011 -Changes: Inserted constants to HttpOnly HTTP Header. - -Branch : STORKCommons_0_6 -Date : 07-11-2011 -Changes: Improved error exception handling (few changes on the exception classes). - Improved Constansts (unused removed, others added). - Unit Tests include (almost all the code is cover). - Fix some minor bugs found on unit tests. - New Copyright License added. - PEPUtils refactored. - Improved error code message (three kind of messages: to citizen, admin and saml token). - -Branch : STORKCommons_0_6_1 -Date : 28-11-2011 -Changes: Removed unnecessary javadoc package file. - Updated pepsUtils.properties file (check attribute value had old error message) - -Branch : STORKCommons_0_9 -Date : 02-12-2011 -Changes: Updated Version to 0.9 - -Branch : STORKCommons_1_0 -Date : 02-12-2011 -Changes: Updated Version to 1.0 - -Branch : STORKCommons_1_1_0 -Date : 01-11-2013 -Changes: Updated Version to 1.1.0 - Dependencies updated - Business Logic Part I changes - SAML Engine Changes merged (from SamlEngine/1.1.0/Commons branch to be easier to merge this branch with trunk) - Fixed some errors on Test Case - -Branch : STORKCommons_1_1_1 -Date : 02-12-2013 -Changes: Updated Version to 1.1.1 - Added mandate error code - PMD quality code changes (some final identifier missing) - Added new methods to personal attribute list to get Mandatory/Optional and/or Simple/Complex attributes - Added new unit tests - -Branch : Commons (Trunk) -Date : 15-01-2014 -Version: 1.2.0 -Release: 2 -Changes: Updated Version to 1.2.0 - dded request flow of PV (incomplete) - Added AP mandatory attribute to get data for business attributes - *) based on configuration file it adds the missing attributes (eIdentifier, givenName, surname and dateOfBirth) or change isRequired to true. - changes original isRequired state in response - Added new Interface (IAttributeListProcessor) to make some operations on attribute lists - Power Validation is complete now - Business Logic I and II integration (Request Complete!) - Added new method to Personal attribute List to check if there is at least one attribute with no value. diff --git a/id/server/legacy-backup/stork2-commons/.svn/text-base/pom.xml.svn-base b/id/server/legacy-backup/stork2-commons/.svn/text-base/pom.xml.svn-base deleted file mode 100644 index a71ee1628..000000000 --- a/id/server/legacy-backup/stork2-commons/.svn/text-base/pom.xml.svn-base +++ /dev/null @@ -1,213 +0,0 @@ - - 4.0.0 - eu.stork - Commons - jar - Stork Commons - - UTF-8 - 1.2.0 - 2.6.0 - - ${stork.version} - - The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine. - - - - - - - joda-time - joda-time - 2.3 - - - - - log4j - log4j - 1.2.17 - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - mail - javax.mail - - - - - - org.opensaml - opensaml - ${opensaml.version} - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - org.slf4j - jcl-over-slf4j - - - org.slf4j - log4j-over-slf4j - - - org.slf4j - jul-to-slf4j - - - - - - - org.bouncycastle - bcprov-jdk16 - 1.46 - - - - - - javax.servlet - servlet-api - 2.5 - provided - - - - commons-lang - commons-lang - 2.6 - jar - compile - - - junit - junit - 4.11 - test - - - - - commons - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-surefire-plugin - - reversealphabetical - false - - reversealphabetical - **/PEPSUtilTest.java - **/PersonalAttributeTestCase.java - **/PersonalAttributeListTestCase.java - **/DateUtilTestCase.java - **/AttributeUtilTest.java - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - http://commons.apache.org/lang/api/ - http://java.sun.com/j2se/1.6.0/docs/api/ - http://www.bouncycastle.org/docs/docs1.6/ - http://docs.oracle.com/javase/6/docs/api/ - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - verify - - jar-no-fork - - - - - - - - src/test/resources - - log4j.xml - - - - - - - embedded - - - - ${project.basedir}/src/main/resources - - - ${project.basedir}/src/main/config/embedded - - - - - - metrics - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.1 - - - html - xml - - - - - - - - diff --git a/id/server/legacy-backup/stork2-commons/src/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/.svn/all-wcprops deleted file mode 100644 index 1be1e9546..000000000 --- a/id/server/legacy-backup/stork2-commons/src/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 49 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src -END diff --git a/id/server/legacy-backup/stork2-commons/src/.svn/entries b/id/server/legacy-backup/stork2-commons/src/.svn/entries deleted file mode 100644 index b55ef35ad..000000000 --- a/id/server/legacy-backup/stork2-commons/src/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -main -dir - -test -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/.svn/all-wcprops deleted file mode 100644 index 2d001ac89..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 54 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/.svn/entries deleted file mode 100644 index ca600a0d3..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/.svn/entries +++ /dev/null @@ -1,37 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -java -dir - -config -dir - -resources -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/config/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/config/.svn/all-wcprops deleted file mode 100644 index 73665ee91..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/config/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 61 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/config -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/config/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/config/.svn/entries deleted file mode 100644 index 74e41e9ee..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/config/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/config -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -embedded -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/all-wcprops deleted file mode 100644 index e1cf2515e..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 70 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/config/embedded -END -pepsUtil.properties -K 25 -svn:wc:ra_dav:version-url -V 90 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/config/embedded/pepsUtil.properties -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/entries deleted file mode 100644 index b574aab75..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/config/embedded -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -pepsUtil.properties -file - - - - -2014-01-21T08:38:55.392702Z -b61bbaa8e966441dba56ad954124ee38 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -7822 - diff --git a/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base b/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base deleted file mode 100644 index 1e92f390d..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base +++ /dev/null @@ -1,267 +0,0 @@ -#Max allowed params size -validation.active=true -max.spUrl.size=150 -max.attrList.size=20000 -max.invalidAttributeList.size=20000 -max.attrName.size=100 -max.callback.size=300 -max.idp.url.size=300 -max.atp.url.size=300 -max.cpepsURL.size=300 -max.attrValue.size=20000 -max.attrType.size=25 -max.spId.size=40 -max.providerName.size=128 -max.spName.size=25 -max.country.size=150 -max.qaaLevel.size=1 -max.spQaaLevel.size=1 -max.errorCode.size=5 -max.errorMessage.size=300 -max.username.size=30 -max.spepsRedirectUrl.size=300 -max.speps.redirectUrl.size=300 -max.cpeps.redirectUrl.size=300 -max.cpepsRedirectUrl.size=300 -max.spepsAssertionUrl.size=300 -max.SAMLRequest.size=131072 -max.SAMLResponse.size=131072 -max.RelayState.size=80 -max.remoteAddr.size=300 -max.remoteHost.size=300 -max.localAddr.size=300 -max.localName.size=300 -max.apepsUrl.size=300 -max.apeps.callbackUrl.size=300 - -#ERROR codes/messages (accordingly to specification) - -#CountrySelector Interface errors -spCountrySelector.invalidSPQAA.code=0000001 -spCountrySelector.invalidSPQAA.message=invalid.spQAA.parameter - -spCountrySelector.invalidQaaSPid.code=0000001 -spCountrySelector.invalidQaaSPid.message=invalid.spQAAId.parameter - -spCountrySelector.invalidSpId.code=000002 -spCountrySelector.invalidSpId.message=invalid.spId.parameter - -spCountrySelector.invalidSpURL.code=000003 -spCountrySelector.invalidSpURL.message=invalid.spUrl.parameter - -domain.CountrySelectorAction.code=000003 -domain.CountrySelectorAction.message=invalid.cs.domain - -requests.CountrySelectorAction.code=000004 -requests.CountrySelectorAction.message=reached.max.requests.cs - -spCountrySelector.spNotAllowed.code=000006 -spCountrySelector.spNotAllowed.message=attr.access.deny - -spCountrySelector.invalidAttr.code=000007 -spCountrySelector.invalidAttr.message=invalid.spAttr.parameter - -spCountrySelector.invalidProviderName.code=000008 -spCountrySelector.invalidProviderName.message=invalid.spProvidername.parameter - -spCountrySelector.errorCreatingSAML.code=203001 -spCountrySelector.errorCreatingSAML.message=error.create.sp.saml - -spepsSAMLRequest.code=203001 -spepsSAMLRequest.message=error.create.saml.speps - -#ServiceProvider Interface errors -sProviderAction.invalidSPQAA.code=200001 -sProviderAction.invalidSPQAA.message=invalid.sp.qaa - -sProviderAction.invalidSPQAAId.code=200001 -sProviderAction.invalidSPQAAId.message=invalid.sp.qaaid - -sProviderAction.invalidSPId.code=200002 -sProviderAction.invalidSPId.message=invalid.sp.id - -domain.ServiceProviderAction.code=200003 -domain.ServiceProviderAction.message=invalid.sp.domain - -sProviderAction.invalidSPDomain.code=200003 -sProviderAction.invalidSPDomain.message=invalid.sp.domain - -sProviderAction.invalidCountry.code=200004 -sProviderAction.invalidCountry.message=invalid.sp.country - -sProviderAction.spNotAllowed.code=200005 -sProviderAction.spNotAllowed.message=sp.not.allowed - -sProviderAction.invalidSaml.code=200006 -sProviderAction.invalidSaml.message=invalid.sp.samlrequest - -sProviderAction.invalidSPProviderName.code=200007 -sProviderAction.invalidSPProviderName.message=sp.not.identified - -sProviderAction.invalidSPRedirect.code=200008 -sProviderAction.invalidSPRedirect.message=invalid.sp.redirectUrl - -sProviderAction.invalidRelayState.code=200009 -sProviderAction.invalidRelayState.message=invalid.sp.relaystate - -sProviderAction.invalidAttr.code=200011 -sProviderAction.invalidAttr.message=invalid.sp.attr - -requests.ServiceProviderAction.code=200012 -requests.ServiceProviderAction.message=reached.max.requests.sp - -sPPowerValidationAction.invalidSPPVAttrList.code=200013 -sPPowerValidationAction.invalidSPPVAttrList.message=invalid.sp.pv.attrlist - -invalid.sp.pv.attrlist.code=200013 -invalid.sp.pv.attrlist.message=invalid.sp.pv.attrlist - -sProviderAction.invalidSPAlias.code=203003 -sProviderAction.invalidSPAlias.message=invalid.sp.alias - -sProviderAction.errorCreatingSAML.code=203001 -sProviderAction.errorCreatingSAML.message=error.create.saml.speps - -#Internal Error -internalError.code=203001 -internalError.message=internalError - -attrList.code=202005 -attrList.message=invalid.attrList.parameter - -missing.sessionId.code=203010 -missing.sessionId.message=missing.session.id - -sessionError.code=203011 -sessionError.message=invalid.session.id - -invalid.sessionId.code=203011 -invalid.sessionId.message=invalid.session.id - -missing.mandate.code=203013 -missing.mandate.message=missing.mandate - -invalid.session.code=203012 -invalid.session.message=invalid.session - -callback.code=203006 -callback.message=invalid.callback.url - -idp.url.code=203006 -idp.url.message=invalid.idp.url - -IdPSAMLResponse.code=002001 -IdPSAMLResponse.message=invalid.idp.response - -authenticationFailed.code=003002 -authenticationFailed.message=authentication.failed - -username.code=003002 -username.message=authentication.failed - -invalidAttributeList.code=203001 -invalidAttributeList.message=invalid.attrlist - -invalidAttributeValue.code=203001 -invalidAttributeValue.message=invalid.attr.value - -attVerification.mandatory.code=202010 -attVerification.mandatory.message=missing.mandatory.attr - -attrValue.verification.code=203008 -attrValue.verification.message=invalid.stork.attrValue - -cpepsSAMLResponse.code=202012 -cpepsSAMLResponse.message=error.gen.cpeps.saml - -AtPSAMLResponse.code=202009 -AtPSAMLResponse.message=error.gen.atp.saml - -atp.url.code=203006 -atp.url.message=invalid.atp.url - -hash.error.code=203001 -hash.error.message=error.hash - -qaaLevel.code=203006 -qaaLevel.message=invalid.cpeps.qaalevel - -SAMLRequest.code=203001 -SAMLRequest.message=invalid.SAMLRequest - -atp.response.error.code=202011 -atp.response.error.message=atp.response.error - -#Colleague Request Interface errors - -colleagueRequest.invalidSAML.code=201002 -colleagueRequest.invalidSAML.message=invalid.speps.samlrequest - -colleagueRequest.invalidCountryCode.code=002001 -colleagueRequest.invalidCountryCode.message=country.cpeps.nomatch - -colleagueRequest.errorCreatingSAML.code=203001 -colleagueRequest.errorCreatingSAML.message=error.create.saml.cpeps - -colleagueRequest.invalidQaa.code=202004 -colleagueRequest.invalidQaa.message=invalid.requested.cpeps.qaalevel - -colleagueRequest.attrNull.code=202005 -colleagueRequest.attrNull.message=invalid.requested.attrlist.cpeps - -colleaguePVRequest.invalidPVAttrList.code=202013 -colleaguePVRequest.invalidPVAttrList.message=invalid.speps.pv.attrlist - -colleagueRequest.invalidRedirect.code=202001 -colleagueRequest.invalidRedirect.message=invalid.redirecturl.cpeps - -colleagueRequest.invalidDestUrl.code=203006 -colleagueRequest.invalidDestUrl.message=invalid.cpeps.destUrl - -cpepsRedirectUrl.code=203006 -cpepsRedirectUrl.message=invalid.cpeps.redirectUrl - -#Citizen Consent Interfaces errors - -citizenResponse.mandatory.code=202007 -citizenResponse.mandatory.message=no.consent.mand.attr - -cPeps.attrNull.code=202005 -cPeps.attrNull.message=invalid.attrList.cpeps - -citizenNoConsent.mandatory.code=202012 -citizenNoConsent.mandatory.message=no.consent.val.mand.attr - -#Colleague Response Interface errors - -colleagueResponse.invalidSAML.code=202002 -colleagueResponse.invalidSAML.message=invalid.cpeps.samlresp - -auRequestIdError.code=201005 -auRequestIdError.message=invalid.speps.saml.id - -audienceRestrictionError.code=201004 -audienceRestrictionError.message=speps.saml.condition.notmet - -spepsSAMLResponse.code=200010 -spepsSAMLResponse.message=error.gen.speps.saml - - -invalid.apepsRedirectUrl.code=001001 -invalid.apepsRedirectUrl.message=invalid.apeps.redirectUrl - -apepsSAMLRequest.code=001002 -apepsSAMLRequest.message=invalid.apeps.saml.request - -apepsSAMLResponse.code=001003 -apepsSAMLResponse.message=invalid.apeps.saml.response - -invalid.apepsCallbackUrl.code=001004 -invalid.apepsCallbackUrl.message=invalid.apeps.callback.url - -colleagueAttributeRequest.invalidSAML.code=001005 -colleagueAttributeRequest.invalidSAML.message=invalid.attr.request.saml - - -#Hash Digests -hashDigest.className=org.bouncycastle.crypto.digests.SHA512Digest diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/.svn/all-wcprops deleted file mode 100644 index a1df0322e..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 59 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/.svn/entries deleted file mode 100644 index 9ee5924fb..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -eu -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/all-wcprops deleted file mode 100644 index 8ee25102a..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 62 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/entries deleted file mode 100644 index df52d249b..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -stork -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops deleted file mode 100644 index 5a83dbd10..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 68 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/entries deleted file mode 100644 index 7af1f8357..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -peps -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops deleted file mode 100644 index fd64eea7b..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/entries deleted file mode 100644 index 39e7255f2..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -auth -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops deleted file mode 100644 index 3bab81b06..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 78 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries deleted file mode 100644 index 30659cbb6..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -specific -dir - -commons -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops deleted file mode 100644 index 3c42375b6..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops +++ /dev/null @@ -1,191 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 86 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons -END -AttributeSource.java -K 25 -svn:wc:ra_dav:version-url -V 107 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/package-info.java -END -PEPSValues.java -K 25 -svn:wc:ra_dav:version-url -V 102 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java -END -STORKAttrQueryRequest.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java -END -CitizenConsent.java -K 25 -svn:wc:ra_dav:version-url -V 106 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java -END -AttributeProvidersMap.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java -END -STORKAttrQueryResponse.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java -END -PersonalAttributeList.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java -END -AttributeName.java -K 25 -svn:wc:ra_dav:version-url -V 105 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java -END -PEPSUtil.java -K 25 -svn:wc:ra_dav:version-url -V 100 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java -END -PersonalAttribute.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java -END -IAttributeListProcessor.java -K 25 -svn:wc:ra_dav:version-url -V 115 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java -END -STORKLogoutResponse.java -K 25 -svn:wc:ra_dav:version-url -V 111 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java -END -IStorkLogger.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java -END -DateUtil.java -K 25 -svn:wc:ra_dav:version-url -V 99 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java -END -STORKAuthnRequest.java -K 25 -svn:wc:ra_dav:version-url -V 108 -/CITnet/svn/STORK2/!svn/ver/56/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java -END -AttributeProvider.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java -END -IStorkSession.java -K 25 -svn:wc:ra_dav:version-url -V 104 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java -END -Linker.java -K 25 -svn:wc:ra_dav:version-url -V 98 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/Linker.java -END -PEPSParameters.java -K 25 -svn:wc:ra_dav:version-url -V 106 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java -END -AttributeConstants.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java -END -AttributeUtil.java -K 25 -svn:wc:ra_dav:version-url -V 105 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java -END -STORKStatusCode.java -K 25 -svn:wc:ra_dav:version-url -V 106 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java -END -Country.java -K 25 -svn:wc:ra_dav:version-url -V 98 -/CITnet/svn/STORK2/!svn/ver/96/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/Country.java -END -PEPSErrors.java -K 25 -svn:wc:ra_dav:version-url -V 102 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java -END -STORKLogoutRequest.java -K 25 -svn:wc:ra_dav:version-url -V 110 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java -END -IAttributeProvidersMap.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/31/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java -END -STORKSubStatusCode.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java -END -IPersonalAttributeList.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java -END -STORKAuthnResponse.java -K 25 -svn:wc:ra_dav:version-url -V 110 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java -END -CountryCodes.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries deleted file mode 100644 index b18b22565..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries +++ /dev/null @@ -1,1085 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth/commons -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -PersonalAttributeList.java -file - - - - -2014-01-21T08:38:55.336702Z -0036d26679cc31fe7d1bdea1b8b3555a -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -12041 - -AttributeName.java -file - - - - -2014-01-21T08:38:55.336702Z -164e63d1f4e5aeb47d371caff534eaab -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1504 - -PEPSErrors.java -file - - - - -2014-01-21T08:38:55.336702Z -bfe69afce772675187fdd637453ed12f -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -12165 - -STORKLogoutRequest.java -file - - - - -2014-01-21T08:38:55.336702Z -af445a2013f21ffecd3db7773ae3236e -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4343 - -PersonalAttribute.java -file - - - - -2014-01-21T08:38:55.336702Z -ce98ef39a754869644b5516cdcfcb40d -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8914 - -IAttributeListProcessor.java -file - - - - -2014-01-21T08:38:55.336702Z -07efc5b742cc9e4b80a2f8b17fe4b946 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4713 - -IAttributeProvidersMap.java -file - - - - -2013-12-20T12:27:56.634475Z -225257e8d6d7b9e6bcc4bea2463c33be -2013-10-10T17:38:31.956327Z -31 -emlelisst - - - - - - - - - - - - - - - - - - - - - -2534 - -STORKLogoutResponse.java -file - - - - -2014-01-21T08:38:55.336702Z -880a05076cf8412311766aa40cf6a63f -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -5474 - -STORKSubStatusCode.java -file - - - - -2013-12-20T12:27:56.634475Z -65e615e0119d4125d5f4f58af8bcd18b -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2181 - -STORKAuthnRequest.java -file - - - - -2013-12-20T12:27:56.634475Z -3f36e65f0c4f1c7df753784b2e64f00b -2013-10-24T15:44:04.704923Z -56 -emgrtargr - - - - - - - - - - - - - - - - - - - - - -11269 - -IPersonalAttributeList.java -file - - - - -2014-01-21T08:38:55.336702Z -b441a2c6c3eddcf1043c55e55f48faa6 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -6598 - -AttributeProvider.java -file - - - - -2014-01-21T08:38:55.336702Z -39c770ebd2082723b9eeb68bf17ee698 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1687 - -IStorkSession.java -file - - - - -2013-12-20T12:27:56.634475Z -5a8701b1fd27998d5cf3280a5c99bcb0 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2745 - -CountryCodes.java -file - - - - -2013-12-20T12:27:56.638475Z -f91b0f8df0b2a68fe1b900d425257c23 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3527 - -STORKAuthnResponse.java -file - - - - -2014-01-21T08:38:55.336702Z -f2247f9a89e8ad01f9a24ad716f993ca -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8724 - -package-info.java -file - - - - -2013-12-20T12:27:56.638475Z -8d8068e217f10425f76a8d37192ccd80 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -277 - -PEPSValues.java -file - - - - -2014-01-21T08:38:55.336702Z -ee08f149082a8e4888fb25ca70ae931f -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -7592 - -CitizenConsent.java -file - - - - -2014-01-21T08:38:55.336702Z -39e236d6888f266d9b4967f19726126c -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3445 - -STORKStatusCode.java -file - - - - -2013-12-20T12:27:56.638475Z -771689c75a8263c7e3966e820d59025e -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1906 - -AttributeUtil.java -file - - - - -2014-01-21T08:38:55.336702Z -2859d3335dfe719ca04258fae54e69a3 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -7927 - -exceptions -dir - -STORKAttrQueryResponse.java -file - - - - -2014-01-21T08:38:55.336702Z -93fc508be2bc0fd29ae453b0868e1d2b -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -9080 - -Country.java -file - - - - -2013-12-20T12:27:56.638475Z -9cbde5f25b646d02dae7ccf424906b4a -2013-11-01T20:35:30.927048Z -96 -emferreri - - - - - - - - - - - - - - - - - - - - - -2208 - -PEPSUtil.java -file - - - - -2014-01-21T08:38:55.336702Z -1fef4b668542bb572c856053b61aa6af -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -11505 - -DateUtil.java -file - - - - -2013-12-20T12:27:56.634475Z -59f9cd2a3d1169a0f1a797b28719921a -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -5702 - -IStorkLogger.java -file - - - - -2013-12-20T12:27:56.634475Z -f15979b29f52d1674103528aed914ae7 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4766 - -AttributeSource.java -file - - - - -2014-01-21T08:38:55.336702Z -a0555599193656bc17e02c3ce23043be -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4501 - -Linker.java -file - - - - -2014-01-21T08:38:55.336702Z -98f46baee16310e3dc59ef224ba5b5ab -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8950 - -PEPSParameters.java -file - - - - -2014-01-21T08:38:55.332702Z -95e7dfcbff9c4ca76c2f4aea047f0bfd -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -15289 - -STORKAttrQueryRequest.java -file - - - - -2014-01-21T08:38:55.336702Z -2d4ac505f71020c482ebbefa10484552 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -10617 - -AttributeProvidersMap.java -file - - - - -2014-01-21T08:38:55.336702Z -b487da35df5353c8b2aba47ab3cdb68d -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2608 - -AttributeConstants.java -file - - - - -2013-12-20T12:27:56.638475Z -940dcb9e93ede62e221f4b25abd6576b -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1831 - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base deleted file mode 100644 index 09769641c..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the STORK PEPS, Commons and Specific errors - * constant identifiers. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.2 $, $Date: 2010-11-17 05:15:28 $ - */ -public enum AttributeConstants { - - /** - * Represents the attribute's name index. - */ - ATTR_NAME_INDEX(0), - /** - * Represents the attribute's type index. - */ - ATTR_TYPE_INDEX(1), - /** - * Represents the attribute's value index. - */ - ATTR_VALUE_INDEX(2), - /** - * Represents the attribute's status index. - */ - ATTR_STATUS_INDEX(3), - /** - * Represents the number of allowed tuples. - */ - NUMBER_TUPLES(4); - - /** - * Represents the constant's value. - */ - private int attribute; - - /** - * Solo Constructor. - * - * @param attr The Attribute Constant value. - */ - AttributeConstants(final int attr) { - - this.attribute = attr; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public int intValue() { - - return attribute; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base deleted file mode 100644 index 32352f563..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base +++ /dev/null @@ -1,74 +0,0 @@ -package eu.stork.peps.auth.commons; - -/** - * This class is a bean used to store information relative to Attribute Names. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.00 $, $Date: 2013-11-26 $ - */ -public final class AttributeName { - - /** - * Attribute Id. - */ - private String attributeId; - - /** - * Attribute Name. - */ - private String attributeName; - - /** - * Attribute Name Constructor. - * - * @param aId Id of the Attribute Name. - * @param aName Name of the Attribute Name. - */ - public AttributeName(final String aId, final String aName) { - - this.attributeId = aId; - this.attributeName = aName; - } - - /** - * Getter for the attributeId value. - * - * @return The attributeId value. - */ - public String getAttributeId() { - - return attributeId; - } - - /** - * Setter for the attributeId value. - * - * @param aId Id of the Attribute Name. - */ - public void setAttributeId(final String aId) { - - this.attributeId = aId; - } - - /** - * Getter for the attributeName value. - * - * @return The attributeName value. - */ - public String getAttributeName() { - - return attributeName; - } - - /** - * Setter for the attributeName value. - * - * @param name Name of the Attribute Name. - */ - public void setAttributeName(final String name) { - - this.attributeName = name; - } - -} \ No newline at end of file diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base deleted file mode 100644 index 5fb04e331..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base +++ /dev/null @@ -1,80 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -/** - * This class is a bean used to store the information relative to the Attribute Provider. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.01 $, $Date: 2013-11-28 $ - */ -public final class AttributeProvider implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = 7210186241917444559L; - - /** - * Provider Id. - */ - private String providerId; - - /** - * Provider Name. - */ - private String providerName; - - /** - * Attribute Provider Constructor. - * - * @param pId Id of the Attribute Provider. - * @param pName Name of the Attribute Provider. - */ - public AttributeProvider(final String pId, final String pName) { - - this.providerId = pId; - this.providerName = pName; - } - - /** - * Getter for the providerId value. - * - * @return The providerId value. - */ - public String getProviderId() { - - return providerId; - } - - /** - * Setter for the providerId value. - * - * @param pId Id of the Attribute Provider. - */ - public void setProviderId(final String pId) { - - this.providerId = pId; - } - - /** - * Getter for the providerName value. - * - * @return The providerName value. - */ - public String getProviderName() { - - return providerName; - } - - /** - * Setter for the providerName value. - * - * @param name Name of the Attribute Provider. - */ - public void setProviderName(final String name) { - - this.providerName = name; - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base deleted file mode 100644 index 3059caaa3..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base +++ /dev/null @@ -1,96 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.util.Iterator; -import java.util.LinkedHashMap; - -import org.apache.log4j.Logger; - -/** - * Implementation of the AttributeProviderMap using a LinkedHashMap. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.01 $, $Date: 2013-09-20 $ - * - * @see LinkedHashMap - */ -public class AttributeProvidersMap extends LinkedHashMap - implements IAttributeProvidersMap { - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(AttributeProvidersMap.class.getName()); - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 8949081185106296122L; - - /** - * {@inheritDoc} - */ - @Override - public IPersonalAttributeList get(final AttributeSource key) { - return this.get((Object) key); - } - - /** - * {@inheritDoc} - */ - @Override - public IPersonalAttributeList remove(final AttributeSource key) { - return this.remove((Object) key); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean containsKey(final AttributeSource key) { - return this.containsKey((Object) key); - } - - /** - * {@inheritDoc} - */ - @Override - public Iterator keyIterator() { - return this.keySet().iterator(); - } - - public void trace() { - Iterator iterator; - Iterator iterator2; - AttributeSource source; - IPersonalAttributeList pal; - PersonalAttribute pa; - - iterator = this.keyIterator(); - LOG.trace("Start dumping of AttributeProvidersMap\n======================="); - while (iterator.hasNext()) { - source = iterator.next(); - - LOG.trace("Source details: type [" + source.getSourceType() + "], URL [" + source.getProviderURL() + "]"); - - if(source.getSourceType() == AttributeSource.SOURCE_LOCAL_APROVIDER) { - LOG.trace("-> Attribute Provider: ID [" + source.getProvider().getProviderId() + "], name [" + source.getProvider().getProviderName() + "]"); - } - else { - LOG.trace("-> Country: ID [" + source.getCountry().getCountryId() + "], name [" + source.getCountry().getCountryName() + "]"); - } - - pal = this.get(source); - LOG.trace("++++++++=>"); - iterator2 = pal.iterator(); - while (iterator2.hasNext()) { - pa = iterator2.next(); - - LOG.trace("-> Citizen Attribute: name [" + pa.getName() + "], required [" + pa.isRequired() + "]"); - } - LOG.trace("<=++++++++"); - - LOG.trace("-----------------------"); - } - LOG.trace("END\n======================="); - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base deleted file mode 100644 index e1ae0049d..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base +++ /dev/null @@ -1,188 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information relative to the Attribute Source (either AttributeProvider or Country). - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.10 $, $Date: 2013-11-29 $ - */ -public final class AttributeSource implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = 432243595968469014L; - - public static final int SOURCE_LOCAL_APROVIDER = 1; - public static final int SOURCE_REMOTE_COUNTRY = 2; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(AttributeSource.class.getName()); - - /** - * Provider source. - */ - private int sourceType; - - /** - * Provider URL. - */ - private String providerURL; - - /** - * The local Attribute Provider. - */ - private AttributeProvider provider; - - /** - * The remote Country. - */ - private Country country; - - /** - * Attribute Source Constructor. - * - * @param provider The local Attribute Provider. - * @param pURL URL of the Attribute Provider. - */ - public AttributeSource(final AttributeProvider provider, final String pURL) { - this.setSourceType(SOURCE_LOCAL_APROVIDER); - - this.setProvider(provider); - this.setProviderURL(pURL); - } - - /** - * Attribute Source Constructor. - * - * @param country The remote Country. - * @param pURL URL of the Country. - */ - public AttributeSource(final Country country, final String pURL) { - this.setSourceType(SOURCE_REMOTE_COUNTRY); - - this.setCountry(country); - this.setProviderURL(pURL); - } - - /** - * @param sourceType the sourceType to set - */ - public void setSourceType(final int sourceType) { - this.sourceType = sourceType; - } - - /** - * @return the sourceType - */ - public int getSourceType() { - return sourceType; - } - - /** - * @param providerURL the providerURL to set - */ - public void setProviderURL(final String providerURL) { - this.providerURL = providerURL; - } - - /** - * @return the providerURL - */ - public String getProviderURL() { - return providerURL; - } - - /** - * @param provider the provider to set - */ - public void setProvider(final AttributeProvider provider) { - this.setSourceType(SOURCE_LOCAL_APROVIDER); - - this.provider = provider; - } - - /** - * @return the provider - */ - public AttributeProvider getProvider() { - return provider; - } - - /** - * @param country the country to set - */ - public void setCountry(final Country country) { - this.setSourceType(SOURCE_REMOTE_COUNTRY); - - this.country = country; - } - - /** - * @return the country - */ - public Country getCountry() { - return country; - } - - /** - * {@inheritDoc} - */ - public boolean equals(Object obj) { - boolean outcome = false; - - LOG.debug("Calling equals with Object."); - if ( obj instanceof AttributeSource ) { - LOG.debug("Calling equals with AttributeSource."); - outcome = this.equals((AttributeSource)obj); - } - - LOG.debug("Object equals outcome: " + outcome); - return outcome; - } - - /** - * Compare the given AttributeSource with the current object in order to determinine - * if they are equal. - * - * @param obj The AttributeSource to compare to - * - * @return true if the two objects are equal - */ - public boolean equals(AttributeSource obj) { - boolean outcome = false; - - if ( this.sourceType==obj.getSourceType() ) { - if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER ) { - if ( this.provider.getProviderId().equals(obj.getProvider().getProviderId()) ) - outcome = true; - } - else if ( this.sourceType==AttributeSource.SOURCE_REMOTE_COUNTRY ) { - if ( this.country.getCountryId().equals(obj.getCountry().getCountryId()) ) - outcome = true; - } - } - - LOG.debug("AttributeSource equals outcome: " + outcome); - return outcome; - } - - /** - * {@inheritDoc} - */ - public int hashCode() { - int hash = 1; - hash = hash * 17 + this.sourceType; - if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER ) - hash = hash * 31 + this.provider.getProviderName().hashCode(); - else - hash = hash * 31 + this.country.getCountryName().hashCode(); - return hash; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base deleted file mode 100644 index af7ab6cf3..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base +++ /dev/null @@ -1,231 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang.StringUtils; - -/** - * This class holds static helper methods. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.5 $, $Date: 2010-12-15 23:19:59 $ - */ -public final class AttributeUtil { - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private AttributeUtil() { - // empty constructor - } - - /** - * Safe escape any given string. - * - * @param value The HTTP Value to escaped. - * - * @return The value escaped value. - */ - public static String escape(final String value) { - - final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); - final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); - final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); - - final String escAttrSep = "%" + (int) attrSep.charAt(0); - final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); - final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); - - return value.replace(attrSep, escAttrSep) - .replace(attrTupleSep, escAttrTupleSep) - .replace(attrValueSep, escAttrValueSep); - } - - /** - * Unescape any given string. - * - * @param value The HTTP Value to be unescaped. - * - * @return The value unescaped value. - */ - public static String unescape(final String value) { - final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); - final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); - final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); - - final String escAttrSep = "%" + (int) attrSep.charAt(0); - final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); - final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); - - return value.replace(escAttrSep, attrSep) - .replace(escAttrTupleSep, attrTupleSep) - .replace(escAttrValueSep, attrValueSep); - } - - /** - * Appends the string representation of an object to a StringBuilder. - * - * @param strBuilder The StringBuilder to append to. - * @param val The string representation of an object. - */ - public static void appendIfNotNull(final StringBuilder strBuilder, - final Object val) { - - if (val != null) { - strBuilder.append(val); - } - } - - /** - * Given a separator and a list of strings, joins the list, as a string, - * separated by the separator string. - * - * @param list The list of strings to join. - * @param separator The separator string. - * @return the list, as a string, separated by the separator string. - */ - public static String listToString(final List list, - final String separator) { - - final StringBuilder strBuilder = new StringBuilder(); - for (final String s : list) { - if (!StringUtils.isEmpty(s)) { - strBuilder.append(AttributeUtil.escape(s) + separator); - } - } - return strBuilder.toString(); - } - - /** - * Given a separator and a map of strings to strings, joins the map, as a - * string, separated by the separator string with the pair key/value - * concatenated with a '='. - * - * @param map The map of strings to join. - * @param separator The separator string. - * - * @return the map of strings, as a string, separated by the separator string - * with the pair key/value concatenated with a '='. - */ - public static String mapToString(final Map map, - final String separator) { - - final StringBuilder strBuilder = new StringBuilder(); - final Iterator> valuesIt = map.entrySet().iterator(); - while (valuesIt.hasNext()) { - final Entry entry = valuesIt.next(); - strBuilder.append(entry.getKey()); - strBuilder.append('='); - strBuilder.append(AttributeUtil.escape(entry.getValue())); - strBuilder.append(separator); - } - return strBuilder.toString(); - } - - /** - * Validates the attribute value format. - * - * @param value The attribute value to validate. - * - * @return true if value has a valid format. - */ - public static boolean isValidValue(final String value) { - boolean retVal = false; - if (value != null && value.charAt(0) == '[' && value.endsWith("]")) { - final String tmpAttrValue = value.substring(1, value.length() - 1); - final String[] vals = - tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - if (tmpAttrValue.length() >= 0 - || (vals.length > 0 && vals[0].length() > 0)) { - retVal = true; - } - } - return retVal; - } - - /** - * Validates the attribute type value. It's case insensitive. E.g. return true - * value to: a) "true", "TRUE", "True", ... b) "false", "FALSE", "False", ... - * - * @param type The attribute type value. - * - * @return true if type has a true or false (case insensitive) value. - */ - public static boolean isValidType(final String type) { - return StringUtils.isNotEmpty(type) && (PEPSValues.TRUE.toString().equalsIgnoreCase(type) || PEPSValues.FALSE.toString().equalsIgnoreCase(type)) ; - } - - /** - * Validates the Personal attribute tuple. E.g. name:type:[value]:status - * - * @param tuples The Personal attribute's tuple. - * - * @return true if the tuples' format is valid. - * - * @see PEPSUtil#validateParameter(String, String, String) - * @see String#equalsIgnoreCase(String) - */ - public static boolean hasValidTuples(final String[] tuples) { - boolean retVal = false; - - final int numberTuples = AttributeConstants.NUMBER_TUPLES.intValue(); - if (tuples != null && tuples.length == numberTuples) { - // validate attrName - final int attrNameIndex = AttributeConstants.ATTR_NAME_INDEX.intValue(); - final int attrTypeIndex = AttributeConstants.ATTR_TYPE_INDEX.intValue(); - final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue(); - - retVal = - StringUtils.isNotEmpty(tuples[attrNameIndex]) - && StringUtils.isNotEmpty(tuples[attrTypeIndex]) - && StringUtils.isNotEmpty(tuples[attrValueIndex]) - && AttributeUtil.isValidType(tuples[attrTypeIndex]) - && AttributeUtil.isValidValue(tuples[attrValueIndex]); - } - return retVal; - } - - /** - * Check if all mandatory attributes have values. - * - * @param personalAttrList The Personal Attributes List. - * - * @return true if all mandatory attributes have values, false if at least one - * attribute doesn't have value. - */ - public static boolean checkMandatoryAttributes( - final IPersonalAttributeList personalAttrList) { - - final Iterator itAttributes = - personalAttrList.values().iterator(); - boolean retVal = true; - while (itAttributes.hasNext() && retVal) { - final PersonalAttribute attr = itAttributes.next(); - if (attr.isRequired() - && !STORKStatusCode.STATUS_AVAILABLE.toString() - .equals(attr.getStatus())) { - retVal = false; - } - } - return retVal; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base deleted file mode 100644 index 9ebcfbd5a..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base +++ /dev/null @@ -1,123 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.ArrayList; -import java.util.List; - -/** - * This class is a bean used to store the information relative to the Citizen - * Consent. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class CitizenConsent { - - /** - * Mandatory attributes list. - */ - private List mandatoryList; - - /** - * Optional attributes list. - */ - private List optionalList; - - /** - * Citizen Consent default Constructor. - */ - public CitizenConsent() { - this.mandatoryList = new ArrayList(); - this.optionalList = new ArrayList(); - } - - /** - * Getter for the mandatoryList value. - * - * @return The mandatoryList value. - */ - public List getMandatoryList() { - return this.mandatoryList; - } - - /** - * Setter for the mandatoryList value. - * - * @param mandatoryAttrList Mandatory parameters list. - */ - public void setMandatoryList(final List mandatoryAttrList) { - this.mandatoryList = mandatoryAttrList; - } - - /** - * Setter for some mandatoryAttribute. Adds the input parameter to the - * mandatoryList. - * - * @param mandatoryAttr Attribute to add to the mandatoryList. - */ - public void setMandatoryAttribute(final String mandatoryAttr) { - this.mandatoryList.add(mandatoryAttr); - } - - /** - * Getter for the optionalList value. - * - * @return The optionalList value. - */ - public List getOptionalList() { - return optionalList; - } - - /** - * Setter for the optionalList value. - * - * @param optAttrList Optional parameters list. - */ - public void setOptionalList(final List optAttrList) { - this.optionalList = optAttrList; - } - - /** - * Setter for some optionalAttr. Adds the input parameter to the optionalList. - * - * @param optionalAttr Attribute to add to the optionalList. - */ - public void setOptionalAttribute(final String optionalAttr) { - this.optionalList.add(optionalAttr); - } - - /** - * Returns a string in the following format. "Mandatory attributes: - * mandatoryAttr1;mandatoryAttr2;mandatoryAttrN Optional attributes: - * optionalAttr1;optionalAttr2;optionalAttrN" - * - * @return {@inheritDoc} - */ - public String toString() { - final StringBuilder strbldr = new StringBuilder(46); - strbldr.append("Mandatory attributes: "); - for (final String str : mandatoryList) { - strbldr.append(str).append(';'); - } - strbldr.append(" Optional attributes: "); - for (final String str : optionalList) { - strbldr.append(str).append(';'); - } - return strbldr.toString(); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base deleted file mode 100644 index 001f9317a..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base +++ /dev/null @@ -1,95 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -/** - * This class is a bean used to store the information relative to the Country. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.10 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class Country implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1135994036496370993L; - -/** - * Country Id. - */ - private String countryId; - - /** - * Country Name. - */ - private String countryName; - - /** - * Country Constructor. - * - * @param cId Id of the Country. - * @param cName Name of the Country. - */ - public Country(final String cId, final String cName) { - - this.countryId = cId; - this.countryName = cName; - } - - /** - * Getter for the countryId value. - * - * @return The countryId value. - */ - public String getCountryId() { - - return countryId; - } - - /** - * Setter for the countryId value. - * - * @param cId Id of the Country. - */ - public void setCountryId(final String cId) { - - this.countryId = cId; - } - - /** - * Getter for the countryName value. - * - * @return The countryName value. - */ - public String getCountryName() { - - return countryName; - } - - /** - * Setter for the countryName value. - * - * @param name Name of the Country. - */ - public void setCountryName(final String name) { - - this.countryName = name; - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base deleted file mode 100644 index 54345f3ea..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.Arrays; -import java.util.List; - -/** - * This class contains all the ISO 3166-1 Alpha 3 Country Codes. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.2 $, $Date: 2011-04-14 00:24:56 $ - */ -public final class CountryCodes { - - /** - * Private Constructor. - */ - private CountryCodes() { - - } - - /** - * ISO 3166-1 Alpha 3 Country Codes. - */ - private static List countrysAlpha3 = Arrays.asList("ABW", "AFG", - "AGO", "AIA", "ALA", "ALB", "AND", "ANT", "ARE", "ARG", "ARM", "ASM", - "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI", "BEL", "BEN", "BES", - "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU", - "BOL", "BRA", "BRB", "BRN", "BTN", "BUR", "BVT", "BWA", "BYS", "CAF", - "CAN", "CCK", "CHE", "CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK", - "COL", "COM", "CPV", "CRI", "CSK", "CUB", "CUW", "CXR", "CYM", "CYP", - "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY", "ERI", - "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO", "FSM", - "GAB", "GBR", "GEO", "GGY", "GHA", "GIB", "GIN", "GLP", "GMB", "GNB", - "GNQ", "GRC", "GRD", "GRL", "GTM", "GUF", "GUM", "GUY", "HKG", "HMD", - "HND", "HRV", "HTI", "HUN", "IDN", "IMN", "IND", "IOT", "IRL", "IRN", - "IRQ", "ISL", "ISR", "ITA", "JAM", "JEY", "JOR", "JPN", "KAZ", "KEN", - "KGZ", "KHM", "KIR", "KNA", "KOR", "KWT", "LAO", "LBN", "LBR", "LBY", - "LCA", "LIE", "LKA", "LSO", "LTU", "LUX", "LVA", "MAC", "MAF", "MAR", - "MCO", "MDA", "MDG", "MDV", "MEX", "MHL", "MKD", "MLI", "MLT", "MMR", - "MNE", "MNG", "MNP", "MOZ", "MRT", "MSR", "MTQ", "MUS", "MWI", "MYS", - "MYT", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NIU", "NLD", "NOR", - "NPL", "NRU", "NZL", "OMN", "PAK", "PAN", "PCN", "PER", "PHL", "PLW", - "PNG", "POL", "PRI", "PRK", "PRT", "PRY", "PSE", "PYF", "QAT", "REU", - "ROM", "ROU", "RUS", "RWA", "SAU", "SCG", "SDN", "SEN", "SGP", "SGS", - "SHN", "SJM", "SLB", "SLE", "SLV", "SMR", "SOM", "SPM", "SRB", "STP", - "SUR", "SVK", "SVN", "SXW", "SWE", "SWZ", "SYC", "SYR", "TCA", "TCD", - "TGO", "THA", "TJK", "TKL", "TKM", "TLS", "TMP", "TON", "TTO", "TUN", - "TUR", "TUV", "TWN", "TZA", "UGA", "UKR", "UMI", "URY", "USA", "UZB", - "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", - "YUG", "ZAF", "ZAR", "ZMB", "ZWE"); - - /** - * Searches the CountryCode (3166-1 alpha3 format) an return true if it - * exists. - * - * @param countryCode The Country code to search. - * - * @return true if the CountryCode exists, false otherwise. - */ - public static boolean hasCountryCodeAlpha3(final String countryCode) { - - return CountryCodes.countrysAlpha3.contains(countryCode); - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base deleted file mode 100644 index 9c0bd6775..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base +++ /dev/null @@ -1,169 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.sql.Timestamp; -import java.util.GregorianCalendar; - -import org.apache.log4j.Logger; -import org.joda.time.DateTime; -import org.joda.time.Years; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; - -import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException; - -/** - * This class holds static helper methods for Date Operations. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.4 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class DateUtil { - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(DateUtil.class.getName()); - - /** - * yyyy Date format size. - */ - private static final int YEAR_DATE_SIZE = 4; - - /** - * yyyyMM Date format size. - */ - private static final int MONTH_DATE_SIZE = 6; - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private DateUtil() { - // empty constructor - } - - /** - * Fulfils dateValue with a valid date. The following roles are applied: a) If - * the dateValue only contains the year then fulfils with last year's day. - * e.g. this method returns 19951231 to the 1995 dateValue. b) If the - * dateValue contains the year and the month then fulfils with last month's - * day. e.g. this method returns 19950630 to the 199505 dateValue. - * - * @param dateValue The date to be fulfilled. - * - * @return The dateValue fulfilled. - */ - private static String fulfilDate(final String dateValue) { - - final StringBuffer strBuf = new StringBuffer(); - strBuf.append(dateValue); - // if the IdP just provides the year then we must fullfil the date. - if (dateValue.length() == YEAR_DATE_SIZE) { - strBuf.append(PEPSValues.LAST_MONTH.toString()); - } - // if the IdP provides the year and the month then we must fullfil the - // date. - if (dateValue.length() == MONTH_DATE_SIZE - || strBuf.length() == MONTH_DATE_SIZE) { - // IdP doesn't provide the day, so we will use DateTime to - // calculate it. - final String noDayCons = PEPSValues.NO_DAY_DATE_FORMAT.toString(); - final DateTimeFormatter fmt = DateTimeFormat.forPattern(noDayCons); - final DateTime dateTime = fmt.parseDateTime(strBuf.toString()); - // Append the last month's day. - strBuf.append(dateTime.dayOfMonth().withMaximumValue().getDayOfMonth()); - } - - return strBuf.toString(); - } - - /** - * Validates the dateValue format: a) if has a valid size; b) if has a numeric - * value; Note: dateValue must have the format yyyyMMdd. - * - * @param dateValueTmp The date to be validated. - * @param pattern The accepted date format. - * - * @return true if the date has a valid format. - */ - public static boolean isValidFormatDate(final String dateValueTmp, - final String pattern) { - - boolean retVal = true; - try { - final String dateValue = DateUtil.fulfilDate(dateValueTmp); - - final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); - fmt.parseDateTime(dateValue); - } catch (final Exception e) { - // We catch Exception because we only have to return false - // value! - retVal = false; - } - return retVal; - } - - /** - * Calculates the age for a given date string. - * - * @param dateVal The date to be validated. - * @param now The current date. - * @param pattern The date pattern. - * - * @return The age value. - */ - public static int calculateAge(final String dateVal, final DateTime now, - final String pattern) { - - if (DateUtil.isValidFormatDate(dateVal, pattern)) { - try { - final String dateValueTemp = DateUtil.fulfilDate(dateVal); - final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); - final DateTime dateTime = fmt.parseDateTime(dateValueTemp); - // Calculating age - final Years age = Years.yearsBetween(dateTime, now); - - return age.getYears(); - } catch (final IllegalArgumentException e) { - LOG.warn("Invalid date format (" + pattern - + ") or an invalid dateValue."); - throw new SecurityPEPSException( - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()), - e); - } - } else { - LOG.warn("Couldn't calculate Age, invalid date!"); - throw new SecurityPEPSException( - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage())); - } - - } - - /** - * Generates the current timestamp. - * - * @return timestamp The current timestamp - */ - public static Timestamp currentTimeStamp() { - final GregorianCalendar cal = new GregorianCalendar(); - final long millis = cal.getTimeInMillis(); - return new Timestamp(millis); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base deleted file mode 100644 index b13c70f04..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base +++ /dev/null @@ -1,148 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.util.List; -import java.util.Map; - -/** - * Interface for {@link AttributeListProcessor}. - * - * @author ricardo.ferreira@multicert.com - * - * @version $Revision: $, $Date: $ - * - * @see IPersonalAttributeList - */ -public interface IAttributeListProcessor { - - /** - * Checks if attribute list only contains allowed attributes. - * - * @param attrList the requested attribute list - * @param attributes the allowed attributes - * - * @return true is all the attributes are allowed. - * - * @see IPersonalAttributeList - */ - boolean hasAllowedAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Lookup for business attribute. - * - * @param attrList the requested attribute list - * @param normalAttributes the normal attributes - * - * @return true is at least one business attribute was requested. - * - * @see IPersonalAttributeList - */ - boolean hasBusinessAttributes(final IPersonalAttributeList attrList, final List normalAttributes); - - /** - * Lookup for business attribute in normal attribute list (loaded by - * implementation). - * - * @param attrList the requested attribute list - * - * @return true is at least one business attribute was requested. - * - * @see IPersonalAttributeList - */ - boolean hasBusinessAttributes(final IPersonalAttributeList attrList); - - /** - * Adds eIdentifier, name, surname, and DateOfBirth attributes to get business - * attributes from some AP. - * - * @param attrList the requested attribute list - * @param attributes the list of attributes to add (eIdentifier, name, - * surname, and DateOfBirth). - * - * @return the requested attribute list and the new attributes added - * (eIdentifier, name, surname, and DateOfBirth). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Adds eIdentifier, name, surname, and DateOfBirth attributes, loaded by - * implementation, to get business attributes from some AP. - * - * @param attrList the requested attribute list - * - * @return the requested attribute list and the new attributes added - * (eIdentifier, name, surname, and DateOfBirth). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList); - - /** - * Removes from attribute list the given list of attributes. - * - * @param attrList the requested attribute list - * @param attributes the list of attributes to remove. - * - * @return the requested attribute list and the attributes removed. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList removeAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Removes from attribute list the given list of attributes and change - * attributes status if attribute was optional in the request. - * - * @param attrList the requested attribute list - * @param attributes the map of attributes (attribute name, mandatory/optional) to remove. - * - * @return the requested attribute list and the attributes removed - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList removeAPMandatoryAttributes(IPersonalAttributeList attrList, Map attributes); - - /** - * Checks if mandate attribute exist in the requested Attribute List. Power - * attribute name to lookup is loaded by implementation. - * - * @param attrList the requested attribute list. - * - * @return true if mandate attribute exists or false otherwise. - * - * @see IPersonalAttributeList - */ - boolean hasPowerAttribute(final IPersonalAttributeList attrList); - - /** - * Checks if attribute name was requested and has value. - * - * @param attrList the requested attribute list. - * @param attrName the attribute name to lookup for . - * - * @return true if attribute was requested and has value or false otherwise. - * - * @see IPersonalAttributeList - */ - boolean hasAttributeValue(final IPersonalAttributeList attrList, final String attrName); - - /** - * Checks if attribute has value. - * - * @param attr the attribute to check. - * - * @return true if has value; - * - * @see PersonalAttribute - */ - boolean hasAttributeValue(final PersonalAttribute attr); - - /** - * Gets a map (attribute name, attribute isRequired) of attributes added to attribute list. - * - * @return the Map of attributes added and if is required to attribute list. - */ - Map getNormalAttributesAdded(); - -} \ No newline at end of file diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base deleted file mode 100644 index 5833f6822..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base +++ /dev/null @@ -1,82 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.util.Iterator; - -/** - * Interface for Attributes Providers map. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.00 $, $Date: 2013-09-20 $ - */ -public interface IAttributeProvidersMap { - - /** - * Returns the object associated the the given key. - * - * @param key with which the specified value is to be associated. - * - * @return The object associated the the given key. - */ - IPersonalAttributeList get(AttributeSource key); - - /** - * Associates a key to a value, and inserts them in the session object. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object put(AttributeSource key, IPersonalAttributeList value); - - /** - * Removes the mapping for this key. - * - * @param key with which the specified value is to be associated. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - IPersonalAttributeList remove(AttributeSource key); - - /** - * Returns the number of key-value mappings in this map. - * - * @return the number of key-value mappings in this map. - */ - int size(); - - /** - * Returns true if this map contains a mapping for the specified key. - * - * @param key with which the specified value is to be associated. - * - * @return true if this map contains a mapping for the specified key. - */ - boolean containsKey(AttributeSource key); - - /** - * Removes all mappings from this map. - */ - void clear(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); - - /** - * Returns an Iterator of the keys contained in this map. The implementation must - * take care in order for the Iterator to have predictable order of the returned - * keys. - * - * @return an iterator of the keys contained in this map - */ - Iterator keyIterator(); -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base deleted file mode 100644 index b24c915c0..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base +++ /dev/null @@ -1,194 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.Collection; -import java.util.Iterator; -import java.util.Set; - -/** - * Interface for {@link PersonalAttributeList}. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.16 $, $Date: 2010-11-17 05:15:28 $ - * - * @see PersonalAttribute - */ -@SuppressWarnings("PMD.CloneMethodMustImplementCloneable") -public interface IPersonalAttributeList extends Iterable, - Cloneable { - - /** - * Associates the specified value with the specified key in this Personal - * Attribute List. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return the previous value associated with key, or null if there was no - * mapping for key. - * - * @see PersonalAttribute - */ - PersonalAttribute put(String key, PersonalAttribute value); - - /** - * Returns the value to which the specified key is mapped, or null if this map - * contains no mapping for the key. - * - * @param key whose associated value is to be returned. - * - * @return The value to which the specified key is mapped, or null if this map - * contains no mapping for the key. - * - * @see PersonalAttribute - */ - PersonalAttribute get(Object key); - - /** - * Adds to the PersonalAttributeList the given PersonalAttribute. It sets the - * attribute name as the key to the attribute value. - * - * @param value PersonalAttribute to add to the PersonalAttributeList - */ - void add(PersonalAttribute value); - - /** - * Get the size of the Personal Attribute List. - * - * @return size of the Personal Attribute List. - */ - int size(); - - /** - * Checks if the Personal Attribute List contains the given key. - * - * @param key with which the specified value is to be associated. - * - * @return true if the Personal Attribute List contains the given key, false - * otherwise. - */ - boolean containsKey(Object key); - - /** - * Getter for the iterator of the Personal Attribute List values. - * - * @return The iterator for the Personal Attribute List values. - * - * @see PersonalAttribute - */ - Iterator iterator(); - - /** - * Creates a Personal Attribute List from a String representing an Attribute - * List. - * - * @param attrList String Object representing the attribute list. - */ - void populate(String attrList); - - /** - * Removes the mapping for this key from this map if present. - * - * @param key key whose mapping is to be removed from the map. - * @return previous value associated with specified key, or null if - * there was no mapping for key. A null return can also - * indicate that the map previously associated null with the - * specified key. - */ - PersonalAttribute remove(Object key); - - /** - * Returns a collection view of the values contained in this map. The - * collection is backed by the map, so changes to the map are reflected in the - * collection, and vice-versa. The collection supports element removal, which - * removes the corresponding mapping from this map, via the - * Iterator.remove, Collection.remove, removeAll, - * retainAll, and clear operations. It does not support the - * add or addAll operations. - * - * @return a collection view of the values contained in this map. - */ - Collection values(); - - /** - * Returns a {@link Set} view of the keys contained in this map. - * The set is backed by the map, so changes to the map are - * reflected in the set, and vice-versa. If the map is modified - * while an iteration over the set is in progress (except through - * the iterator's own remove operation), the results of - * the iteration are undefined. The set supports element removal, - * which removes the corresponding mapping from the map, via the - * Iterator.remove, Set.remove, - * removeAll, retainAll, and clear - * operations. It does not support the add or addAll - * operations. - * - * @return a set view of the keys contained in this map - */ - Set keySet(); - - - /** - * Returns a IPersonalAttributeList of the complex attributes. - * - * @return an IPersonalAttributeList of the complex attributes. - */ - IPersonalAttributeList getComplexAttributes(); - - /** - * Returns a IPersonalAttributeList of the simple value attributes. - * - * @return an IPersonalAttributeList of the simple value attributes. - */ - IPersonalAttributeList getSimpleValueAttributes(); - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - IPersonalAttributeList getMandatoryAttributes(); - - /** - * Returns a IPersonalAttributeList of the optional attributes in this map. - * - * @return an IPersonalAttributeList of the optional attributes contained in this map. - */ - IPersonalAttributeList getOptionalAttributes(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); - - /** - * Returns true if this map contains at least one element that doesn't have value. - * - * @return true if this map contains at least one element that doesn't have value. - */ - boolean hasMissingValues(); - - /** - * Returns a copy of this IPersonalAttributeList instance. - * - * @return The copy of this IPersonalAttributeList. - */ - Object clone() throws CloneNotSupportedException; - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base deleted file mode 100644 index 33eb618f0..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base +++ /dev/null @@ -1,239 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * Interface for stork logging. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $ - */ -public interface IStorkLogger { - - /** - * Getter for SpApplication. - * - * @return The SpApplication value. - */ - String getSpApplication(); - - /** - * Setter for SpApplication. - * - * @param spApplication The SP Application. - */ - void setSpApplication(String spApplication); - - /** - * Getter for ProviderName. - * - * @return The ProviderName value. - */ - String getProviderName(); - - /** - * Setter for ProviderName. - * - * @param providerName The provider name. - */ - void setProviderName(String providerName); - - /** - * - * Getter for Origin. - * - * @return The Origin value. - * - */ - String getOrigin(); - - /** - * Setter for Origin. - * - * @param origin The origin. - */ - void setOrigin(String origin); - - /** - * - * Getter for QAA Level. - * - * @return The QAA Level value. - * - */ - int getQaaLevel(); - - /** - * Setter for QAA Level. - * - * @param qaaLevel The qaa level. - */ - void setQaaLevel(int qaaLevel); - - /** - * - * Getter for timestamp. - * - * @return The timestamp value. - * - */ - String getTimestamp(); - - /** - * Setter for timestamp. - * - * @param timestamp The request's timestamp. - */ - void setTimestamp(String timestamp); - - /** - * Getter for InResponseTo. - * - * @return The InResponseTo value. - */ - String getInResponseTo(); - - /** - * Setter for InResponseTo. - * - * @param inResponseTo The Saml's response id. - */ - void setInResponseTo(String inResponseTo); - - /** - * Getter for InResponseToSPReq. - * - * @return The InResponseToSPReq value. - */ - String getInResponseToSPReq(); - - /** - * Setter for InResponseToSPRequ. - * - * @param inResponseToSPReq The Saml's response id. - */ - void setInResponseToSPReq(String inResponseToSPReq); - - /** - * Getter for opType. - * - * @return The opType value. - */ - String getOpType(); - - /** - * Setter for opType. - * - * @param opType The operation type. - */ - void setOpType(String opType); - - /** - * Getter for destination. - * - * @return The destination value. - */ - String getDestination(); - - /** - * Setter for destinationIp. - * - * @param destination The remote IP. - */ - void setDestination(String destination); - - /** - * Getter for message or assertion consumer. - * - * @return The message or assertion consumer. - */ - String getMessage(); - - /** - * Setter for message or assertion consumer. - * - * @param message or assertion consumer. - */ - void setMessage(String message); - - /** - * Getter for country. - * - * @return The country value. - */ - String getCountry(); - - /** - * Setter for country. - * - * @param country The country. - */ - void setCountry(String country); - - /** - * Getter for samlHash. - * - * @return The samlHash value. - */ - byte[] getSamlHash(); - - /** - * Setter for samlHash. - * - * @param samlHash the encrypted SAML token - */ - void setSamlHash(byte[] samlHash); - - /** - * Getter for msgId. - * - * @return the msgId - */ - String getMsgId(); - - /** - * Setter for msgId. - * - * @param msgId the ID of the originator of this message - */ - void setMsgId(String msgId); - - /** - * Getter for sPMsgId. - * - * @return the sPMsgId - */ - String getSPMsgId(); - - /** - * Setter for sPMsgId. - * - * @param sPMsgId the ID of the originator of this message - */ - void setSPMsgId(String sPMsgId); - - /** - * The format of the returned String must be the following: - * "requestCounter#ddMMMyyyykk:mm:ss#opType#originIp#originName - * #destinationIp#destinationName#samlHash#[originatorName#msgId#]" - * - * The values enclosed in '[]' only apply when logging responses. - * - * @return {@inheritDoc} - */ - @Override - String toString(); -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base deleted file mode 100644 index f38b41838..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base +++ /dev/null @@ -1,85 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * Interface for stork session. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $ - */ -public interface IStorkSession { - - /** - * Returns the object associated the the given key. - * - * @param key with which the specified value is to be associated. - * - * @return The object associated the the given key. - */ - Object get(Object key); - - /** - * Associates a key to a value, and inserts them in the session object. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object put(String key, Object value); - - /** - * Removes the mapping for this key. - * - * @param key with which the specified value is to be associated. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object remove(Object key); - - /** - * Returns the number of key-value mappings in this map. - * - * @return the number of key-value mappings in this map. - */ - int size(); - - /** - * Returns true if this map contains a mapping for the specified key. - * - * @param key with which the specified value is to be associated. - * - * @return true if this map contains a mapping for the specified key. - */ - boolean containsKey(Object key); - - /** - * Removes all mappings from this map. - */ - void clear(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base deleted file mode 100644 index bf236258d..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base +++ /dev/null @@ -1,316 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; - -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information of Attribute Providers, the Attribute - * List to be requested, the Assertions returned by the Attribute Providers and the values - * that each Attribute has. This information along with the current status of the Linker (the - * attribute providers that were queried and the remaining providers) is used by the PEPS - * actions in order to complete the Attribute gathering. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.50 $, $Date: 2013-11-28 $ - */ -public final class Linker implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = -3268006381745987237L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(Linker.class.getName()); - - /** - * Attributes Providers map. - */ - private IAttributeProvidersMap attributeProvidersMap; - - /** - * Assertion map. - */ - private LinkedHashMap assertions; - - /** - * The current index of local (domestic) Attribute Providers. - */ - private int localIndex; - - /** - * The current index of remote (foreign) Attribute Providers - countries. - */ - private int remoteIndex; - - /** - * Constructs an empty Linker object. - */ - public Linker() { - localIndex = 0; - remoteIndex = 0; - - assertions = new LinkedHashMap(); - } - - /** - * Based on the internal state of the Linker it returns the next local Attribute Source - * - * @return The next Attribute Source or null if not found - * - * @see AttributeSource - */ - public AttributeSource getNextLocalProvider() { - Iterator iterator; - AttributeSource source, found; - int curIndex = 0; - - found = null; - - if ( attributeProvidersMap!=null && !attributeProvidersMap.isEmpty() ) { - iterator = attributeProvidersMap.keyIterator(); - while (iterator.hasNext()) { - source = iterator.next(); - - if ( source.getSourceType()==AttributeSource.SOURCE_LOCAL_APROVIDER ) { - if ( curIndex>=localIndex ) { - found = source; - - break; - } - - curIndex++; - } - } - } - - return found; - } - - /** - * Based on the internal state of the Linker it returns the next remote Attribute Source - * - * @return The next Attribute Source or null if not found - * - * @see AttributeSource - */ - public AttributeSource getNextRemoteProvider() { - Iterator iterator; - AttributeSource source, found; - int curIndex = 0; - - found = null; - - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { - iterator = attributeProvidersMap.keyIterator(); - while (iterator.hasNext()) { - source = iterator.next(); - - if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) { - if ( curIndex>=remoteIndex ) { - found = source; - - break; - } - - curIndex++; - } - } - } - - return found; - } - - /** - * It updates the Linker with the values returned by the Attribute Source. It also advances - * to the next index in order to mark this attribute source as completed. - * - * @param source The Attribute Source that was queried for attribute values. - * @param attrResponse The attrResponse returned by the Attribute Source that contains the attribute values. - * - * @see AttributeSource, STORKAttrQueryResponse - */ - public void setProviderReponse(AttributeSource source, STORKAttrQueryResponse attrResponse) { - if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) - remoteIndex++; - else - localIndex++; - - //Assertion storage - this.assertions.put(source, attrResponse); - - this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList()); - //this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList()); - } - - /** - * Reset the internal state of the local Attribute Source in order to start over. - */ - public void resetLocalIndex() { - localIndex = 0; - } - - /** - * Reset the internal state of the remote Attribute Source in order to start over. - */ - public void resetRemoteIndex() { - remoteIndex = 0; - } - - /** - * Setter for attributeProvidersMap. - * - * @param attributeProvidersMap The attributeProvidersMap to set. - */ - public void setAttributeProvidersMap(IAttributeProvidersMap attributeProvidersMap) { - this.attributeProvidersMap = attributeProvidersMap; - } - - /** - * Getter for attributeProvidersMap. - * - * @return attributeProvidersMap - */ - public IAttributeProvidersMap getAttributeProvidersMap() { - return attributeProvidersMap; - } - - /** - * Returns the Personal Attribute list of the provided Attribute Source. - * - * @param source The attributeSource in reference - * - * @return The IPersonalAttributeList assosiated with this source or null if empty - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getProviderAttributes(AttributeSource source) { - if ( attributeProvidersMap.containsKey(source) ) - return attributeProvidersMap.get(source); - else - return null; - } - - /** - * Returns the merged Personal Attribute list from all the Attribute Sources. - * - * @return The IPersonalAttributeList merged Personal Attribute list or null if empty - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getAllAttributes() { - Iterator iterator; - AttributeSource source; - IPersonalAttributeList list, merged; - - merged = null; - - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { - iterator = attributeProvidersMap.keyIterator(); - - merged = new PersonalAttributeList(); - while (iterator.hasNext()) { - source = iterator.next(); - list = this.getProviderAttributes(source); - - for (final PersonalAttribute pa : list) { - merged.add(pa); - } - } - } - - return merged; - } - - /** - * Returns a List with all the assertions gathered by the AAS-PEPS module - * returned both by local APs or remote A-PEPS. - * - * @return The assertions returned from the APs and A-PEPS - */ - public List getAttrQueryResponseList() { - List originalAssertions; - - originalAssertions = new ArrayList(); - - //Gather all assertions - for (STORKAttrQueryResponse element : this.assertions.values()) { - originalAssertions.add(element); - } - - return originalAssertions; - } - - /** - * Checks the internal state of the Linker and if all Attribute Sources where visited - * returns true, otherwise it returns false. So if you go directly from AtPLinkerAction - * to MoreAttributesAction the call will have, since the method setProviderReponse - * was not executed from every Attribute Source. - * - * @return true if everything is OK, false otherwise - */ - public boolean isComplete() { - boolean outcome = false; - - LOG.debug("Check if linkder is complete: R[" + remoteIndex + "], L[" + localIndex + "], S[" + attributeProvidersMap.size() + "]"); - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { - if ( (remoteIndex + localIndex)==attributeProvidersMap.size() ) - outcome = true; - } - else { - outcome = true; - } - - return outcome; - } - - /** - * Merge the two Linker objects. - * - * @param previous The other Linker object to merge with this one. - */ - public void mergeWith(Linker previous) { - //BEFORE - if ( LOG.isDebugEnabled() ) { - LOG.debug("The attributeProvidersMap from the current object."); - ((AttributeProvidersMap)this.attributeProvidersMap).trace(); - LOG.debug("The attributeProvidersMap from the provided object."); - ((AttributeProvidersMap)previous.getAttributeProvidersMap()).trace(); - } - - IAttributeProvidersMap map = previous.getAttributeProvidersMap(); - Iterator items = map.keyIterator(); - while( items.hasNext() ) { - AttributeSource item = items.next(); - IPersonalAttributeList pal = map.get(item); - - if ( this.attributeProvidersMap.containsKey(item) ) { - IPersonalAttributeList new_pal = this.attributeProvidersMap.get(item); - - for(PersonalAttribute pa : pal) - new_pal.add(pa); - } - else { - if ( item.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) - remoteIndex++; - else - localIndex++; - - this.attributeProvidersMap.put(item, pal); - } - } - - //AFTER - if ( LOG.isDebugEnabled() ) { - LOG.debug("The attributeProvidersMap after the merge."); - ((AttributeProvidersMap)this.attributeProvidersMap).trace(); - } - } -} \ No newline at end of file diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base deleted file mode 100644 index 5da9ba494..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base +++ /dev/null @@ -1,392 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the STORK PEPS, Commons and Specific errors - * constant identifiers. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $ - */ -public enum PEPSErrors { - - /** - * Represents the 'authenticationFailed' constant error identifier. - */ - AUTHENTICATION_FAILED_ERROR("authenticationFailed"), - /** - * Represents the 'spCountrySelector.errorCreatingSAML' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_ERROR_CREATE_SAML("spCountrySelector.errorCreatingSAML"), - /** - * Represents the 'spCountrySelector.destNull' constant error identifier. - */ - SP_COUNTRY_SELECTOR_DESTNULL("spCountrySelector.destNull"), - /** - * Represents the 'spCountrySelector.invalidAttr' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_ATTR("spCountrySelector.invalidAttr"), - /** - * Represents the 'spCountrySelector.invalidProviderName' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_PROVIDER_NAME( - "spCountrySelector.invalidProviderName"), - /** - * Represents the 'spCountrySelector.invalidQaaSPid' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_QAASPID("spCountrySelector.invalidQaaSPid"), - /** - * Represents the 'spCountrySelector.invalidSpId' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPID("spCountrySelector.invalidSpId"), - /** - * Represents the 'spCountrySelector.invalidSPQAA' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPQAA("spCountrySelector.invalidSPQAA"), - /** - * Represents the 'spCountrySelector.invalidSpURL' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPURL("spCountrySelector.invalidSpURL"), - /** - * Represents the 'spCountrySelector.spNotAllowed' constant error identifier. - */ - SP_COUNTRY_SELECTOR_SPNOTALLOWED("spCountrySelector.spNotAllowed"), - - /** - * Represents the 'sProviderAction.errorCreatingSAML' constant error - * identifier. - */ - SPROVIDER_SELECTOR_ERROR_CREATE_SAML("sProviderAction.errorCreatingSAML"), - /** - * Represents the 'sProviderAction.attr' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_ATTR("sProviderAction.invalidAttr"), - /** - * Represents the 'sProviderAction.country' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_COUNTRY("sProviderAction.invalidCountry"), - /** - * Represents the 'sProviderAction.relayState' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_RELAY_STATE("sProviderAction.invalidRelayState"), - /** - * Represents the 'sProviderAction.saml' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SAML("sProviderAction.invalidSaml"), - /** - * Represents the 'sProviderAction.spAlias' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPALIAS("sProviderAction.invalidSPAlias"), - /** - * Represents the 'sProviderAction.spDomain' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPDOMAIN("sProviderAction.invalidSPDomain"), - /** - * Represents the 'sProviderAction.spId' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPID("sProviderAction.invalidSPId"), - /** - * Represents the 'sProviderAction.spQAA' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPQAA("sProviderAction.invalidSPQAA"), - /** - * Represents the 'sProviderAction.spQAAId' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPQAAID("sProviderAction.invalidSPQAAId"), - /** - * Represents the 'sProviderAction.spRedirect' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPREDIRECT("sProviderAction.invalidSPRedirect"), - /** - * Represents the 'sPPowerValidationAction.invalidSPPVAttrList' constant error identifier. - */ - SPPOWERVALIDATION_SELECTOR_INVALID_SP_PV_ATTR_LIST("sPPowerValidationAction.invalidSPPVAttrList"), - - /** - * Represents the 'sProviderAction.invalidSPProviderName' constant error - * identifier. - */ - SPROVIDER_SELECTOR_INVALID_SP_PROVIDERNAME( - "sProviderAction.invalidSPProviderName"), - /** - * Represents the 'sProviderAction.spNotAllowed' constant error identifier. - */ - SPROVIDER_SELECTOR_SPNOTALLOWED("sProviderAction.spNotAllowed"), - - - /** - * Represents the 'internalError' constant error identifier. - */ - INTERNAL_ERROR("internalError"), - - /** - * Represents the 'colleagueRequest.attrNull' constant error identifier. - */ - COLLEAGUE_REQ_ATTR_NULL("colleagueRequest.attrNull"), - /** - * Represents the 'colleagueRequest.errorCreatingSAML' constant error - * identifier. - */ - COLLEAGUE_REQ_ERROR_CREATE_SAML("colleagueRequest.errorCreatingSAML"), - /** - * Represents the 'colleagueRequest.invalidCountryCode' constant error - * identifier. - */ - COLLEAGUE_REQ_INVALID_COUNTRYCODE("colleagueRequest.invalidCountryCode"), - /** - * Represents the 'colleagueRequest.invalidDestUrl' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_DEST_URL("colleagueRequest.invalidDestUrl"), - /** - * Represents the 'colleagueRequest.invalidQaa' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_QAA("colleagueRequest.invalidQaa"), - /** - * Represents the 'colleagueRequest.invalidRedirect' constant error - * identifier. - */ - COLLEAGUE_REQ_INVALID_REDIRECT("colleagueRequest.invalidRedirect"), - /** - * Represents the 'colleagueRequest.invalidSAML' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_SAML("colleagueRequest.invalidSAML"), - - /** - * Represents the 'colleaguePVRequest.invalidPVAttrList' constant error identifier. - */ - COLLEAGUE_PV_REQ_INVALID_PV_ATTR_LIST("colleaguePVRequest.invalidPVAttrList"), - - - /** - * Represents the 'cpepsRedirectUrl' constant error identifier. - */ - CPEPS_REDIRECT_URL("cpepsRedirectUrl"), - /** - * Represents the 'spepsRedirectUrl' constant error identifier. - */ - SPEPS_REDIRECT_URL("spepsRedirectUrl"), - /** - * Represents the 'sProviderAction.invCountry' constant error identifier. - */ - SP_ACTION_INV_COUNTRY("sProviderAction.invCountry"), - - /** - * Represents the 'providernameAlias.invalid' constant error identifier. - */ - PROVIDER_ALIAS_INVALID("providernameAlias.invalid"), - - - /** - * Represents the 'cPeps.attrNull' constant error identifier. - */ - CPEPS_ATTR_NULL("cPeps.attrNull"), - - /** - * Represents the 'colleagueResponse.invalidSAML' constant error identifier. - */ - COLLEAGUE_RESP_INVALID_SAML("colleagueResponse.invalidSAML"), - - /** - * Represents the 'citizenNoConsent.mandatory' constant error identifier. - */ - CITIZEN_NO_CONSENT_MANDATORY("citizenNoConsent.mandatory"), - /** - * Represents the 'citizenResponse.mandatory' constant error identifier. - */ - CITIZEN_RESPONSE_MANDATORY("citizenResponse.mandatory"), - /** - * Represents the 'attVerification.mandatory' constant error identifier. - */ - ATT_VERIFICATION_MANDATORY("attVerification.mandatory"), - /** - * Represents the 'attrValue.verification' constant error identifier. - */ - ATTR_VALUE_VERIFICATION("attrValue.verification"), - - /** - * Represents the 'audienceRestrictionError' constant error identifier. - */ - AUDIENCE_RESTRICTION("audienceRestrictionError"), - /** - * Represents the 'auRequestIdError' constant error identifier. - */ - AU_REQUEST_ID("auRequestIdError"), - /** - * Represents the 'domain' constant error identifier. - */ - DOMAIN("domain"), - /** - * Represents the 'hash.error' constant error identifier. - */ - HASH_ERROR("hash.error"), - /** - * Represents the 'invalidAttributeList' constant error identifier. - */ - INVALID_ATTRIBUTE_LIST("invalidAttributeList"), - /** - * Represents the 'invalidAttributeValue' constant error identifier. - */ - INVALID_ATTRIBUTE_VALUE("invalidAttributeValue"), - /** - * Represents the 'qaaLevel' constant error identifier. - */ - QAALEVEL("qaaLevel"), - /** - * Represents the 'requests' constant error identifier. - */ - REQUESTS("requests"), - /** - * Represents the 'SPSAMLRequest' constant error identifier. - */ - SP_SAML_REQUEST("SPSAMLRequest"), - /** - * Represents the 'spepsSAMLRequest' constant error identifier. - */ - SPEPS_SAML_REQUEST("spepsSAMLRequest"), - /** - * Represents the 'IdPSAMLResponse' constant error identifier. - */ - IDP_SAML_RESPONSE("IdPSAMLResponse"), - /** - * Represents the 'cpepsSAMLResponse' constant error identifier. - */ - CPEPS_SAML_RESPONSE("cpepsSAMLResponse"), - /** - * Represents the 'cpepsSAMLResponse' constant error identifier. - */ - SPEPS_SAML_RESPONSE("spepsSAMLResponse"), - /** - * Represents the 'session' constant error identifier. - */ - SESSION("session"), - /** - * Represents the 'invalid.session' constant error identifier. - */ - INVALID_SESSION("invalid.session"), - /** - * Represents the 'invalid.sessionId' constant error identifier. - */ - INVALID_SESSION_ID("invalid.sessionId"), - /** - * Represents the 'missing.sessionId' constant error identifier. - */ - MISSING_SESSION_ID("sessionError"), - /** - * Represents the 'missing.mandate' constant error identifier. - */ - MISSING_MANDATE("missing.mandate"), - /** - * Represents the 'AtPSAMLResponse' constant error identifier. - */ - ATP_SAML_RESPONSE("AtPSAMLResponse"), - - /** - * Represents the 'AtPSAMLResponse' constant error identifier. - */ - ATP_RESPONSE_ERROR("atp.response.error"), - - /** - * Represents the 'apepsSAMLRequest' constant error identifier. - */ - APEPS_SAML_REQUEST("apepsSAMLRequest"), - - /** - * Represents the 'apepsSAMLResponse' constant error identifier. - */ - APEPS_SAML_RESPONSE("apepsSAMLResponse"), - - /** - * Represents the 'invalid.apepsRedirectUrl' constant error identifier. - */ - INVALID_APEPS_REDIRECT_URL("invalid.apepsRedirectUrl"), - - /** - * Represents the 'invalid.apepsCallbackUrl' constant error identifier. - */ - INVALID_APEPS_CALLBACK_URL("invalid.apepsCallbackUrl"), - - /** - * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier. - */ - COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"); - - /** - * Represents the constant's value. - */ - private String error; - - /** - * Solo Constructor. - * - * @param nError The Constant error value. - */ - PEPSErrors(final String nError) { - this.error = nError; - } - - /** - * Construct the errorCode Constant value. - * - * @return The errorCode Constant. - */ - public String errorCode() { - return error + ".code"; - } - - /** - * Construct the errorCode Constant value with the given code text. - * - * @param text the code text to append to the constant. - * - * @return The errorCode Constant for the given code text. - */ - public String errorCode(final String text) { - return error + "." + text + ".code"; - } - - /** - * Construct the errorMessage constant value. - * - * @return The errorMessage constant. - */ - public String errorMessage() { - return error + ".message"; - } - - /** - * Construct the errorMessage Constant value with the given message text. - * - * @param text the message text to append to the constant. - * - * @return The errorMessage Constant for the given text. - */ - public String errorMessage(final String text) { - return error + "." + text + ".message"; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - return error; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base deleted file mode 100644 index 146e4c39d..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base +++ /dev/null @@ -1,619 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the STORK PEPS, Commons and Specific Parameters. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2011-07-07 20:48:45 $ - */ -public enum PEPSParameters { - - /** - * Represents the 'apId' parameter constant. - */ - AP_ID("apId"), - /** - * Represents the 'apUrl' parameter constant. - */ - AP_URL("apUrl"), - /** - * Represents the 'ap.number' parameter constant. - */ - AP_NUMBER("ap.number"), - - /** - * Represents the 'assertionConsumerServiceURL' parameter constant. - */ - ASSERTION_CONSUMER_S_URL("assertionConsumerServiceURL"), - - /** - * Represents the 'auth' parameter constant. - */ - AUTHENTICATION("auth"), - - /** - * Represents the 'auth-on-behalf-of' parameter constant. - */ - AUTHENTICATION_ON_BEHALF_OF("auth-on-behalf-of"), - - /** - * Represents the 'attr' parameter constant. - */ - ATTRIBUTE("attr"), - /** - * Represents the 'attrName' parameter constant. - */ - ATTRIBUTE_NAME("attrName"), - /** - * Represents the 'attrStatus' parameter constant. - */ - ATTRIBUTE_STATUS("attrStatus"), - /** - * Represents the 'attrType' parameter constant. - */ - ATTRIBUTE_TYPE("attrType"), - /** - * Represents the 'attrValue' parameter constant. - */ - ATTRIBUTE_VALUE("attrValue"), - /** - * Represents the 'attrList' parameter constant. - */ - ATTRIBUTE_LIST("attrList"), - /** - * Represents the 'apMandAttrList' parameter constant. - */ - AP_MANDATORY_ATTRIBUTE_LIST("apMandAttrList"), - /** - * Represents the 'attrTuple' parameter constant. - */ - ATTRIBUTE_TUPLE("attrTuple"), - /** - * Represents the 'attribute-missing' parameter constant. - */ - ATTRIBUTE_MISSING("attribute-missing"), - /** - * Represents the 'attributesNotAllowed' parameter constant. - */ - ATTRIBUTES_NOT_ALLOWED("attributesNotAllowed"), - /** - * Represents the 'authnRequest' parameter constant. - */ - AUTH_REQUEST("authnRequest"), - - /** - * Represents the 'attrValue.number' parameter constant. - */ - ATTR_VALUE_NUMBER("attrValue.number"), - - /** - * Represents the 'derivation.date.format' parameter constant. - */ - DERIVATION_DATE_FORMAT("derivation.date.format"), - /** - * Represents the 'deriveAttr.number' parameter constant. - */ - DERIVE_ATTRIBUTE_NUMBER("deriveAttr.number"), - - /** - * Represents the complex attributes parameter constant. - */ - COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"), - COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"), - COMPLEX_HASDEGREE_VALUE("hasDegree"), - COMPLEX_MANDATECONTENT_VALUE("mandateContent"), - /** - * Represents the 'consent-type' parameter constant. - */ - CONSENT_TYPE("consent-type"), - /** - * Represents the 'consent-value' parameter constant. - */ - CONSENT_VALUE("consent-value"), - /** - * Represents the 'country' parameter constant. - */ - COUNTRY("country"), - /** - * Represents the 'countryOrigin' parameter constant. - */ - COUNTRY_ORIGIN("countryOrigin"), - - /** - * Represents the 'cpepsURL' parameter constant. - */ - CPEPS_URL("cpepsURL"), - /** - * Represents the 'callback' parameter constant. - */ - CPEPS_CALLBACK("callback"), - /** - * Represents the 'peps.specificidpredirect.url' parameter constant. - */ - CPEPS_IDP_CALLBACK_VALUE("peps.specificidpredirect.url"), - /** - * Represents the 'peps.specificapredirect.url' parameter constant. - */ - CPEPS_AP_CALLBACK_VALUE("peps.specificapredirect.url"), - - /** - * Represents the 'errorCode' parameter constant. - */ - ERROR_CODE("errorCode"), - /** - * Represents the 'subCode' parameter constant. - */ - ERROR_SUBCODE("subCode"), - /** - * Represents the 'errorMessage' parameter constant. - */ - ERROR_MESSAGE("errorMessage"), - /** - * Represents the 'errorRedirectUrl' parameter constant. - */ - ERROR_REDIRECT_URL("errorRedirectUrl"), - - /** - * errorRedirectUrl Represents the 'external-authentication' parameter - * constant. - */ - EXTERNAL_AUTH("external-authentication"), - /** - * Represents the 'external-ap' parameter constant. - */ - EXTERNAL_AP("external-ap"), - /** - * Represents the 'external-pv' parameter constant. - */ - EXTERNAL_PV("external-pv"), - /** - * Represents the 'external-sig-module' parameter constant. - */ - EXT_SIG_CREATOR_MOD("external-sig-module"), - - /** - * Represents the 'http-x-forwarded-for' parameter constant. - */ - HTTP_X_FORWARDED_FOR("http-x-forwarded-for"), - - /** - * Represents the 'idp.url' parameter constant. - */ - IDP_URL("idp.url"), - /** - * Represents the 'idpAUB.url' parameter constant. - */ - IDPAUB_URL("idpAUB.url"), - /** - * Represents the 'internal-authentication' parameter constant. - */ - INTERNAL_AUTH("internal-authentication"), - /** - * Represents the 'internal-ap' parameter constant. - */ - INTERNAL_AP("internal-ap"), - /** - * Represents the 'internal-pv' parameter constant. - */ - INTERNAL_PV("internal-pv"), - - /** - * Represents the 'samlIssuer' parameter constant. - */ - ISSUER("samlIssuer"), - /** - * Represents the 'samlIssuer.idp' parameter constant. - */ - ISSUER_IDP("samlIssuer.idp"), - /** - * Represents the 'samlIssuer.atp' parameter constant. - */ - ISSUER_ATP("samlIssuer.atp"), - - /** - * Represents the 'mandatory' parameter constant. - */ - MANDATORY("mandatory"), - /** - * Represents the 'mandatoryAttributeMissing' parameter constant. - */ - MANDATORY_ATTR_MISSING("mandatoryAttributeMissing"), - /** - * Represents the 'mandatoryConsentAttrMissing' parameter constant. - */ - MANDATORY_CONSENT_MISSING("mandatoryConsentAttrMissing"), - /** - * Represents the 'missing-attrs' parameter constant. - */ - MISSING_ATTRS("missing-attrs"), - /** - * Represents the 'no-more-attrs' parameter constant. - */ - NO_MORE_ATTRS("no-more-attrs"), - - /** - * Represents the 'optional' parameter constant. - */ - OPTIONAL("optional"), - - /** - * Represents the 'no-consent-type' parameter constant. - */ - NO_CONSENT_TYPE("no-consent-type"), - /** - * Represents the 'no-consent-value' parameter constant. - */ - NO_CONSENT_VALUE("no-consent-value"), - - /** - * Represents the 'provider.name' parameter constant. - */ - PROVIDER_NAME_VALUE("providerName"), - /** - * Represents the 'cpeps.askconsent' parameter constant. - */ - PEPS_ASK_CONSENT("cpeps.askconsent"), - /** - * Represents the 'cpeps.askconsentvalue' parameter constant. - */ - PEPS_ASK_CONSENT_VALUE("cpeps.askconsentvalue"), - /** - * Represents the 'pepsAuth' parameter constant. - */ - PEPS_AUTH_CONSENT("pepsAuth"), - /** - * Represents the 'validation.bypass' parameter constant. - */ - PEPS_BYPASS("validation.bypass"), - /** - * Represents the 'cpeps.number' parameter constant. - */ - PEPS_NUMBER("cpeps.number"), - /** - * Represents the 'cpeps.specificapredirect.url' parameter constant. - */ - PEPS_SPECIFIC_URL("cpeps.specificapredirect.url"), - /** - * Represents the 'pv.url' parameter constant. - */ - PV_URL("pv.url"), - - /** - * Represents the 'qaaLevel' parameter constant. - */ - QAALEVEL("qaaLevel"), - - /** - * Represents the 'speps.redirectUrl' parameter constant. - */ - SPEPS_REDIRECT_URL("speps.redirectUrl"), - - /** - * Represents the 'sp.redirectUrl' parameter constant. - */ - SP_REDIRECT_URL("sp.redirectUrl"), - /** - * Represents the 'cpeps.redirectUrl' parameter constant. - */ - CPEPS_REDIRECT_URL("cpeps.redirectUrl"), - /** - * Represents the 'RelayState' parameter constant. - */ - RELAY_STATE("RelayState"), - /** - * Represents the 'remoteAddr' parameter constant. - */ - REMOTE_ADDR("remoteAddr"), - /** - * Represents the 'remoteUser' parameter constant. - */ - REMOTE_USER("remoteUser"), - - /** - * Represents the 'SAMLRequest' parameter constant. - */ - SAML_REQUEST("SAMLRequest"), - /** - * Represents the 'SAMLResponse' parameter constant. - */ - SAML_RESPONSE("SAMLResponse"), - /** - * Represents the 'SAMLFail' parameter constant. - */ - SAML_TOKEN_FAIL("SAMLFail"), - /** - * Represents the 'TokenId' parameter constant. - */ - SAML_TOKEN_ID("TokenId"), - /** - * Represents the 'inResponseTo' parameter constant. - */ - SAML_IN_RESPONSE_TO("inResponseTo"), - /** - * Represents the 'inResponseTo.idp' parameter constant. - */ - SAML_IN_RESPONSE_TO_IDP("inResponseTo.idp"), - /** - * Represents the 'inResponseTo.atp' parameter constant. - */ - SAML_IN_RESPONSE_TO_ATP("inResponseTo.atp"), - /** - * Represents the 'SignatureResponse' parameter constant. - */ - SIGNATURE_RESPONSE("SignatureResponse"), - - /** - * Represents the 'cPepsSession' parameter constant. - */ - SESSION_ID_URL("cPepsSession"), - /** - * Represents the 'spId' parameter constant. - */ - SP_ID("spId"), - /** - * Represents the 'spQaaLevel' parameter constant. - */ - SP_QAALEVEL("spQaaLevel"), - /** - * Represents the 'spUrl' parameter constant. - */ - SP_URL("spUrl"), - - /** - * Represents the 'allow.derivation.all' parameter constant. - */ - SPECIFIC_ALLOW_DERIVATION_ALL("allow.derivation.all"), - /** - * Represents the ''allow.unknowns parameter constant. - */ - SPECIFIC_ALLOW_UNKNOWNS("allow.unknowns"), - /** - * Represents the 'derivation.date.separator' parameter constant. - */ - SPECIFIC_DERIVATION_DATE_SEP("derivation.date.separator"), - /** - * Represents the 'derivation.month.position' parameter constant. - */ - SPECIFIC_DERIVATION_MONTH_POS("derivation.month.position"), - /** - * Represents the 'derivation.day.position' parameter constant. - */ - SPECIFIC_DERIVATION_DAY_POS("derivation.day.position"), - /** - * Represents the 'derivation.year.position' parameter constant. - */ - SPECIFIC_DERIVATION_YEAR_POS("derivation.year.position"), - - /** - * sp.authorized.parameters Represents the '' parameter constant. - */ - SPEPS_AUTHORIZED("sp.authorized.parameters"), - - /** - * Represents the 'spSector' constant value. - */ - SPSECTOR("spSector"), - /** - * Represents the 'spApplication' constant value. - */ - SPAPPLICATION("spApplication"), - /** - * Represents the 'spCountry' constant value. - */ - SPCOUNTRY("spCountry"), - /** - * Represents the 'spInstitution' constant value. - */ - SPINSTITUTION("spInstitution"), - /** - * Represents the 'storkAttribute.number' parameter constant. - */ - STORK_ATTRIBUTE_NUMBER("storkAttribute.number"), - /** - * Represents the 'storkAttributeValue.number' parameter constant. - */ - STORK_ATTRIBUTE_VALUE_NUMBER("storkAttributeValue.number"), - - /** - * Represents the 'username' parameter constant. - */ - USERNAME("username"), - - /** - * Represents the 'tooManyParameters' parameter constant. - */ - TOO_MANY_PARAMETERS("tooManyParameters"), - /** - * Represents the 'validation.active' parameter constant. - */ - VALIDATION_ACTIVE("validation.active"), - - /** - * Represents the 'x-forwarded-for' parameter constant. - */ - X_FORWARDED_FOR("x-forwarded-for"), - /** - * Represents the 'x-forwarded-host' parameter constant. - */ - X_FORWARDED_HOST("x-forwarded-host"), - /** - * Represents the 'XMLResponse' parameter constant. - */ - XML_RESPONSE("XMLResponse"), - - /** - * Represents the 'ap-cpeps.number' parameter constant. - */ - AP_PEPS_NUMBER("ap-cpeps.number"), - - /** - * Represents the 'atp.number' parameter constant. - */ - ATTRIBUTE_PROVIDER_NUMBER("atp.number"), - - /** - * Represents the 'atn.number' parameter constant. - */ - ATTRIBUTE_NAME_NUMBER("atn.number"), - - /** - * Represents the 'apLinker' parameter constant. - */ - AP_LINKER("apLinker"), - - /** - * Represents the 'prevApLinker' parameter constant. - */ - PREV_AP_LINKER("prevApLinker"), - - /** - * Represents the 'NOSEL' parameter constant (no attribute provider selected). - */ - AP_NO_SELECTION("NOSEL"), - - /** - * Represents the 'OCSEL' parameter constant (attribute provider in another country). - */ - AP_OTHER_COUNTRY("OCSEL"), - - /** - * Represents the '_provider' suffix parameter constant. - */ - AP_PROVIDER_SELECT_SUFFIX("_provider"), - - /** - * Represents the '_country' suffix parameter constant. - */ - AP_COUNTRY_SELECT_SUFFIX("_country"), - - /** - * Represents the '_name' suffix parameter constant. - */ - AP_NAME_SELECT_SUFFIX("_name"), - - /** - * Represents the 'next-ap' parameter constant. - */ - NEXT_AP("next-ap"), - - /** - * Represents the 'next-apeps' parameter constant. - */ - NEXT_APEPS("next-apeps"), - - /** - * Represents the 'back-to-apeps' parameter constant. - */ - BACK_TO_APEPS("back-to-apeps"), - - /** - * Represents the 'is-remote-apeps' parameter constant. - */ - IS_REMOTE_APEPS("is-remote-apeps"), - - /** - * Represents the 'more-attributes' parameter constant. - */ - MORE_ATTRIBUTES("more-attributes"), - - /** - * Represents the 'attr-filter.number' parameter constant. - */ - ATTRIBUTES_FILTER_NUMBER("attr-filter.number"), - - /** - * Represents the 'atp.url' parameter constant. - */ - ATP_URL("atp.url"), - /** - * Represents the 'apepsURL' parameter constant. - */ - APEPS_URL("apepsUrl"), - - /** - * Represents the 'apepsCountry' parameter constant. - */ - APEPS_COUNTRY("apepsCountry"), - - /** - * Represents the 'apepsAuthRequest' parameter constant. - */ - APEPS_ATTR_REQUEST("apepsAttrRequest"), - - /** - * Represents the 'isApepsRequest' parameter constant. - */ - APEPS_REQUEST_COMPLETE("apeps-request-complete"), - - /** - * Represents the 'apeps.callbackUrl' parameter constant. - */ - APEPS_CALLBACK_URL("apeps.callbackUrl"), - /** - * Represents the 'attrListMand' parameter constant. - */ - ATTR_LIST_MAND("attrListMand"), - - /** - * Represents the 'attrListOpt' parameter constant. - */ - ATTR_LIST_OPT("attrListOpt"), - - /** - * Represents the 'simpleAttrListMand' parameter constant. - */ - SIMPLE_ATTR_LIST_MAND("simpleAttrListMand"), - - /** - * Represents the 'simpleAttrListOpt' parameter constant. - */ - SIMPLE_ATTR_LIST_OPT("simpleAttrListOpt"), - - /** - * Represents the 'complexAttrListMand' parameter constant. - */ - COMPLEX_ATTR_LIST_MAND("complexAttrListMand"), - - /** - * Represents the 'complexAttrListOpt' parameter constant. - */ - COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param nValue The Constant value. - */ - PEPSParameters(final String nValue) { - this.value = nValue; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - return value; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base deleted file mode 100644 index a16b03edb..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base +++ /dev/null @@ -1,353 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.UnsupportedEncodingException; -import java.util.Properties; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.util.encoders.Base64; - -import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException; -import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException; - -/** - * This class holds static helper methods. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.75 $, $Date: 2010-11-23 00:05:35 $ - */ -public final class PEPSUtil { - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(PEPSUtil.class.getName()); - - /** - * Configurations object. - */ - private static Properties configs; - - /** - * Max prefix. - */ - private static final String MAX_PARAM_PREFIX = "max."; - - /** - * Code prefix to get error code. - */ - private static final String CODE_PARAM_SUFFIX = ".code"; - - /** - * param's size prefix to get max param size. - */ - private static final String MAX_PARAM_SUFFIX = ".size"; - - /** - * Message prefix to get error message. - */ - private static final String MSG_PARAM_SUFFIX = ".message"; - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private PEPSUtil() { - // empty constructor - } - - /** - * Creates a single instance of this class and sets the properties. - * - * @param nConfigs The set of available configurations. - * - * @return The created PEPSUtil's class. - */ - public static PEPSUtil createInstance(final Properties nConfigs) { - if (nConfigs != null) { - PEPSUtil.configs = nConfigs; - } - return new PEPSUtil(); - } - - /** - * Getter for the Properties. - * - * @return configs The properties value. - */ - public Properties getConfigs() { - return configs; - } - - /** - * Setter for the Properties. - * - * @param nConfigs The new properties value. - */ - public static void setConfigs(final Properties nConfigs) { - if (nConfigs != null) { - PEPSUtil.configs = nConfigs; - } - } - - /** - * Returns the identifier of some configuration given a set of configurations - * and the corresponding configuration key. - * - * @param configKey The key that IDs some configuration. - * - * @return The configuration String value. - */ - public static String getConfig(final String configKey) { - return configs.getProperty(configKey); - } - - /** - * Validates the input paramValue identified by the paramName. - * - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * - * @return true if the parameter is valid. - */ - public static boolean isValidParameter(final String paramName, - final String paramValue) { - - final String validationParam = - PEPSUtil.getConfig(PEPSParameters.VALIDATION_ACTIVE.toString()); - boolean retVal = true; - - final String paramConf = MAX_PARAM_PREFIX + paramName + MAX_PARAM_SUFFIX; - - if (PEPSValues.TRUE.toString().equals(validationParam)) { - final String paramSizeStr = PEPSUtil.getConfig(paramConf); - // Checking if the parameter size exists and if it's numeric - if (StringUtils.isNumeric(paramSizeStr)) { - final int maxParamSize = Integer.valueOf(paramSizeStr); - if (StringUtils.isEmpty(paramValue) - || paramValue.length() > maxParamSize) { - retVal = false; - LOG.warn("Invalid parameter [" + paramName + "] value " + paramValue); - } - } else { - retVal = false; - LOG.error("Missing " + paramConf - + " configuration in the pepsUtils.properties configuration file"); - } - } - return retVal; - } - - /** - * Validates the Parameter and throws an exception if an error occurs. Throws - * an InvalidParameterPEPSException runtime exception if the parameter is - * invalid. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - */ - public static void validateParameter(final String className, - final String paramName, final Object paramValue) { - - if (paramValue == null) { - PEPSUtil.validateParameter(className, paramName, ""); - } else { - PEPSUtil.validateParameter(className, paramName, paramValue.toString()); - } - } - - /** - * Validates the Parameters and throws an exception if an error occurs. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue) { - - PEPSUtil.validateParameter(className, paramName, paramValue, - PEPSUtil.getErrorCode(paramName), PEPSUtil.getErrorMessage(paramName)); - } - - /** - * Validates the Parameters and throws an exception if an error occurs. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * @param error The PEPSError to get error code and messages from configs. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue, final PEPSErrors error) { - - PEPSUtil.validateParameter(className, paramName, paramValue, - PEPSUtil.getConfig(error.errorCode()), - PEPSUtil.getConfig(error.errorMessage())); - } - - /** - * Validates the HTTP Parameter and throws an exception if an error occurs. - * Throws an InvalidParameterPEPSException runtime exception if the parameter - * is invalid. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * @param errorCode The error code to include on the exception. - * @param errorMessage The error message to include on the exception. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue, final String errorCode, - final String errorMessage) { - - if (!isValidParameter(paramName, paramValue)) { - LOG.warn("Invalid parameter [" + paramName + "] value found at " - + className); - throw new InvalidParameterPEPSException(errorCode, errorMessage); - } - } - - /** - * Getter for the error code of some given error related to the input param. - * - * @param paramName The name of the parameter associated with the error. - * - * @return The code of the error. - */ - private static String getErrorCode(final String paramName) { - return getConfig(paramName + CODE_PARAM_SUFFIX); - } - - /** - * Getter for the error message of some given error related to the input - * parameter. - * - * @param paramName The name of the parameter associated with the message. - * - * @return The message for the error. - */ - private static String getErrorMessage(final String paramName) { - return getConfig(paramName + MSG_PARAM_SUFFIX); - } - - /** - * {@link Base64} encodes the input samlToken parameter. - * - * @param samlToken the SAML Token to be encoded. - * - * @return The Base64 String representing the samlToken. - * - * @see Base64#encode - */ - public static String encodeSAMLToken(final byte[] samlToken) { - try { - return new String(Base64.encode(samlToken), "UTF8"); - } catch (UnsupportedEncodingException e) { - LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e); - return null; - } - } - - /** - * Decodes the {@link Base64} String input parameter representing a samlToken. - * - * @param samlToken the SAML Token to be decoded. - * - * @return The samlToken decoded bytes. - * - * @see Base64#decode - */ - public static byte[] decodeSAMLToken(final String samlToken) { - return Base64.decode(samlToken); - } - - /** - * Hashes a SAML token. Throws an InternalErrorPEPSException runtime exception - * if the Cryptographic Engine fails. - * - * @param samlToken the SAML Token to be hashed. - * - * @return byte[] with the hashed SAML Token. - */ - public static byte[] hashPersonalToken(final byte[] samlToken) { - try { - final String className = - PEPSUtil.getConfig(PEPSValues.HASH_DIGEST_CLASS.toString()); - - final Digest digest = - (Digest) Class.forName(className).getConstructor() - .newInstance((Object[]) null); - digest.update(samlToken, 0, samlToken.length); - - final int retLength = digest.getDigestSize(); - final byte[] ret = new byte[retLength]; - - digest.doFinal(ret, 0); - return ret; - - } catch (final Exception e) { - // For all those exceptions that could be thrown, we always log it and - // thrown an InternalErrorPEPSException. - LOG.error(PEPSErrors.HASH_ERROR.errorMessage(), e); - throw new InternalErrorPEPSException( - PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorCode()), - PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorMessage()), e); - } - } - - /** - * Gets the Stork error code in the error message if exists! - * - * @param errorMessage The message to get the error code if exists; - * - * @return the error code if exists. Returns null otherwise. - */ - public static String getStorkErrorCode(final String errorMessage) { - if (StringUtils.isNotBlank(errorMessage) - && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { - final String[] msgSplitted = - errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); - if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { - return msgSplitted[0]; - } - } - return null; - } - - /** - * Gets the Stork error message in the saml message if exists! - * - * @param errorMessage The message to get in the saml message if exists; - * - * @return the error message if exists. Returns the original message - * otherwise. - */ - public static String getStorkErrorMessage(final String errorMessage) { - if (StringUtils.isNotBlank(errorMessage) - && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { - final String[] msgSplitted = - errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); - if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { - return msgSplitted[1]; - } - } - return errorMessage; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base deleted file mode 100644 index e14c21cb5..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base +++ /dev/null @@ -1,329 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the value constants. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.17 $, $Date: 2011-07-07 20:48:45 $ - */ -public enum PEPSValues { - - /** - * Represents the 'all' constant value. - */ - ALL("all"), - /** - * Represents the 'none' constant value. - */ - NONE("none"), - /** - * Represents the 'true' constant value. - */ - TRUE("true"), - /** - * Represents the 'false' constant value. - */ - FALSE("false"), - /** - * Represents the empty string constant value. - */ - EMPTY_STRING(""), - - /** - * Represents the ',' separator constant value. - */ - ATTRIBUTE_VALUE_SEP(","), - /** - * Represents the ';' separator constant value. - */ - ATTRIBUTE_SEP(";"), - /** - * Represents the ':' separator constant value. - */ - ATTRIBUTE_TUPLE_SEP(":"), - /** - * Represents the '/' separator constant value. - */ - EID_SEPARATOR("/"), - /** - * Represents the ' - ' separator constant value. - */ - ERROR_MESSAGE_SEP(" - "), - /** - * Represents the '#' parameter constant value. - */ - LOGGER_SEP("#"), - /** - * Represents the 'NOT_AVAILABLE' parameter constant value. - */ - NOT_AVAILABLE("NotAvailable"), - /** - * Represents the ';' parameter constant value. - */ - SPEPS_AUTHORIZED_SEP(";"), - - /** - * Represents the 'ap' constant value. - */ - AP("ap"), - /** - * Represents the 'C-PEPS' constant value. - */ - CPEPS("C-PEPS"), - /** - * Represents the 'cpeps' constant value. - */ - CPEPS_PREFIX("cpeps"), - /** - * Represents the 'peps' constant value. - */ - PEPS("peps"), - /** - * Represents the '-PEPS' constant value. - */ - PEPS_SUFFIX("-PEPS"), - /** - * Represents the 'SP' constant value. - */ - SP("SP"), - /** - * Represents the 'S-PEPS' constant value. - */ - SPEPS("S-PEPS"), - /** - * Represents the 'speps' constant value. - */ - SPEPS_PREFIX("speps"), - /** - * Represents the 'sp.default.parameters' constant value. - */ - DEFAULT("sp.default.parameters"), - /** - * Represents the default saml id constant value. - */ - DEFAULT_SAML_ID("1"), - /** - * Represents the 'hashDigest.className' constant value. - */ - HASH_DIGEST_CLASS("hashDigest.className"), - - /** - * Represents the 'eu.stork.communication.requests' constant value. - */ - STORK_PACKAGE_REQUEST_LOGGER_VALUE("eu.stork.communication.requests"), - /** - * Represents the 'eu.stork.communication.responses' constant value. - */ - STORK_PACKAGE_RESPONSE_LOGGER_VALUE("eu.stork.communication.responses"), - - /** - * Represents the 'S-PEPS receives request from SP' constant value. - */ - SP_REQUEST("S-PEPS receives request from SP"), - /** - * Represents the 'Get Citizen Consent' constant value. - */ - CITIZEN_CONSENT_LOG("Get Citizen Consent"), - /** - * Represents the 'C-PEPS receives request from S-PEPS' constant value. - */ - CPEPS_REQUEST("C-PEPS receives request from S-PEPS"), - /** - * Represents the 'C-PEPS generates response to S-PEPS' constant value. - */ - CPEPS_RESPONSE("C-PEPS generates response to S-PEPS"), - /** - * Represents the 'S-PEPS generates request to C-PEPS' constant value. - */ - SPEPS_REQUEST("S-PEPS generates request to C-PEPS"), - /** - * Represents the 'S-PEPS receives response from C-PEPS' constant value. - */ - SPEPS_RESPONSE("S-PEPS receives response from C-PEPS"), - /** - * Represents the 'S-PEPS generates response to SP' constant value. - */ - SP_RESPONSE("S-PEPS generates response to SP"), - /** - * Represents the 'Success' constant value. - */ - SUCCESS("Success"), - /** - * Represents the December's month number constant value. - */ - LAST_MONTH("12"), - /** - * Represents the yyyyMM constant value. - */ - NO_DAY_DATE_FORMAT("yyyyMM"), - - /** - * Represents the 'attrValue' constant value. - */ - ATTRIBUTE("attrValue"), - /** - * Represents the 'derivedAttr' constant value. - */ - DERIVE_ATTRIBUTE("deriveAttr"), - /** - * Represents the 'storkAttribute' constant value. - */ - STORK_ATTRIBUTE("storkAttribute"), - - /** - * Represents the 'properties' constant value. - */ - PROPERTIES("properties"), - /** - * Represents the 'referer' constant value. - */ - REFERER("referer"), - /** - * Represents the 'host' constant value. - */ - HOST("host"), - /** - * Represents the 'spid' constant value. - */ - SPID("spid"), - /** - * Represents the 'domain' constant value. - */ - DOMAIN("domain"), - /** - * Represents the '.validation' constant value. - */ - VALIDATION_SUFFIX(".validation"), - /** - * Represents the 'jsessionid' constant value. - */ - EQUAL("="), - /** - * Represents the 'HttpOnly' constant value. - */ - HTTP_ONLY("HttpOnly"), - /** - * Represents the 'SET-COOKIE' constant value. - */ - JSSESSION("JSESSIONID"), - /** - * Represents the '=' constant value. - */ - SETCOOKIE("SET-COOKIE"), - /** - * Represents the ';' constant value. - */ - SEMICOLON(";"), - /** - * Represents the ' ' constant value. - */ - SPACE(" "), - /** - * Represents the 'atp' constant value. - */ - APROVIDER_PREFIX("atp"), - /** - * Represents the 'atn' constant value. - */ - ANAME_PREFIX("atn"), - /** - * Represents the 'ap-cpeps' constant value. - */ - AP_CPEPS_PREFIX("ap-cpeps"), - /** - * Represents the 'attr-filter' constant value. - */ - AP_ATTRFILTER_PREFIX("attr-filter"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - PEPSValues(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".id". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String index(final int index) { - - return value + index + ".id"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".value". - * - * @param index the number. - * - * @return The concatenated string value. - */ - public String value(final int index) { - - return value + index + ".value"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".name". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String name(final int index) { - - return value + index + ".name"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".url". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String url(final int index) { - - return value + index + ".url"; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base deleted file mode 100644 index 5d8281445..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base +++ /dev/null @@ -1,348 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.log4j.Logger; - -import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException; - -/** - * This class is a bean used to store the information relative to the - * PersonalAttribute. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.22 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class PersonalAttribute implements Serializable, Cloneable { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 2612951678412632174L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(PersonalAttribute.class - .getName()); - - /** - * Name of the personal attribute. - */ - private String name; - - /** - * Values of the personal attribute. - */ - private List value = new ArrayList(); - - /** - * Type of the personal attribute. - */ - private String type; - - /** - * Complex values of the personal attribute. - */ - private Map complexValue = new ConcurrentHashMap(); - - /** - * Is the personal attribute mandatory? - */ - private transient boolean required; - - /** - * Returned status of the attribute from the IdP. - */ - private String status; - - /** - * Name of the personal attribute. - */ - private String friendlyName; - - /** - * Empty Constructor. - */ - public PersonalAttribute() { - super(); - } - - /** - * PersonalAttribute Constructor for complex values. - * - * @param attrName The attribute name. - * @param attrIsRequired The attribute type value. - * @param attrComplexValue The attribute's value. - * @param attrStatus The attribute's status value. - */ - public PersonalAttribute(final String attrName, final boolean attrIsRequired, - final List attrComplexValue, final String attrStatus) { - this.setName(attrName); - this.setIsRequired(attrIsRequired); - this.setValue(attrComplexValue); - this.setStatus(attrStatus); - } - - /** - * PersonalAttribute Constructor for complex values. - * - * @param attrName The attribute name. - * @param attrIsRequired The attribute type value. - * @param attrComplexValue The attribute's complex value. - * @param attrStatus The attribute's status value. - */ - public PersonalAttribute(final String attrName, final boolean attrIsRequired, - final Map attrComplexValue, final String attrStatus) { - this.setName(attrName); - this.setIsRequired(attrIsRequired); - this.setComplexValue(attrComplexValue); - this.setStatus(attrStatus); - } - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - public Object clone() { - - try { - final PersonalAttribute personalAttr = (PersonalAttribute) super.clone(); - personalAttr.setIsRequired(this.isRequired()); - personalAttr.setName(this.getName()); - personalAttr.setStatus(this.getStatus()); - if (!isEmptyValue()) { - final List val = - (List) ((ArrayList) this.getValue()).clone(); - personalAttr.setValue(val); - } - if (!isEmptyComplexValue()) { - final Map complexVal = - (Map) ((HashMap) this - .getComplexValue()).clone(); - personalAttr.setComplexValue(complexVal); - } - return personalAttr; - } catch (final CloneNotSupportedException e) { - // assert false; - LOG.trace("Nothing to do."); - throw new InternalErrorPEPSException( - PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorMessage()), e); - } - } - - /** - * Getter for the required value. - * - * @return The required value. - */ - public boolean isRequired() { - return required; - } - - /** - * Setter for the required value. - * - * @param attrIsRequired this attribute? - */ - public void setIsRequired(final boolean attrIsRequired) { - this.required = attrIsRequired; - } - - /** - * Getter for the name value. - * - * @return The name value. - */ - public String getName() { - return name; - } - - /** - * Setter for the name value. - * - * @param attrName The personal attribute name. - */ - public void setName(final String attrName) { - this.name = attrName; - } - - /** - * Getter for the value. - * - * @return The list of values. - */ - public List getValue() { - return value; - } - - /** - * Setter for the list of values. - * - * @param attrValue The personal attribute value. - */ - public void setValue(final List attrValue) { - if (attrValue != null) { - this.value = attrValue; - } - } - - - /** - * Getter for the type value. - * - * @return The name value. - */ - public String getType() { - return type; - } - - /** - * Setter for the type value. - * - * @param attrName The personal attribute type. - */ - public void setType(final String attrType) { - this.type = attrType; - } - - /** - * Getter for the status. - * - * @return The status value. - */ - public String getStatus() { - return status; - } - - /** - * Setter for the status value. - * - * @param attrStatus The personal attribute status. - */ - public void setStatus(final String attrStatus) { - this.status = attrStatus; - } - - /** - * Getter for the complex value. - * - * @return The complex value. - */ - public Map getComplexValue() { - return complexValue; - } - - /** - * Setter for the complex value. - * - * @param complexVal The personal attribute Complex value. - */ - public void setComplexValue(final Map complexVal) { - if (complexVal != null) { - this.complexValue = complexVal; - } - } - - /** - * Getter for the personal's friendly name. - * - * @return The personal's friendly name value. - */ - public String getFriendlyName() { - return friendlyName; - } - - /** - * Setter for the personal's friendly name. - * - * @param fName The personal's friendly name. - */ - public void setFriendlyName(final String fName) { - this.friendlyName = fName; - } - - /** - * Return true the value is empty. - * - * @return True if the value is empty "[]"; - */ - public boolean isEmptyValue() { - return value.isEmpty() || (value.size() == 1 && value.get(0).length() == 0); - } - - /** - * Returns true if the Complex Value is empty. - * - * @return True if the Complex Value is empty; - */ - public boolean isEmptyComplexValue() { - return complexValue.isEmpty(); - } - - /** - * Returns true if the Status is empty. - * - * @return True if the Status is empty; - */ - public boolean isEmptyStatus() { - return (status == null || status.length() == 0); - } - - /** - * Prints the PersonalAttribute in the following format. - * name:required:[v,a,l,u,e,s]|[v=a,l=u,e=s]:status; - * - * @return The PersonalAttribute as a string. - */ - public String toString() { - final StringBuilder strBuild = new StringBuilder(); - - AttributeUtil.appendIfNotNull(strBuild, getName()); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - AttributeUtil.appendIfNotNull(strBuild, String.valueOf(isRequired())); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - strBuild.append('['); - - if (isEmptyValue()) { - if (!isEmptyComplexValue()) { - AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.mapToString( - getComplexValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); - } - } else { - AttributeUtil.appendIfNotNull( - strBuild, - AttributeUtil.listToString(getValue(), - PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); - } - - strBuild.append(']'); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - AttributeUtil.appendIfNotNull(strBuild, getStatus()); - strBuild.append(PEPSValues.ATTRIBUTE_SEP.toString()); - - return strBuild.toString(); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base deleted file mode 100644 index 642b249d4..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base +++ /dev/null @@ -1,396 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.StringTokenizer; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information relative to the - * PersonalAttributeList. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.27 $, $Date: 2010-11-18 22:54:56 $ - * - * @see PersonalAttribute - */ -@SuppressWarnings("PMD") -public final class PersonalAttributeList extends - ConcurrentHashMap implements IPersonalAttributeList{ - - /** - * Logger object. - */ - private static final Logger LOG = Logger - .getLogger(PersonalAttributeList.class.getName()); - - /** - * Serial id. - */ - private static final long serialVersionUID = 7375127363889975062L; - - /** - * Hash with the latest fetched attribute name alias. - */ - private final transient Map latestAttrAlias = - new HashMap(); - - /** - * Hash with mapping number of alias or the attribute name. - */ - private final transient Map attrAliasNumber = - new HashMap(); - - /** - * Default constructor. - */ - public PersonalAttributeList() { - // The best practices recommend to call the super constructor. - super(); - } - - /** - * Constructor with initial capacity for the PersonalAttributeList size. - * - * @param capacity The initial capacity for the PersonalAttributeList. - */ - public PersonalAttributeList(final int capacity) { - super(capacity); - } - - /** - * {@inheritDoc} - */ - public Iterator iterator() { - return this.values().iterator(); - } - - /** - * {@inheritDoc} - */ - public PersonalAttribute get(final Object key) { - String attrName = (String) key; - - if (this.latestAttrAlias.containsKey(key)) { - attrName = attrName + this.latestAttrAlias.get(key); - } else { - if (this.attrAliasNumber.containsKey(key)) { - this.latestAttrAlias.put(attrName, this.attrAliasNumber.get(key)); - } - } - return super.get(attrName); - } - - /** - * {@inheritDoc} - */ - public void add(final PersonalAttribute value) { - if (value != null) { - this.put(value.getName(), value); - } - } - - /** - * {@inheritDoc} - */ - public PersonalAttribute put(final String key, final PersonalAttribute val) { - if (StringUtils.isNotEmpty(key) && val != null) { - // Validate if attribute name already exists! - String attrAlias = key; - if (this.containsKey(attrAlias)) { - //TODO isAgeOver should not be hardcoded, a better way of handling multipe isAgeOver requests should be implemented. - if (!val.isEmptyValue() && StringUtils.isNumeric(val.getValue().get(0)) && "isAgeOver".equals( val.getName() ) ) { - final String attrValue = val.getValue().get(0); - attrAlias = key + attrValue; - this.attrAliasNumber.put(key, Integer.valueOf(attrValue)); - } else { - final PersonalAttribute attr = super.get(key); - if (!attr.isEmptyValue() - && StringUtils.isNumeric(attr.getValue().get(0))) { - attrAlias = key + attr.getValue().get(0); - super.put(key, (PersonalAttribute) attr); - this.attrAliasNumber.put(key, null); - } - } - } - return super.put(attrAlias, val); - } else { - return null; - } - } - - /** - * {@inheritDoc} - */ - public void populate(final String attrList) { - final StringTokenizer strToken = - new StringTokenizer(attrList, PEPSValues.ATTRIBUTE_SEP.toString()); - - while (strToken.hasMoreTokens()) { - final PersonalAttribute persAttr = new PersonalAttribute(); - String[] tuples = - strToken.nextToken().split(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(), - AttributeConstants.NUMBER_TUPLES.intValue()); - - // Convert to the new format if needed! - tuples = convertFormat(tuples); - - if (AttributeUtil.hasValidTuples(tuples)) { - final int attrValueIndex = - AttributeConstants.ATTR_VALUE_INDEX.intValue(); - final String tmpAttrValue = - tuples[attrValueIndex].substring(1, - tuples[attrValueIndex].length() - 1); - final String[] vals = - tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - persAttr.setName(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()]); - persAttr.setIsRequired(Boolean - .valueOf(tuples[AttributeConstants.ATTR_TYPE_INDEX.intValue()])); - - // check if it is a complex value - if (isComplexValue(vals)) { - persAttr.setComplexValue(createComplexValue(vals)); - } - else - { - persAttr.setValue(createValues(vals)); - } - - if (tuples.length == AttributeConstants.NUMBER_TUPLES.intValue()) { - persAttr.setStatus(tuples[AttributeConstants.ATTR_STATUS_INDEX - .intValue()]); - } - this.put(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()], - persAttr); - - } else { - LOG.warn("Invalid personal attribute list tuples"); - } - - } - } - - /** - * Returns a copy of this IPersonalAttributeList instance. - * - * @return The copy of this IPersonalAttributeList. - */ - public Object clone() { - try { - return (PersonalAttributeList) super.clone(); - } catch (CloneNotSupportedException e) { - return null; - } - } - - /** - * Creates a string in the following format. - * - * attrName:attrType:[attrValue1,attrValue2=attrComplexValue]:attrStatus; - * - * @return {@inheritDoc} - */ - @Override - public String toString() { - final Iterator> itAttrs = - this.entrySet().iterator(); - final StringBuilder strBuilder = new StringBuilder(); - - while (itAttrs.hasNext()) { - final Entry attrEntry = itAttrs.next(); - final PersonalAttribute attr = attrEntry.getValue(); - //strBuilder.append(attr.toString()); - strBuilder.insert(0, attr.toString()); - } - - return strBuilder.toString(); - } - - /** - * Validates and creates the attribute's complex values. - * - * @param values The complex values. - * - * @return The {@link Map} with the complex values. - * - * @see Map - */ - private Map createComplexValue(final String[] values) { - final Map complexValue = new HashMap(); - for (final String val : values) { - final String[] tVal = val.split("="); - if (StringUtils.isNotEmpty(val) && tVal.length == 2) { - complexValue.put(tVal[0], AttributeUtil.unescape(tVal[1])); - } - } - return complexValue; - } - - /** - * Checks if value is complex or not - * @param values The values to check - * @return True if succesful - */ - private boolean isComplexValue(final String[] values) { - boolean isComplex = false; - if (values.length > 0) { - final String[] tVal = values[0].split("="); - if (StringUtils.isNotEmpty(values[0]) && tVal.length == 2) { - isComplex = true; - } - } - return isComplex; - } - - /** - * Validates and creates the attribute values. - * - * @param vals The attribute values. - * - * @return The {@link List} with the attribute values. - * - * @see List - */ - private List createValues(final String[] vals) { - final List values = new ArrayList(); - for (final String val : vals) { - if (StringUtils.isNotEmpty(val)) { - values.add(AttributeUtil.unescape(val)); - } - } - return values; - } - - /** - * Converts the attribute tuple (attrName:attrType...) to the new format. - * - * @param tuples The attribute tuples to convert. - * - * @return The attribute tuples in the new format. - */ - private String[] convertFormat(final String[] tuples) { - final String[] newFormatTuples = - new String[AttributeConstants.NUMBER_TUPLES.intValue()]; - if (tuples != null) { - System.arraycopy(tuples, 0, newFormatTuples, 0, tuples.length); - - for (int i = tuples.length; i < newFormatTuples.length; i++) { - if (i == AttributeConstants.ATTR_VALUE_INDEX.intValue()) { - newFormatTuples[i] = "[]"; - } else { - newFormatTuples[i] = ""; - } - } - } - return newFormatTuples; - } - - /** - * Returns a IPersonalAttributeList of the complex attributes in this map. - * - * @return an IPersonalAttributeList of the complex attributes contained in this map. - */ - public IPersonalAttributeList getComplexAttributes() { - LOG.info("get complex attributes"); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(!attr.getComplexValue().isEmpty()) { - attrList.put(attr.getName(), attr); - LOG.info("adding complex attribute:"+attr.getName()); - } - } - return attrList; - } - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - public IPersonalAttributeList getSimpleValueAttributes() { - LOG.info("get simple attributes"); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(attr.getComplexValue().isEmpty()) { - attrList.put(attr.getName(), attr); - LOG.info("adding simple attribute:"+attr.getName()); - } - } - return attrList; - } - - - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - public IPersonalAttributeList getMandatoryAttributes() { - return getAttributesByParam(true); - } - - - /** - * Returns a IPersonalAttributeList of the attributes in this map by parameter value. - * - * @param compareValue The boolean to get mandatory (true) or optional (false) attributes. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map if compareValue is true or optional otherwise. - */ - private IPersonalAttributeList getAttributesByParam(final boolean compareValue) { - LOG.info("get attributes by param :"+compareValue); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(attr.isRequired() == compareValue) { - attrList.put(attr.getName(), attr); - LOG.info("adding attribute:"+attr.getName()); - } - } - return attrList; - } - - - /** - * Returns a IPersonalAttributeList of the optional attributes in this map. - * - * @return an IPersonalAttributeList of the optional attributes contained in this map. - */ - public IPersonalAttributeList getOptionalAttributes() { - return getAttributesByParam(false); - } - - /** - * {@inheritDoc} - */ - public boolean hasMissingValues() { - for(PersonalAttribute attr: this) { - if(attr.isEmptyValue() && attr.isEmptyComplexValue()) { - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base deleted file mode 100644 index 07f178ecc..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base +++ /dev/null @@ -1,447 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -import org.apache.log4j.Logger; - -public class STORKAttrQueryRequest implements Serializable, Cloneable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 4778480781609392750L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAttrQueryRequest.class - .getName()); - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The assertion consumer service url. */ - private String serviceURL; - - /** The distinguished name. */ - private String distinguishedName; - - /** The e id sector share. */ - private boolean eIDSectorShare; - - /** The e id cross sector share. */ - private boolean eIDCrossSectorShare; - - /** The e id cross border share. */ - private boolean eIDCrossBorderShare; - - /** The personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The service provider sector. */ - private String spSector; - - /** The service provider institution. */ - private String spInstitution; - - /** The service provider application. */ - private String spApplication; - - /** The service provider country. */ - private String spCountry; - - /** The country. */ - private String country; - - /** The citizen country code. */ - private String citizenCountry; - - /** The Service Provider ID. */ - private String sPID; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the SP ID. - * - * @return sPID The SP ID. - */ - public String getSPID() { - return sPID; - } - - /** - * Sets the SP ID. - * - * @param sPId The new sp samlId. - */ - public void setSPID(final String sPId) { - this.sPID = sPId; - } - - /** - * Gets the citizen country code. - * - * @return The citizen country code value. - */ - public String getCitizenCountryCode() { - return citizenCountry; - } - - /** - * Sets the citizen country code. - * - * @param countryCode the new citizen country code value. - */ - public void setCitizenCountryCode(final String countryCode) { - this.citizenCountry = countryCode; - } - - /** - * Gets the sp country. - * - * @return The sp country value. - */ - public String getSpCountry() { - return spCountry; - } - - /** - * Sets the sp country. - * - * @param sPCountry the new sp country value. - */ - public void setSpCountry(final String sPCountry) { - this.spCountry = sPCountry; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the serviceURL value. - * - * @return The serviceURL value. - */ - public String getAssertionConsumerServiceURL() { - return serviceURL; - } - - /** - * Setter for the serviceURL value. - * - * @param newServiceURL the assertion consumer service URL. - */ - public void setAssertionConsumerServiceURL(final String newServiceURL) { - this.serviceURL = newServiceURL; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - - /** - * Getter for the attributeList value. - * - * @return The attributeList value. - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the attributeList value. - * - * @param attrList the personal attribute list value. - * - * @see IPersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** - * Gets the service provider sector. - * - * @return The service provider sector value. - */ - public String getSpSector() { - return spSector; - } - - /** - * Sets the service provider sector. - * - * @param samlSPSector the new service provider sector value. - */ - public void setSpSector(final String samlSPSector) { - this.spSector = samlSPSector; - } - - /** - * Gets the service provider institution. - * - * @return The service provider institution value. - */ - public String getSpInstitution() { - return spInstitution; - } - - /** - * Sets the service provider institution. - * - * @param samlSPInst the new service provider institution value. - */ - public void setSpInstitution(final String samlSPInst) { - this.spInstitution = samlSPInst; - } - - /** - * Gets the service provider application. - * - * @return The service provider application value. - */ - public String getSpApplication() { - return spApplication; - } - - /** - * Sets the service provider application. - * - * @param samlSPApp the new service provider application value. - */ - public void setSpApplication(final String samlSPApp) { - this.spApplication = samlSPApp; - } - - /** - * Checks if is eId sector share. - * - * @return true, if is eId sector share. - */ - public boolean isEIDSectorShare() { - return eIDSectorShare; - } - - /** - * Sets the eId sector share. - * - * @param eIdSectorShare the new eId sector share value. - */ - public void setEIDSectorShare(final boolean eIdSectorShare) { - this.eIDSectorShare = eIdSectorShare; - } - - /** - * Checks if is eId cross sector share. - * - * @return true, if is eId cross sector share. - */ - public boolean isEIDCrossSectorShare() { - return eIDCrossSectorShare; - } - - /** - * Sets the eId cross sector share. - * - * @param eIdCrossSectorShare the new eId cross sector share value. - */ - public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { - this.eIDCrossSectorShare = eIdCrossSectorShare; - } - - /** - * Checks if is eId cross border share. - * - * @return true, if is eId cross border share. - */ - public boolean isEIDCrossBorderShare() { - return eIDCrossBorderShare; - } - - /** - * Sets the eId cross border share. - * - * @param eIdCrossBorderShare the new eId cross border share value. - */ - public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { - this.eIDCrossBorderShare = eIdCrossBorderShare; - } - - /** - * Returns a copy of this STORKAttrQueryRequest instance. - * - * @return The copy of this STORKAttrQueryRequest. - * @throws CloneNotSupportedException on clone exception - */ - @Override - public Object clone() throws CloneNotSupportedException{ - STORKAttrQueryRequest storkAttrQueryReq = null; - storkAttrQueryReq = (STORKAttrQueryRequest) super.clone(); - storkAttrQueryReq.setPersonalAttributeList(getPersonalAttributeList()); - storkAttrQueryReq.setTokenSaml(getTokenSaml()); - return storkAttrQueryReq; - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base deleted file mode 100644 index 046dec311..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base +++ /dev/null @@ -1,388 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.List; - -import org.apache.log4j.Logger; -import org.joda.time.DateTime; -import org.opensaml.saml2.core.Assertion; - -public class STORKAttrQueryResponse { - - /** Response Id. */ - private String samlId; - - /** Request failed? */ - private boolean fail; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Audience restriction. */ - private transient String audienceRest; - - /** Error message. */ - private String message; - - /** Id of the request that originated this response. */ - private String inResponseTo; - - /** Expiration date. */ - private DateTime notOnOrAfter; - - /** Creation date. */ - private DateTime notBefore; - - /** The SAML token. */ - private byte[] tokenSaml = new byte[0]; - - /** Country. */ - private String country; - - /** The complete assertion **/ - private Assertion assertion; - - /** List of all assertions in response **/ - private List assertions; - - /** The complete list from all assertions **/ - private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); - - /** All personal attribute lists **/ - private List attributeLists; - - /** Citizen's personal attribute list. */ - private transient IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAttrQueryResponse.class.getName()); - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Getter for audienceRest. - * - * @return The audienceRest value. - */ - public String getAudienceRestriction() { - return audienceRest; - } - - /** - * Setter for audienceRest. - * - * @param audRest the new audienceRest value. - */ - public void setAudienceRestriction(final String audRest) { - this.audienceRest = audRest; - } - - /** - * Getter for the samlToken. - * - * @return The samlToken value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Setter for samlToken. - * - * @param samlToken the new tokenSaml value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Getter for the country name. - * - * @return The country name value. - */ - public String getCountry() { - return country; - } - - /** - * Setter for the country name. - * - * @param cCountry the new country name value. - */ - public void setCountry(final String cCountry) { - this.country = cCountry; - } - - /** - * Getter for pal value. - * - * @return The pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the inResponseTo value. - * - * @return The inResponseTo value. - */ - public String getInResponseTo() { - return inResponseTo; - } - - /** - * Setter for the inResponseTo value. - * - * @param samlInResponseTo the new inResponseTo value. - */ - public void setInResponseTo(final String samlInResponseTo) { - this.inResponseTo = samlInResponseTo; - } - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the message value. - * - * @return The message value. - */ - public String getMessage() { - return message; - } - - /** - * Setter for the message value. - * - * @param msg the new message value. - */ - public void setMessage(final String msg) { - this.message = msg; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param nSamlId the new samlId value. - */ - public void setSamlId(final String nSamlId) { - this.samlId = nSamlId; - } - - /** - * Getter for the notOnOrAfter value. - * - * @return The notOnOrAfter value. - * - * @see DateTime - */ - public DateTime getNotOnOrAfter() { - return this.notOnOrAfter; - } - - /** - * Setter for the notOnOrAfter value. - * - * @param nOnOrAfter the new notOnOrAfter value. - * - * @see DateTime - */ - public void setNotOnOrAfter(final DateTime nOnOrAfter) { - this.notOnOrAfter = nOnOrAfter; - } - - /** - * Getter for the notBefore value. - * - * @return The notBefore value. - * - * @see DateTime - */ - public DateTime getNotBefore() { - return notBefore; - } - - /** - * Setter for the notBefore value. - * - * @param nBefore the new notBefore value. - * - * @see DateTime - */ - public void setNotBefore(final DateTime nBefore) { - this.notBefore = nBefore; - } - - /** Get the assertion from the response **/ - public Assertion getAssertion() { - return assertion; - } - - /** Set the assertion in the response **/ - public void setAssertion(final Assertion nAssertion) { - this.assertion = nAssertion; - } - - public void setAssertions(List newAssert) { - this.assertions = newAssert; - } - - public List getAssertions() { - return assertions; - } - - /** - * Getter for the toal pal value. - * - * @return The total pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getTotalPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the total Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.totalAttributeList = attrList; - } - } - - /** - * Getter for personal attribute lists - * - * @return The lists - * - * @see PersonalAttributeList - */ - public List getPersonalAttributeLists() { - return attributeLists; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeLists(final List attrLists) { - if (attrLists != null) { - this.attributeLists = attrLists; - } - } - -} - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base deleted file mode 100644 index 2354d0eb1..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base +++ /dev/null @@ -1,495 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information relative to the - * STORKAuthnRequest (SAML Token Request). - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.21 $, $Date: 2011-02-17 22:44:34 $ - */ -public final class STORKAuthnRequest implements Serializable, Cloneable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 4778480781609392750L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAuthnRequest.class - .getName()); - - /** The samlId. */ - private String samlId; - - /** The assertion consumer service url. */ - private String serviceURL; - - /** The destination. */ - private String destination; - - /** The provider name. */ - private String providerName; - - /** The distinguished name. */ - private String distinguishedName; - - /** The e id sector share. */ - private boolean eIDSectorShare; - - /** The e id cross sector share. */ - private boolean eIDCrossSectorShare; - - /** The e id cross border share. */ - private boolean eIDCrossBorderShare; - - /** The personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The service provider sector. */ - private String spSector; - - /** The service provider institution. */ - private String spInstitution; - - /** The service provider application. */ - private String spApplication; - - /** The service provider country. */ - private String spCountry; - - /** The country. */ - private String country; - - /** The citizen country code. */ - private String citizenCountry; - - /** The Service Provider ID. */ - private String sPID; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the SP ID. - * - * @return sPID The SP ID. - */ - public String getSPID() { - return sPID; - } - - /** - * Sets the SP ID. - * - * @param sPId The new sp samlId. - */ - public void setSPID(final String sPId) { - this.sPID = sPId; - } - - /** - * Gets the citizen country code. - * - * @return The citizen country code value. - */ - public String getCitizenCountryCode() { - return citizenCountry; - } - - /** - * Sets the citizen country code. - * - * @param countryCode the new citizen country code value. - */ - public void setCitizenCountryCode(final String countryCode) { - this.citizenCountry = countryCode; - } - - /** - * Gets the sp country. - * - * @return The sp country value. - */ - public String getSpCountry() { - return spCountry; - } - - /** - * Sets the sp country. - * - * @param sPCountry the new sp country value. - */ - public void setSpCountry(final String sPCountry) { - this.spCountry = sPCountry; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the serviceURL value. - * - * @return The serviceURL value. - */ - public String getAssertionConsumerServiceURL() { - return serviceURL; - } - - /** - * Setter for the serviceURL value. - * - * @param newServiceURL the assertion consumer service URL. - */ - public void setAssertionConsumerServiceURL(final String newServiceURL) { - this.serviceURL = newServiceURL; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the providerName value. - * - * @return The provider name value. - */ - public String getProviderName() { - return providerName; - } - - /** - * Setter for the providerName value. - * - * @param samlProvider the provider name value. - */ - public void setProviderName(final String samlProvider) { - this.providerName = samlProvider; - } - - /** - * Getter for the attributeList value. - * - * @return The attributeList value. - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the attributeList value. - * - * @param attrList the personal attribute list value. - * - * @see IPersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** - * Gets the service provider sector. - * - * @return The service provider sector value. - */ - public String getSpSector() { - return spSector; - } - - /** - * Sets the service provider sector. - * - * @param samlSPSector the new service provider sector value. - */ - public void setSpSector(final String samlSPSector) { - this.spSector = samlSPSector; - } - - /** - * Gets the service provider institution. - * - * @return The service provider institution value. - */ - public String getSpInstitution() { - return spInstitution; - } - - /** - * Sets the service provider institution. - * - * @param samlSPInst the new service provider institution value. - */ - public void setSpInstitution(final String samlSPInst) { - this.spInstitution = samlSPInst; - } - - /** - * Gets the service provider application. - * - * @return The service provider application value. - */ - public String getSpApplication() { - return spApplication; - } - - /** - * Sets the service provider application. - * - * @param samlSPApp the new service provider application value. - */ - public void setSpApplication(final String samlSPApp) { - this.spApplication = samlSPApp; - } - - /** - * Checks if is eId sector share. - * - * @return true, if is eId sector share. - */ - public boolean isEIDSectorShare() { - return eIDSectorShare; - } - - /** - * Sets the eId sector share. - * - * @param eIdSectorShare the new eId sector share value. - */ - public void setEIDSectorShare(final boolean eIdSectorShare) { - this.eIDSectorShare = eIdSectorShare; - } - - /** - * Checks if is eId cross sector share. - * - * @return true, if is eId cross sector share. - */ - public boolean isEIDCrossSectorShare() { - return eIDCrossSectorShare; - } - - /** - * Sets the eId cross sector share. - * - * @param eIdCrossSectorShare the new eId cross sector share value. - */ - public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { - this.eIDCrossSectorShare = eIdCrossSectorShare; - } - - /** - * Checks if is eId cross border share. - * - * @return true, if is eId cross border share. - */ - public boolean isEIDCrossBorderShare() { - return eIDCrossBorderShare; - } - - /** - * Sets the eId cross border share. - * - * @param eIdCrossBorderShare the new eId cross border share value. - */ - public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { - this.eIDCrossBorderShare = eIdCrossBorderShare; - } - - /** - * Returns a copy of this STORKAuthnRequest instance. - * - * @return The copy of this STORKAuthnRequest. - * @throws CloneNotSupportedException on clone exception - */ - @Override - public Object clone() throws CloneNotSupportedException{ - STORKAuthnRequest storkAuthnReq = null; - try { - storkAuthnReq = (STORKAuthnRequest) super.clone(); - storkAuthnReq.setPersonalAttributeList(getPersonalAttributeList()); - storkAuthnReq.setTokenSaml(getTokenSaml()); - } catch (final CloneNotSupportedException e) { - // assert false; - LOG.trace("[PersonalAttribute] Nothing to do."); - } - - return storkAuthnReq; - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base deleted file mode 100644 index 84fadd023..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base +++ /dev/null @@ -1,383 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.List; - -import org.apache.log4j.Logger; -import org.joda.time.DateTime; -import org.opensaml.saml2.core.Assertion; - -/** - * This class is a bean used to store the information relative to the - * STORKAuthnResponse. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class STORKAuthnResponse { - - /** Response Id. */ - private String samlId; - - /** Authentication failed? */ - private boolean fail; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Audience restriction. */ - private transient String audienceRest; - - /** Error message. */ - private String message; - - /** Id of the request that originated this response. */ - private String inResponseTo; - - /** Expiration date. */ - private DateTime notOnOrAfter; - - /** Creation date. */ - private DateTime notBefore; - - /** The SAML token. */ - private byte[] tokenSaml = new byte[0]; - - /** Country. */ - private String country; - - /** Citizen's personal attribute list. */ - private transient IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** List of all assertions in response **/ - private List assertions; - - /** The complete list from all assertions **/ - private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); - - /** All personal attribute lists **/ - private List attributeLists; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAuthnResponse.class.getName()); - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Getter for audienceRest. - * - * @return The audienceRest value. - */ - public String getAudienceRestriction() { - return audienceRest; - } - - /** - * Setter for audienceRest. - * - * @param audRest the new audienceRest value. - */ - public void setAudienceRestriction(final String audRest) { - this.audienceRest = audRest; - } - - /** - * Getter for the samlToken. - * - * @return The samlToken value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Setter for samlToken. - * - * @param samlToken the new tokenSaml value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Getter for the country name. - * - * @return The country name value. - */ - public String getCountry() { - return country; - } - - /** - * Setter for the country name. - * - * @param cCountry the new country name value. - */ - public void setCountry(final String cCountry) { - this.country = cCountry; - } - - /** - * Getter for pal value. - * - * @return The pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the inResponseTo value. - * - * @return The inResponseTo value. - */ - public String getInResponseTo() { - return inResponseTo; - } - - /** - * Setter for the inResponseTo value. - * - * @param samlInResponseTo the new inResponseTo value. - */ - public void setInResponseTo(final String samlInResponseTo) { - this.inResponseTo = samlInResponseTo; - } - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the message value. - * - * @return The message value. - */ - public String getMessage() { - return message; - } - - /** - * Setter for the message value. - * - * @param msg the new message value. - */ - public void setMessage(final String msg) { - this.message = msg; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param nSamlId the new samlId value. - */ - public void setSamlId(final String nSamlId) { - this.samlId = nSamlId; - } - - /** - * Getter for the notOnOrAfter value. - * - * @return The notOnOrAfter value. - * - * @see DateTime - */ - public DateTime getNotOnOrAfter() { - return this.notOnOrAfter; - } - - /** - * Setter for the notOnOrAfter value. - * - * @param nOnOrAfter the new notOnOrAfter value. - * - * @see DateTime - */ - public void setNotOnOrAfter(final DateTime nOnOrAfter) { - this.notOnOrAfter = nOnOrAfter; - } - - /** - * Getter for the notBefore value. - * - * @return The notBefore value. - * - * @see DateTime - */ - public DateTime getNotBefore() { - return notBefore; - } - - /** - * Setter for the notBefore value. - * - * @param nBefore the new notBefore value. - * - * @see DateTime - */ - public void setNotBefore(final DateTime nBefore) { - this.notBefore = nBefore; - } - - public void setAssertions(List newAssert) { - this.assertions = newAssert; - } - - public List getAssertions() { - return assertions; - } - - /** - * Getter for the toal pal value. - * - * @return The total pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getTotalPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the total Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.totalAttributeList = attrList; - } - } - - /** - * Getter for personal attribute lists - * - * @return The lists - * - * @see PersonalAttributeList - */ - public List getPersonalAttributeLists() { - return attributeLists; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeLists(final List attrLists) { - if (attrLists != null) { - this.attributeLists = attrLists; - } - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base deleted file mode 100644 index a02002d93..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base +++ /dev/null @@ -1,197 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -public class STORKLogoutRequest implements Serializable, Cloneable { - private static final long serialVersionUID = 4778480781609392750L; - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The distinguished name. */ - private String distinguishedName; - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The country. */ - private String country; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** The ID of principal as known to SP **/ - private String spProvidedId; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** Getter for spProvidedId **/ - public String getSpProvidedId() { - return spProvidedId; - } - - public void setSpProvidedId(final String nSpProvidedId) { - this.spProvidedId = nSpProvidedId; - } - - @Override - public Object clone() throws CloneNotSupportedException{ - STORKLogoutRequest storkLogoutRequest = null; - storkLogoutRequest = (STORKLogoutRequest) super.clone(); - storkLogoutRequest.setTokenSaml(getTokenSaml()); - return storkLogoutRequest; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base deleted file mode 100644 index 2686727db..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base +++ /dev/null @@ -1,250 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -public class STORKLogoutResponse implements Serializable, Cloneable { - private static final long serialVersionUID = 4778480781609392750L; - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The distinguished name. */ - private String distinguishedName; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The country. */ - private String country; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Status message. */ - private String statusMessage; - - /** Logout failed? */ - private boolean fail; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Setter for the statusMessage value. - * - * @param status the new statusMessage value. - */ - public void setStatusMessage(final String status) { - this.statusMessage = status; - } - - /** - * Getter for the statusMessage value. - * - * @return The statusMessage value. - */ - public String getStatusMessage() { - return statusMessage; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - @Override - public Object clone() throws CloneNotSupportedException{ - STORKLogoutResponse storkLogoutResponse = null; - storkLogoutResponse = (STORKLogoutResponse) super.clone(); - storkLogoutResponse.setTokenSaml(getTokenSaml()); - return storkLogoutResponse; - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base deleted file mode 100644 index a9c4a156b..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains the SAML Token Status Code. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ - */ -public enum STORKStatusCode { - - /** URI for Requester status code. */ - REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"), - - /** URI for Responder status code. */ - RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"), - - /** URI for Success status code. */ - SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"), - - /** Attribute is Available. */ - STATUS_AVAILABLE("Available"), - - /** Attribute is NotAvailable. */ - STATUS_NOT_AVAILABLE("NotAvailable"), - - /** Attribute is Withheld. */ - STATUS_WITHHELD("Withheld"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - private STORKStatusCode(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base deleted file mode 100644 index 0a711c9b7..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base +++ /dev/null @@ -1,71 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains the SAML Token Sub Status Code. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.7 $, $Date: 2010-11-17 05:15:28 $ - */ -public enum STORKSubStatusCode { - - /** URI for AuthnFailed status code. */ - AUTHN_FAILED_URI("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"), - - /** URI for InvalidAttrNameOrValue status code. */ - INVALID_ATTR_NAME_VALUE_URI( - "urn:oasis:names:tc:SAML:2.0:status:InvalidAttrNameOrValue"), - - /** URI for InvalidNameIDPolicy status code. */ - INVALID_NAMEID_POLICY_URI( - "urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"), - - /** URI for VersionMismatch status code. */ - VERSION_MISMATCH_URI("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"), - - /** URI for RequestDenied status code. */ - REQUEST_DENIED_URI("urn:oasis:names:tc:SAML:2.0:status:RequestDenied"), - - /** URI for QaaNotSupported status code. */ - QAA_NOT_SUPPORTED( - "http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - private STORKSubStatusCode(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index 58ee7bcac..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Common Authentication Service functionalities to be deployed in every PEPS - * is contained in this package. - * In particular, it contains the SAML Engine that implements the SAML messages - * management - * - * @since 1.0 - */ -package eu.stork.peps.auth.commons; diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops deleted file mode 100644 index 14f05b17c..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops +++ /dev/null @@ -1,53 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 96 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions -END -InvalidParameterPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 131 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java -END -SecurityPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 123 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java -END -InvalidSessionPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 129 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/package-info.java -END -CPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 116 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java -END -StorkPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 120 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java -END -AbstractPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 123 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java -END -InternalErrorPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 128 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries deleted file mode 100644 index 06755237e..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries +++ /dev/null @@ -1,300 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -InternalErrorPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -36d8f6310e84c550f65bef78d5dc4238 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2471 - -InvalidParameterPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -c6ad53378b03a346ca0fc48a381ed771 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1800 - -SecurityPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -78d50b78a69cb0c630e4e14420e3b7be -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2199 - -InvalidSessionPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -5fd7f04ad6f6cc121084e682b2a4e678 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1555 - -package-info.java -file - - - - -2013-12-20T12:27:56.626475Z -7055c01b74382c525c7fcf110646d8fc -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -129 - -CPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -5d3cb4a7303baeaf2104aaa7da301b21 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3570 - -StorkPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -fea01f750728ea5f15b449acb517f4b2 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1690 - -AbstractPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -c9aedb030e6dbc9f002c7cd3d52cf03f -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4422 - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base deleted file mode 100644 index e9a96d7c2..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base +++ /dev/null @@ -1,173 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -import java.io.Serializable; - -/** - * Abstract class to represent the various PEPS exceptions. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ - */ -public abstract class AbstractPEPSException extends RuntimeException implements - Serializable { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = -1884417567740138022L; - - /** - * Error code. - */ - private String errorCode; - - /** - * Error message. - */ - private String errorMessage; - - /** - * SAML token. - */ - private String samlTokenFail; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param code The error code value. - * @param message The error message value. - */ - public AbstractPEPSException(final String code, final String message) { - - super(message); - this.errorCode = code; - this.errorMessage = message; - } - - /** - * Exception Constructor with the errorMessage as parameters and the Throwable - * cause. - * - * @param message The error message value. - * @param cause The throwable object. - */ - public AbstractPEPSException(final String message, final Throwable cause) { - - super(message, cause); - this.errorMessage = message; - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param code The error code value. - * @param message The error message value. - * @param cause The throwable object. - */ - public AbstractPEPSException(final String code, final String message, - final Throwable cause) { - - super(message, cause); - this.errorCode = code; - this.errorMessage = message; - } - - /** - * Exception Constructor with three Strings representing the errorCode, - * errorMessage and encoded samlToken as parameters. - * - * @param code The error code value. - * @param message The error message value. - * @param samlToken The error SAML Token. - */ - public AbstractPEPSException(final String code, final String message, - final String samlToken) { - - super(message); - this.errorCode = code; - this.errorMessage = message; - this.samlTokenFail = samlToken; - } - - /** - * Constructor with SAML Token as argument. Error message and error code are - * embedded in the SAML. - * - * @param samlToken The error SAML Token. - */ - public AbstractPEPSException(final String samlToken) { - super(); - this.samlTokenFail = samlToken; - } - - /** - * Getter for errorCode. - * - * @return The errorCode value. - */ - public final String getErrorCode() { - return errorCode; - } - - /** - * Setter for errorCode. - * - * @param code The error code value. - */ - public final void setErrorCode(final String code) { - this.errorCode = code; - } - - /** - * Getter for errorMessage. - * - * @return The error Message value. - */ - public final String getErrorMessage() { - return errorMessage; - } - - /** - * Setter for errorMessage. - * - * @param message The error message value. - */ - public final void setErrorMessage(final String message) { - this.errorMessage = message; - } - - /** - * Getter for SAMLTokenFail. - * - * @return The error SAML Token. - */ - public final String getSamlTokenFail() { - return samlTokenFail; - } - - /** - * Setter for SAMLTokenFail. - * - * @param samlToken The error SAML token. - */ - public final void setSamlTokenFail(final String samlToken) { - this.samlTokenFail = samlToken; - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base deleted file mode 100644 index 69cb20fdd..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base +++ /dev/null @@ -1,143 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * This exception is thrown by the C-PEPS service and holds the relative - * information to present to the citizen. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class CPEPSException extends RuntimeException { - - /** - * Serial id. - */ - private static final long serialVersionUID = -4012295047127999362L; - - /** - * Error code. - */ - private String errorCode; - - /** - * Error message. - */ - private String errorMessage; - - /** - * SAML token. - */ - private String samlTokenFail; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param samlToken The SAML Token. - * @param code The error code value. - * @param message The error message value. - */ - public CPEPSException(final String samlToken, final String code, - final String message) { - - super(message); - this.setErrorCode(code); - this.setErrorMessage(message); - this.setSamlTokenFail(samlToken); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param samlToken The SAML Token. - * @param code The error code value. - * @param message The error message value. - * @param cause The original exception; - */ - public CPEPSException(final String samlToken, final String code, - final String message, final Throwable cause) { - - super(message, cause); - this.setErrorCode(code); - this.setErrorMessage(message); - this.setSamlTokenFail(samlToken); - } - - /** - * {@inheritDoc} - */ - public String getMessage() { - return this.getErrorMessage() + " (" + this.getErrorCode() + ")"; - } - - /** - * Getter for the error code. - * - * @return The errorCode value. - */ - public String getErrorCode() { - return errorCode; - } - - /** - * Setter for the error code. - * - * @param code The error code. - */ - public void setErrorCode(final String code) { - this.errorCode = code; - } - - /** - * Getter for the error message. - * - * @return The errorMessage value. - */ - public String getErrorMessage() { - return errorMessage; - } - - /** - * Setter for the error message. - * - * @param message The error message. - */ - public void setErrorMessage(final String message) { - this.errorMessage = message; - } - - /** - * Getter for the samlTokenFail. - * - * @return The samlTokenFail value. - */ - public String getSamlTokenFail() { - return samlTokenFail; - } - - /** - * Setter for the samlTokenFail. - * - * @param samlToken The error Saml Token. - */ - public void setSamlTokenFail(final String samlToken) { - this.samlTokenFail = samlToken; - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base deleted file mode 100644 index 67514d4fe..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base +++ /dev/null @@ -1,74 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Internal Error Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ - * - * @see AbstractPEPSException - */ -public final class InternalErrorPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 1193001455410319795L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param cause The throwable object. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage, final Throwable cause) { - - super(errorCode, errorMessage, cause); - } - - /** - * Exception Constructor with three strings representing the errorCode, - * errorMessage and encoded samlToken as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param samlTokenFail The error SAML Token. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage, final String samlTokenFail) { - - super(errorCode, errorMessage, samlTokenFail); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage) { - - super(errorCode, errorMessage); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base deleted file mode 100644 index 12c83b589..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Invalid Parameter Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.11 $, $Date: 2010-11-17 05:15:28 $ - * - * @see InvalidParameterPEPSException - */ -public class InvalidParameterPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 2046282148740524875L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error code message value. - */ - public InvalidParameterPEPSException(final String errorCode, - final String errorMessage) { - super(errorCode, errorMessage); - } - - /** - * Exception Constructor with one String representing the encoded samlToken. - * - * @param samlTokenFail The error SAML Token. - */ - public InvalidParameterPEPSException(final String samlTokenFail) { - super(samlTokenFail); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base deleted file mode 100644 index 800525eee..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Invalid session Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.14 $, $Date: 2010-11-17 05:15:28 $ - * - * @see InvalidParameterPEPSException - */ -public class InvalidSessionPEPSException extends InvalidParameterPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 7147090160978319016L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - */ - public InvalidSessionPEPSException(final String errorCode, - final String errorMessage) { - - super(errorCode, errorMessage); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base deleted file mode 100644 index fc27371d2..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Security PEPS Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.18 $, $Date: 2010-11-17 05:15:28 $ - * - * @see AbstractPEPSException - */ -public final class SecurityPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 5605743302478554967L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMsg The error message value. - */ - public SecurityPEPSException(final String errorCode, final String errorMsg) { - super(errorCode, errorMsg); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param cause The throwable object. - */ - public SecurityPEPSException(final String errorCode, - final String errorMessage, final Throwable cause) { - - super(errorCode, errorMessage, cause); - } - - /** - * Exception Constructor with one String representing the encoded samlToken. - * - * @param samlTokenFail The error SAML Token. - */ - public SecurityPEPSException(final String samlTokenFail) { - super(samlTokenFail); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base deleted file mode 100644 index a2da61a02..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Security PEPS Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ - * - * @see AbstractPEPSException - */ -public final class StorkPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 8048033129798427574L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMsg The error message value. - */ - public StorkPEPSException(final String errorCode, final String errorMsg) { - super(errorCode, errorMsg); - } - - /** - * {@inheritDoc} - */ - public String getMessage() { - - return "Security Error (" + this.getErrorCode() + ") processing request : " - + this.getErrorMessage(); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index 1a3c57329..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Package for the PEPS’ Exceptions handling. - * - * @since 1.0 - */ -package eu.stork.peps.auth.commons.exceptions; - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops deleted file mode 100644 index 3cd5d5378..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops +++ /dev/null @@ -1,41 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 87 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific -END -IDeriveAttribute.java -K 25 -svn:wc:ra_dav:version-url -V 108 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java -END -IAUService.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java -END -INormaliseValue.java -K 25 -svn:wc:ra_dav:version-url -V 107 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java -END -ITranslatorService.java -K 25 -svn:wc:ra_dav:version-url -V 111 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 104 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/package-info.java -END -ICheckAttributeValue.java -K 25 -svn:wc:ra_dav:version-url -V 112 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries deleted file mode 100644 index 1dfa9b9fc..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries +++ /dev/null @@ -1,232 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth/specific -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -IDeriveAttribute.java -file - - - - -2013-12-20T12:27:56.654475Z -dce3856a97583f739cdf50ca78491277 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1504 - -IAUService.java -file - - - - -2014-01-21T08:38:55.228702Z -b622aaaa29b0cd72261ca7799db691b9 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -7023 - -INormaliseValue.java -file - - - - -2013-12-20T12:27:56.654475Z -09f6e376875762fca294be4dfecb71f1 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1237 - -ITranslatorService.java -file - - - - -2014-01-21T08:38:55.228702Z -c027ed5506150c744b8e586b325de5fb -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3120 - -package-info.java -file - - - - -2013-12-20T12:27:56.654475Z -eef7721d55c2edb02a432fc08ae9e487 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -164 - -ICheckAttributeValue.java -file - - - - -2013-12-20T12:27:56.654475Z -b0472ff15d1c86f175da134b0f0eda71 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1321 - diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base deleted file mode 100644 index 5c24cc5a8..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base +++ /dev/null @@ -1,215 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import java.util.Map; - -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.IStorkSession; -import eu.stork.peps.auth.commons.STORKAttrQueryResponse; -import eu.stork.peps.auth.commons.STORKAuthnResponse; - -/** - * Interface for Specific Authentication methods. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface IAUService { - - /** - * Prepares the citizen to be redirected to the IdP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The Requested attributes. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] prepareCitizenAuthentication(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Prepares the citizen to be redirected to the PV. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The Requested attributes. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] preparePVRequest(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Authenticates a citizen. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The requested attributes. - * - * @return The updated Personal Attribute List. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList authenticateCitizen( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Validates a power. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The requested attributes. - * - * @return The updated Personal Attribute List (power validated). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList powerValidation( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Prepares the Citizen browser to be redirected to the AP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The requested attributes. - * - * @return true in case of no error. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - boolean prepareAPRedirect(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Returns the attributes values from the AP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The request attributes. - * - * @return The updated Personal Attribute List. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList getAttributesFromAttributeProviders( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Get the attributes from the AP with verification. - * - * @param personalList The Personal Attribute List. - * @param parameters The HTTP Parameters. - * @param requestAttributes The requested Attributes. - * @param session The session object. - * @param auProcessId The SAML identifier. - * - * @return true if the attributes were correctly verified. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - boolean getAttributesWithVerification(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session, String auProcessId); - - /** - * Validates a SAML Response. - * - * @param samlToken The SAML Token. - * @param session The session object. - * - * @return the STORKAuthnResponse associated with the validated response. - * - * @see IStorkSession - */ - STORKAuthnResponse processAuthenticationResponse(byte[] samlToken, - IStorkSession session); - - /** - * Generates a SAML Response in case of error. - * - * @param inResponseTo The SAML's identifier to response. - * @param issuer The issuer value. - * @param assertionURL The assertion URL. - * @param code The error code. - * @param subcode The sub error code. - * @param message The error message. - * @param ipUserAddress The user IP address. - * - * @return byte[] containing the SAML Response. - */ - byte[] generateErrorAuthenticationResponse(String inResponseTo, - String issuer, String assertionURL, String code, String subcode, - String message, String ipUserAddress); - - /** - * Compares two given personal attribute lists. - * - * @param original The original Personal Attribute List. - * @param modified The modified Personal Attribute List. - * @return true if the original list contains the modified one. False - * otherwise. - * - * @see IPersonalAttributeList - */ - boolean comparePersonalAttributeLists(IPersonalAttributeList original, - IPersonalAttributeList modified); - - /** - * Prepares the citizen to be redirected to the AtP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] prepareAttributeRequest(IPersonalAttributeList personalList, - Map parameters, IStorkSession session); - - /** - * Validates a SAML Response. - * - * @param samlToken The SAML Token. - * @param session The session object. - * - * @return the STORKAttrQueryResponse associated with the validated response. - * - * @see IStorkSession - */ - STORKAttrQueryResponse processAttributeResponse(byte[] samlToken, - IStorkSession session); -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base deleted file mode 100644 index 31a8d78ff..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import java.util.List; - -/** - * Interface that defines the methods to work with the validation of attributes. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface ICheckAttributeValue { - - /** - * Checks if the list of values contains the expected value. - * - * @param values The List of values. - * @param expectedValue The value to check if it exists on the list. - * - * @return boolean true, if the value is present in the list. False, - * otherwise. - */ - boolean checkValue(List values, String expectedValue); - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base deleted file mode 100644 index 78eb53004..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import eu.stork.peps.auth.commons.IStorkSession; -import eu.stork.peps.auth.commons.PersonalAttribute; - -/** - * Interface that defines the methods to work with derivation of attributes. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface IDeriveAttribute { - - /** - * Derives the attribute value. Set the Personal Attribute value to null if - * the value in session or the value of age are invalid (non-numeric or null). - * - * @param personalAttrList The Personal Attribute List. - * @param session The session object. - * - * @see PersonalAttribute The personal Attribute - * @see IStorkSession The session object. - */ - void deriveAttributeToData(PersonalAttribute personalAttrList, - IStorkSession session); - -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base deleted file mode 100644 index ca2114e32..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import eu.stork.peps.auth.commons.PersonalAttribute; - -/** - * Interface for attribute's value normalisation. - * - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface INormaliseValue { - - /** - * Translates the attribute's value from local format to STORK format. - * - * @param personalAttribute The Personal Attribute to normalise the value. - * - * @see PersonalAttribute - */ - void normaliseAttributeValueToStork(PersonalAttribute personalAttribute); -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base deleted file mode 100644 index 8a33897d8..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base +++ /dev/null @@ -1,100 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.IStorkSession; -import eu.stork.peps.auth.commons.STORKAuthnRequest; - -/** - * Interface for attributes normalization. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface ITranslatorService { - - /** - * Translates the attributes from local format to STORK format. - * - * @param personalList The Personal Attribute List. - * - * @return The Personal Attribute List with normalised attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeNamesToStork( - IPersonalAttributeList personalList); - - /** - * Translates the attributes values from local format to STORK format. - * - * @param personalList The Personal Attribute List. - * - * @return The PersonalAttributeList with normalised values. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeValuesToStork( - IPersonalAttributeList personalList); - - /** - * Translates the attributes from STORK format to local format. - * - * @param personalList The Personal Attribute List. - * - * @return The PersonalAttributeList with normalised attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeNamesFromStork( - IPersonalAttributeList personalList); - - /** - * Derive Attribute Names To Stork format. - * - * @param personalList The Personal Attribute List, - * - * @return The PersonalAttributeList with derived attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList deriveAttributeFromStork( - IPersonalAttributeList personalList); - - /** - * Derive Attribute Names from Stork format. - * - * @param session The session object. - * @param modifiedList The Personal Attribute List. - * - * @return The PersonalAttributeList with derived attributes. - * - * @see IStorkSession - * @see IPersonalAttributeList - */ - IPersonalAttributeList deriveAttributeToStork(IStorkSession session, - IPersonalAttributeList modifiedList); - - /** - * Validate the values of the attributes. - * - * @param pal The attribute list - * - * @return True, if all the attributes have values. False, otherwise. - * - * @see STORKAuthnRequest - */ - boolean checkAttributeValues(IPersonalAttributeList pa); -} diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index 7b2fac5ef..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Specific PEPS Interfaces that implements functionality of the Authentication - * Service. - * - * @since 1.0 - */ -package eu.stork.peps.auth.specific; - diff --git a/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/all-wcprops deleted file mode 100644 index 48074222b..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 63 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources -END -log4j.xml -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources/log4j.xml -END diff --git a/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/entries b/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/entries deleted file mode 100644 index 4e038b836..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/resources -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -log4j.xml -file - - - - -2013-12-20T12:27:56.554475Z -aa8c46e41a236b8c7049713b3eeecc49 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -660 - diff --git a/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base b/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base deleted file mode 100644 index 8bce0bec0..000000000 --- a/id/server/legacy-backup/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/id/server/legacy-backup/stork2-commons/src/test/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/test/.svn/all-wcprops deleted file mode 100644 index 48b797f41..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 54 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test -END diff --git a/id/server/legacy-backup/stork2-commons/src/test/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/.svn/entries deleted file mode 100644 index 20b446883..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -java -dir - -resources -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/test/java/.svn/all-wcprops deleted file mode 100644 index 6957eb776..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 59 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java -END diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/java/.svn/entries deleted file mode 100644 index ae019ed10..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -eu -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/all-wcprops deleted file mode 100644 index 51a31d6f6..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 62 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu -END diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/entries deleted file mode 100644 index f649532fd..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -stork -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops deleted file mode 100644 index dece991f4..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 68 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu/stork -END diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/entries deleted file mode 100644 index ed1d5001e..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu/stork -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -peps -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops deleted file mode 100644 index 57300d6a5..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu/stork/peps -END diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/entries deleted file mode 100644 index 5908857a7..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu/stork/peps -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -tests -dir - diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops deleted file mode 100644 index 0bc94ebcd..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops +++ /dev/null @@ -1,53 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 79 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu/stork/peps/tests -END -PersonalAttributeTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 96 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/java/eu/stork/peps/tests/package-info.java -END -DateUtilTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 100 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java -END -AttributeProvidersMapTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java -END -AttributeUtilTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 105 -/CITnet/svn/STORK2/!svn/ver/96/trunk/Commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java -END -PersonalAttributeListTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java -END -AttributeSourceTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 108 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java -END -PEPSUtilTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 100 -/CITnet/svn/STORK2/!svn/ver/96/trunk/Commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java -END diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries deleted file mode 100644 index 8a8c64359..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries +++ /dev/null @@ -1,300 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu/stork/peps/tests -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -AttributeSourceTestCase.java -file - - - - -2014-01-21T08:38:55.140702Z -28eeedf050cdff69d4d2cca83a98bcc8 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2363 - -PEPSUtilTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -f54beadeab9af936f44af326eb1116d2 -2013-11-01T20:35:30.927048Z -96 -emferreri - - - - - - - - - - - - - - - - - - - - - -16714 - -PersonalAttributeTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -77386880d5ffadd21c9b3a3c7d51b990 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -5449 - -package-info.java -file - - - - -2013-12-20T12:27:56.518475Z -04f136539bda0caa3d5ccdfee912cfce -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -92 - -DateUtilTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -244cc6104660a7835dbf72dadb305d71 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8907 - -AttributeProvidersMapTestCase.java -file - - - - -2014-01-21T08:38:55.140702Z -943e143bcc0ee8e573997e358859d6f2 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3809 - -AttributeUtilTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -6037f125adf7f4c2f6873a0d99ab0705 -2013-11-01T20:35:30.927048Z -96 -emferreri - - - - - - - - - - - - - - - - - - - - - -16318 - -PersonalAttributeListTestCase.java -file - - - - -2014-01-21T08:38:55.140702Z -ae552dce95a6b83d15e381306e2f5e59 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -24508 - diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base deleted file mode 100644 index 782b3d02d..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base +++ /dev/null @@ -1,134 +0,0 @@ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import eu.stork.peps.auth.commons.AttributeProvider; -import eu.stork.peps.auth.commons.AttributeProvidersMap; -import eu.stork.peps.auth.commons.AttributeSource; -import eu.stork.peps.auth.commons.Country; -import eu.stork.peps.auth.commons.IAttributeProvidersMap; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PersonalAttributeList; - -/** - * The AttributeSource's Test Case. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: $, $Date: $ - */ -public class AttributeProvidersMapTestCase { - - @Test - public void testObjectOK1() { - IAttributeProvidersMap map = new AttributeProvidersMap(); - AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(source) ) { - outcome = true; - } - - assertTrue(outcome); - } - - @Test - public void testObjectOK2() { - IAttributeProvidersMap map = new AttributeProvidersMap(); - AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(source) ) { - if ( map.get(source)!=null ) { - outcome = true; - } - } - - assertTrue(outcome); - } - - @Test - public void testObjectOK3() { - IAttributeProvidersMap map = new AttributeProvidersMap(); - AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - outcome = true; - } - - assertTrue(outcome); - } - - @Test - public void testObjectOK4() { - IAttributeProvidersMap map = new AttributeProvidersMap(); - AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - if ( map.get(target)!=null ) { - outcome = true; - } - } - - assertTrue(outcome); - } - - @Test - public void testObjectNOK1() { - IAttributeProvidersMap map = new AttributeProvidersMap(); - AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - AttributeSource target = new AttributeSource(new Country("ID1", "Name 1"), "URL"); - IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - outcome = true; - } - - assertFalse(outcome); - } - - @Test - public void testObjectNOK2() { - IAttributeProvidersMap map = new AttributeProvidersMap(); - AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL"); - AttributeSource target = new AttributeSource(new AttributeProvider("ID2", "Name 1"), "URL"); - IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - outcome = true; - } - - assertFalse(outcome); - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base deleted file mode 100644 index 96b2c8317..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base +++ /dev/null @@ -1,88 +0,0 @@ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import eu.stork.peps.auth.commons.AttributeProvider; -import eu.stork.peps.auth.commons.AttributeSource; -import eu.stork.peps.auth.commons.Country; - -/** - * The AttributeSource's Test Case. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: $, $Date: $ - */ -public final class AttributeSourceTestCase { - private AttributeSource ap1 = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL1"); - private AttributeSource ap2 = new AttributeSource(new AttributeProvider("ID2", "Name 2"), "URL2"); - private AttributeSource ap3 = new AttributeSource(new AttributeProvider("ID1", "Name 2"), "URL2"); - private AttributeSource ap4 = new AttributeSource(new AttributeProvider("ID1", "Name 2"), "URL1"); - private AttributeSource ap5 = new AttributeSource(new AttributeProvider("ID1", "Name 1"), "URL1"); - - private AttributeSource c1 = new AttributeSource(new Country("ID1", "Name 1"), "URL1"); - private AttributeSource c2 = new AttributeSource(new Country("ID2", "Name 2"), "URL2"); - private AttributeSource c3 = new AttributeSource(new Country("ID1", "Name 2"), "URL2"); - private AttributeSource c4 = new AttributeSource(new Country("ID1", "Name 2"), "URL1"); - private AttributeSource c5 = new AttributeSource(new Country("ID1", "Name 1"), "URL1"); - - @Test - public void testNotEquals1() { - assertFalse(ap1.equals(ap2)); - } - - @Test - public void testNotEquals2() { - assertFalse(ap1.equals(c1)); - } - - @Test - public void testNotEquals3() { - assertFalse(c1.equals(c2)); - } - - @Test - public void testEquals1() { - assertTrue(ap1.equals(ap3)); - } - - @Test - public void testEquals2() { - assertTrue(ap1.equals(ap4)); - } - - @Test - public void testEquals3() { - assertTrue(ap1.equals(ap5)); - } - - @Test - public void testEquals4() { - assertTrue(c1.equals(c3)); - } - - @Test - public void testEquals5() { - assertTrue(c1.equals(c4)); - } - - @Test - public void testEquals6() { - assertTrue(c1.equals(c5)); - } - - @Test - public void testEquals7() { - Object obj = ap5; - assertTrue(ap1.equals(obj)); - } - - @Test - public void testEquals8() { - Object obj = c5; - assertTrue(c1.equals(obj)); - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base deleted file mode 100644 index 77fc4b9c2..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base +++ /dev/null @@ -1,537 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.Test; - -import eu.stork.peps.auth.commons.AttributeUtil; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSValues; -import eu.stork.peps.auth.commons.PersonalAttributeList; - -/** - * The AttributeUtil's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com - * - * @version $Revision: $, $Date: $ - */ -public final class AttributeUtilTestCase { - - /** - * Empty String to be used on the tests. - */ - private static final String EMPTY_STRING = ""; - - /** - * Tuple value sample to be used on the tests. - */ - private static final String[] TUPLE_STRING = new String[] { "age", "true", - "[18]", "Available" }; - - /** - * Complex value to be used on escape/unescape tests. - */ - private static final String COMPLEX_VAL = "postalCode=4100," - + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379," - + "streetName=Avenida Sidonio Pais,town=Porto,"; - - /** - * Escaped Complex value to be used on escape/unescape tests. - */ - private static final String ESC_COMPLEX_VAL = "postalCode=4100%44" - + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44" - + "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44"; - - /** - * Simple value to be used on escape/unescape tests. - */ - private static final String SIMPLE_VAL = "Avenida da Boavista, Porto"; - - /** - * Escaped simple value to be used on escape/unescape tests. - */ - private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto"; - - /** - * Simple text to be used on escape/unescape tests. Must match the escaped - * text. - */ - private static final String SIMPLE_TEXT = "John Doe"; - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given complex - * attribute value (canonical address' example attribute value). - */ - @Test - public void testEscapeSpecialCharsComplexVal() { - assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given - * attribute value. - */ - @Test - public void testEscapeSpecialCharsVal() { - assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given simple - * text: no special characters to escape. - */ - @Test - public void testEscapeNormalChars() { - assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#unescape(String)} method for the given - * escape complex attribute value (canonical address' example attribute - * value). - */ - @Test - public void testUnescapeSpecialCharsComplexVal() { - assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given escape - * attribute value. - */ - @Test - public void testUnescapeSpecialCharsVal() { - assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given simple - * text: no special characters to unescape. - */ - @Test - public void testUnescapeNormalChars() { - assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} - * method for the given empty string. - */ - @Test - public void testAppendIfNotNullEmptyStr() { - final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT); - AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING); - assertEquals(strBuilder.toString(), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} - * method for the given string. - */ - @Test - public void testAppendIfNotNullStr() { - final StringBuilder strBuilder = new StringBuilder(); - AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT); - assertEquals(strBuilder.toString(), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} - * method for the given null value. - */ - @Test - public void testAppendIfNotNull() { - final StringBuilder strBuilder = new StringBuilder(); - AttributeUtil.appendIfNotNull(strBuilder, null); - assertEquals(strBuilder.toString(), EMPTY_STRING); - } - - /** - * Tests the {@link AttributeUtil#listToString(List, String)} method for the - * given List with two values. - */ - @Test - public void testListToStringTwoVals() { - final List vals = new ArrayList(); - vals.add(SIMPLE_VAL); - vals.add(SIMPLE_TEXT); - - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append(SIMPLE_TEXT); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - assertEquals( - AttributeUtil.listToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#listToString(List, String)} method for the - * given List with one values. - */ - @Test - public void testListToStringOneVal() { - final List vals = new ArrayList(); - vals.add(SIMPLE_VAL); - - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - assertEquals( - AttributeUtil.listToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#listToString(List, String)} method for the - * given List with one value. - */ - @Test - public void testListToStringEmptyVal() { - final List vals = new ArrayList(); - - final StringBuilder strBuilder = new StringBuilder(); - - assertEquals( - AttributeUtil.listToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method - * for the given Map with one value. - */ - @Test - public void testMapToStringOneVal() { - final Map vals = new HashMap(); - vals.put("CanonicalAddress", COMPLEX_VAL); - - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("CanonicalAddress="); - strBuilder.append(ESC_COMPLEX_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - assertEquals(AttributeUtil.mapToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method - * for the given empty Map. - */ - @Test - public void testMapToStringEmptyVal() { - final Map vals = new HashMap(); - - final StringBuilder strBuilder = new StringBuilder(); - - assertEquals(AttributeUtil.mapToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * invalid List. - */ - @Test - public void testIsValidValueInvalidList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append("]"); - assertFalse(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * null value. - */ - @Test - public void testIsValidValueNullList() { - assertFalse(AttributeUtil.isValidValue(null)); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * empty List. - */ - @Test - public void testIsValidValueEmptyList() { - assertTrue(AttributeUtil.isValidValue("[]")); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * empty List. - */ - @Test - public void testIsValidValueEmptyCommaList() { - assertTrue(AttributeUtil.isValidValue("[,]")); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one simple value List. - */ - @Test - public void testIsValidValueOneValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one simple value List. - */ - @Test - public void testIsValidValueOneValueCommaList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one complex value List. - */ - @Test - public void testIsValidValueOneComplexValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_COMPLEX_VAL); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one complex value List. - */ - @Test - public void testIsValidValueOneComplexValueCommaList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_COMPLEX_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * multi value List. - */ - @Test - public void testIsValidValueMultiValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append(SIMPLE_TEXT); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * invalid multi value List. - */ - @Test - public void testIsValidValueInvalidMultiValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append(SIMPLE_TEXT); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertFalse(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * true type. - */ - @Test - public void testIsValidTypetrue() { - assertTrue(AttributeUtil.isValidType("true")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * True type. - */ - @Test - public void testIsValidTypeTrue() { - assertTrue(AttributeUtil.isValidType("True")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * TRUE type. - */ - @Test - public void testIsValidTypeTRUE() { - assertTrue(AttributeUtil.isValidType("TRUE")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * invalid type. - */ - @Test - public void testIsValidTypeInvalidType() { - assertFalse(AttributeUtil.isValidType("str")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * false type. - */ - @Test - public void testIsValidTypefalse() { - assertTrue(AttributeUtil.isValidType("false")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * False type. - */ - @Test - public void testIsValidTypeFalse() { - assertTrue(AttributeUtil.isValidType("False")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * FALSE type. - */ - @Test - public void testIsValidTypeFALSEVal() { - assertTrue(AttributeUtil.isValidType("False")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * null. - */ - @Test - public void testIsValidTypeNullVal() { - assertFalse(AttributeUtil.isValidType(null)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given valid tuple. - */ - @Test - public void testHasValidTuples() { - assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given invalid tuple. - */ - @Test - public void testHasValidTuplesInvalid() { - final String[] tuple = new String[]{"name", "type"}; - assertFalse(AttributeUtil.hasValidTuples(tuple)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given invalid tuple with valid size. - */ - @Test - public void testHasValidTuplesSameSizeInvalidValues() { - final String[] tuple = new String[] { "age", "type", "[18]", "Available"}; - assertFalse(AttributeUtil.hasValidTuples(tuple)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given null value. - */ - @Test - public void testHasValidTuplesNull() { - assertFalse(AttributeUtil.hasValidTuples(null)); - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given attribute list.. - */ - @Test - public void testCheckMandatoryAttributes() { - final IPersonalAttributeList attrList = new PersonalAttributeList(); - attrList.populate("isAgeOver:true:[18,]:Available;"); - assertTrue(AttributeUtil.checkMandatoryAttributes(attrList)); - - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given null value. - */ - @Test(expected = NullPointerException.class) - public void testCheckMandatoryAttributesNullAttrList() { - assertTrue(AttributeUtil.checkMandatoryAttributes(null)); - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given empty attribute list. - */ - @Test - public void testCheckMandatoryAttributesEmptyAttrList() { - final IPersonalAttributeList attrList = new PersonalAttributeList(); - assertTrue(AttributeUtil.checkMandatoryAttributes(attrList)); - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given attribute list (missing mandatory attribute). - */ - @Test - public void testCheckMandatoryAttributesMissingAttr() { - final IPersonalAttributeList attrList = new PersonalAttributeList(); - attrList.populate("isAgeOver:true:[]:NotAvailable;"); - assertFalse(AttributeUtil.checkMandatoryAttributes(attrList)); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base deleted file mode 100644 index 5d2296997..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base +++ /dev/null @@ -1,294 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import java.sql.Timestamp; -import java.util.Properties; - -import org.joda.time.DateTime; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.DateUtil; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException; - -/** - * The PersonalAttribute's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.2 $, $Date: 2010-11-17 05:17:03 $ - */ -public final class DateUtilTestCase { - - /** - * Stork Format date. - */ - private static final String FORMAT = "yyyyMMdd"; - - /** - * Expected 10 value. - */ - private static final int TEN = 10; - - /** - * Expected 11 value. - */ - private static final int ELEVEN = 11; - - /** - * The testing Date ("current" date). - */ - private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20, - 0, 0); - - /** - * Init DateUtilTestCase class. - */ - @BeforeClass - public static void runsBeforeTheTestSuite() { - final Properties configs = new Properties(); - configs.setProperty("invalidAgeDateValue.code", "35"); - configs.setProperty("invalidAttributeValue.code", "34"); - configs - .setProperty( - "invalidAttributeValue.message", - "Unexpected or invalid content was encountered within a " - + " or element."); - PEPSUtil.createInstance(configs); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year against - * the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromYear() { - Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year and month - * against the testDate: 2011-10-10 15:20:00.0. Must return 11. - */ - @Test - public void calculateAgeFromEarlyMonth() { - Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE, - FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year and month - * against the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromSameMonth() { - Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year and month - * against the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromLaterMonth() { - Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return 11. - */ - @Test - public void calculateAgeFromEarlyFullDate() { - Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE, - FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return 11. - */ - @Test - public void calculateAgeFromSameDay() { - Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE, - FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromLaterFullDate() { - Assert.assertTrue(TEN == DateUtil - .calculateAge("20001011", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromInvalidDate() { - DateUtil.calculateAge("200", TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromInvalidMonth() { - DateUtil.calculateAge("200013", TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromInvalidDay() { - DateUtil.calculateAge("20000230", TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromNullDate() { - DateUtil.calculateAge(null, TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromNullCurDate() { - DateUtil.calculateAge("2000", null, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromNullFormat() { - DateUtil.calculateAge("2000", TESTDATE, null); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return true - */ - @Test - public void isValidFormatDateFromYear() { - Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year and - * month. Must return true. - */ - @Test - public void isValidFormatDateFromMonth() { - Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDate() { - Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateInvalidYear() { - Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateInvalidMonth() { - Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateInvalidDate() { - Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateNullDate() { - Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateNullFormat() { - Assert.assertFalse(DateUtil.isValidFormatDate("2000", null)); - } - - /** - * Tests the {@link DateUtil#currentTimeStamp()} method for the current - * TimeStamp (TS). Must return true. - */ - @Test - public void testCurrentTimeStampBefore() { - Timestamp ts = DateUtil.currentTimeStamp(); - Assert.assertNotSame(ts, DateUtil.currentTimeStamp()); - } - - /** - * Tests the {@link DateUtil#currentTimeStamp()} method for the current - * TimeStamp (TS). Must return true. - */ - @Test - public void testCurrentTimeStampAfter() { - Timestamp ts = DateUtil.currentTimeStamp(); - Assert.assertEquals(DateUtil.currentTimeStamp(), ts); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base deleted file mode 100644 index d4841ed43..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base +++ /dev/null @@ -1,553 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; - -import java.util.Properties; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSErrors; -import eu.stork.peps.auth.commons.PEPSParameters; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.PersonalAttributeList; -import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException; -import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException; - -/** - * The PEPSUtil's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com - * - * @version $Revision: $, $Date: $ - */ -public final class PEPSUtilTestCase { - - /** - * Message example. - */ - private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed"; - - /** - * Error message example. - */ - private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed"; - - /** - * Error code example. - */ - private static final String ERROR_CODE_SAMPLE = "003002"; - - /** - * Properties values for testing proposes. - */ - private static final Properties CONFIGS1 = new Properties(); - - /** - * Properties values for testing proposes. - */ - private static final Properties CONFIGS2 = new Properties(); - - /** - * The empty string value: "". - */ - private static final String EMPTY_STRING = ""; - - /** - * The empty byte value: []. - */ - private static final byte[] EMPTY_BYTE = new byte[] {}; - - /** - * The empty byte hash value. - */ - private static final byte[] EMPTY_HASH_BYTE = new byte[] { -49, -125, -31, - 53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28, - 5, 11, 87, 21, -36, -125, -12, -87, 33, -45, 108, -23, -50, 71, -48, -47, - 60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49, - -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62 }; - - /** - * The SAML example byte[] value. - */ - private static final byte[] SAML_BYTE_SAMPLE = new byte[] { 60, 115, 97, 109, - 108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108 }; - - /** - * The SAML's Base64 example value. - */ - private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s"; - - /** - * The SAML's Base64 byte[] example value. - */ - private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[] { 80, 72, 78, 104, - 98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115 }; - - /** - * The SAML's Base64 Hash byte[] example value. - */ - private static byte[] HASH_BYTE_SAMPLE = new byte[] { 67, 38, 11, 115, 49, - -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67, - 90, 101, 30, 82, -13, 60, -106, -72, -103, -75, 19, 2, -107, 107, -6, -56, - 34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12, - -102, 12, -56, 30, -59, -104, -21, -42, -103, 82 }; - - /** - * Init PEPSUtilTestCase class. - */ - @BeforeClass - public static void runsBeforeTheTestSuite() { - - CONFIGS1.setProperty("max.attrList.size", "20000"); - CONFIGS1.setProperty("attrList.code", "202005"); - CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter"); - - CONFIGS1.setProperty("max.qaaLevel.size", "1"); - CONFIGS1.setProperty("max.spUrl.size", "inv"); - CONFIGS1.setProperty("validation.active", "true"); - CONFIGS1.setProperty("hashDigest.className", - "org.bouncycastle.crypto.digests.SHA512Digest"); - CONFIGS1.setProperty("invalidAgeDateValue.code", "35"); - CONFIGS1.setProperty("invalidAttributeValue.code", "34"); - CONFIGS1.setProperty("invalidAttributeValue.message", - "Unexpected or invalid content was encountered within a " - + " or element."); - } - - /** - * Tests the {@link PEPSUtil#createInstance(Properties)} method for the given - * properties object. - */ - @Test - public void testCreateInstance() { - Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2)); - } - - /** - * Tests the {@link PEPSUtil#getConfigs()}. - */ - @Test - public void testGetConfigs() { - final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1); - assertEquals(pepsUtils.getConfigs(), CONFIGS1); - } - - /** - * Tests the {@link PEPSUtil#getConfigs()}. - */ - @Test - public void testGetConfigsDifferent() { - final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1); - assertNotSame(pepsUtils.getConfigs(), CONFIGS2); - } - - /** - * Tests the {@link PEPSUtil#getConfig(String)} method for the given existing - * config. - */ - @Test - public void testGetConfigExists() { - assertEquals(PEPSUtil.getConfig("hashDigest.className"), - "org.bouncycastle.crypto.digests.SHA512Digest"); - } - - /** - * Tests the {@link PEPSUtil#getConfig(String)} method for the given not - * existing config. - */ - @Test - public void testGetConfigNoExists() { - assertNull(PEPSUtil.getConfig("doesnt.exists")); - } - - /** - * Tests the {@link PEPSUtil#getConfig(String)} method for the given null - * value. - */ - @Test(expected = NullPointerException.class) - public void testGetConfigNull() { - assertNull(PEPSUtil.getConfig(null)); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterExists() { - assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterExistsGreat() { - assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterExistsIvalidConf() { - assertFalse(PEPSUtil - .isValidParameter("spUrl", "http://localhost:8080/SP/")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterNotExists() { - assertFalse(PEPSUtil.isValidParameter("doesntexists", - "http://localhost:8080/SP/")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterNullParamName() { - assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterNullParamValue() { - assertFalse(PEPSUtil.isValidParameter("spUrl", null)); - } - - /** - * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method - * for the given object values. - */ - @Test - public void testValidateParameterValid() { - final IPersonalAttributeList persAttrList = new PersonalAttributeList(); - persAttrList.populate("isAgeOver:true:[15,]:Available;"); - PEPSUtil.validateParameter("ServiceProviderAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList); - } - - /** - * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method - * for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterNull() { - PEPSUtil.validateParameter("ServiceProviderAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), null); - } - - /** - * Tests the {@link PEPSUtil#validateParameter(String, String, String)} method - * for the given string values. - * - * The tested class just invokes - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * so further tests will be later. - */ - @Test - public void testValidateParameter() { - PEPSUtil.validateParameter("ServiceProviderAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), - "isAgeOver:true:[15,]:Available;"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)} - * method for the given string value and {@link PEPSErrors} enum. - * - * The tested class just invokes - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * so further tests will be later. - */ - @Test - public void testValidateParameterPEPSErrors() { - PEPSUtil.validateParameter("CountrySelectorAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), - "isAgeOver:true:[15,]:Available;", - PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test - public void testValidateParameterValidParams() { - PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterInvalidParamValue() { - PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterInvalidParamName() { - PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterNullParamName() { - PEPSUtil.validateParameter("ServiceProviderAction", null, "1", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterNullParamValue() { - PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null, - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given - * string value. - */ - @Test - public void testEncodeSAMLToken() { - assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given - * null. - */ - @Test(expected = NullPointerException.class) - public void testEncodeSAMLTokenNull() { - assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given - * empty byte[] value. - */ - @Test - public void testEncodeSAMLTokenEmpty() { - assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING); - } - - /** - * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given - * byte[] value. - */ - @Test - public void testDecodeSAMLToken() { - assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE), - SAML_BYTE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given - * null value. - */ - @Test(expected = NullPointerException.class) - public void testDecodeSAMLTokenNull() { - assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given - * empty string value. - */ - @Test(expected = StringIndexOutOfBoundsException.class) - public void testDecodeSAMLTokenEmpty() { - assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE); - } - - /** - * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given - * byte[] value. - */ - @Test - public void testHashPersonalToken() { - assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE), - HASH_BYTE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given - * null value. - */ - @Test(expected = InternalErrorPEPSException.class) - public void testHashPersonalTokenNull() { - assertNull(PEPSUtil.hashPersonalToken(null)); - } - - /** - * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given - * empty value. - */ - @Test - public void testHashPersonalTokenEmpty() { - assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * correct message. - */ - @Test - public void testGetStorkErrorCodeExists() { - assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * invalid message. - */ - @Test - public void testGetStorkErrorCodeNoExists() { - assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * empty message. - */ - @Test - public void testGetStorkErrorCodeEmpty() { - assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * null message. - */ - @Test - public void testGetStorkErrorCodeNull() { - assertNull(PEPSUtil.getStorkErrorCode(null)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * invalid message. - */ - @Test - public void testGetStorkErrorCodeWithSepFake() { - assertNull(PEPSUtil.getStorkErrorCode("-")); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * invalid message. - */ - @Test - public void testGetStorkErrorCodeWithSepAndCodeFake() { - assertNull(PEPSUtil.getStorkErrorCode("000001 -")); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given correct message. - */ - @Test - public void testGetStorkErrorMessageExists() { - assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE), - ERROR_MESSAGE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given invalid message. - */ - @Test - public void testGetStorkErrorMessageNoExists() { - assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE), - ERROR_MESSAGE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given empty message. - */ - @Test - public void testGetStorkErrorMessageEmpty() { - assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING), - EMPTY_STRING); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given null message. - */ - @Test - public void testGetStorkErrorMessageNull() { - assertNull(PEPSUtil.getStorkErrorMessage(null)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given invalid message. - */ - @Test - public void testGetStorkErrorMessageWithSepFake() { - assertEquals(PEPSUtil.getStorkErrorMessage("-"),"-"); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given invalid message. - */ - @Test - public void testGetStorkErrorMessageWithSepAndCodeFake() { - assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"),"000001 -"); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base deleted file mode 100644 index 7052b320a..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base +++ /dev/null @@ -1,747 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.PersonalAttributeList; -import eu.stork.peps.auth.commons.STORKStatusCode; - -/** - * The PersonalAttributeList's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.5 $, $Date: 2010-11-17 05:17:02 $ - */ -public final class PersonalAttributeListTestCase { - - /** - * isAgeOver constant value. - */ - private static final String ISAGEOVER_CONS = "isAgeOver"; - - /** - * 1 constant value. - */ - private static final int ONE_CONS = 1; - - /** - * 2 constant value. - */ - private static final int TWO_CONS = 2; - - /** - * An empty attribute. - */ - @SuppressWarnings("unused") - private static final PersonalAttributeList EMPTY_ATTR_LIST = - new PersonalAttributeList(0); - - /** - * An attribute with a complex value (canonicalResidenceAddress). - */ - private static PersonalAttribute complexAttrValue = null; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST = - "isAgeOver:true:[15,]:Available;"; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST2 = - "isAgeOver:true:[18,]:Available;"; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST3 = - "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;"; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST3_REVERSE = - "isAgeOver:true:[18,]:Available;isAgeOver:true:[15,]:Available;"; - /** - * Simple attribute value list string. - */ - private static final String COMPLEX_ATTRLIST = - "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B," - + "state=Porto,countryCodeAddress=PT,streetNumber=379," - + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;"; - /** - * Mix attribute list string. - */ - private static final String STR_MIX_ATTR_LIST = - "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" - + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT," - + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:" - + "Available;"; - - /** - * Mix attribute list 2 string. - */ - private static final String STR_MIX_ATTR_LIST2 = - "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" - + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT," - + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:Available;" - + "mandateContent:true:[" - + "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:" - + "Available;"; - - /** - * Attribute List example. - */ - @SuppressWarnings({ "serial" }) - private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute( - "age", true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - /** - * Init PersonalAttributeListTestCase class. - */ - @SuppressWarnings("serial") - @BeforeClass - public static void runsBeforeTheTestSuite() { - final Map values = new HashMap() { - { - put("countryCodeAddress", "PT"); - put("state", "Porto"); - put("town", "Porto"); - put("postalCode", "4100"); - put("streetName", "Avenida Sidonio Pais"); - put("streetNumber", "379"); - put("apartmentNumber", "Ed. B"); - } - }; - - complexAttrValue = - new PersonalAttribute("canonicalResidenceAddress", true, values, - STORKStatusCode.STATUS_AVAILABLE.toString()); - - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 1 - Simple attribute. - */ - @Test - public void testAddSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(ATTR_VALUE); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 1 - Complex attribute. - */ - @Test - public void testAddCompleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(complexAttrValue); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 0 - no attribute. - */ - @Test - public void testAddNull() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(null); - Assert.assertTrue(attrList.size() == 0); - } - - /** - * Testing Personal Attribute List add method. Same attribute name added - * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added - * twice. - */ - @SuppressWarnings("serial") - @Test - public void testAddSameAttrName() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List add method. Same attribute name added - * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added - * twice. - */ - @SuppressWarnings("serial") - @Test - public void testAddSameAttrNameEmpty() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add(""); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 1 - Simple Value. - */ - @Test - public void testPutSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(ATTR_VALUE.getName(), ATTR_VALUE); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 1 - Complex Value. - */ - @Test - public void testPutComplexAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(ATTR_VALUE.getName(), complexAttrValue); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 0 - no attribute. - */ - @Test - public void testPutNull() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put("", null); - Assert.assertTrue(attrList.size() == 0); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 2 - IsAgeOver attribute added twice. - */ - @SuppressWarnings("serial") - @Test - public void testPutSameAttrName() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 2 - IsAgeOver attribute added twice. - */ - @SuppressWarnings("serial") - @Test - public void testPutSameAttrNameEmpty() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add(""); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List get method. Personal Attribute list must be - * size 1 - Simple attribute. - */ - @Test - public void testGetSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(ATTR_VALUE); - Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName())); - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 1 - Complex attribute. - */ - @Test - public void testGetCompleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(complexAttrValue); - Assert.assertEquals(complexAttrValue.toString(), - attrList.get(complexAttrValue.getName()).toString()); - } - - /** - * Testing Personal Attribute List get method. Personal Attribute list must be - * size 2 - IsAgeOver attribute. - */ - @SuppressWarnings("serial") - @Test - public void testGetIsAgeOverAttr() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertEquals(SIMPLE_ATTRLIST, - attrList.get(attrValueUnder.getName()).toString()); - Assert.assertEquals(SIMPLE_ATTRLIST2, - attrList.get(attrValueOver.getName()).toString()); - } - - /** - * Testing Personal Attribute List populate method. Personal Attribute list - * must be size 1 - Simple attribute. - */ - @Test - public void testPopulateSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(SIMPLE_ATTRLIST); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List populate method. Personal Attribute list - * must be size 1 - Complex attribute. - */ - @Test - public void testPopulateComplexAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(COMPLEX_ATTRLIST); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List populate method. Personal Attribute list - * must be size 1 - Simple and Complex attribute. - */ - @Test - public void testPopulateMixAttrs() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(STR_MIX_ATTR_LIST); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List toString method using add. - */ - @SuppressWarnings("serial") - @Test - public void testToStringFromAdd() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString()); - } - - /** - * Testing Personal Attribute List toString method using put. - * - */ - @SuppressWarnings("serial") - @Test - public void testToStringFromPut() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString()); - } - - /** - * Testing Personal Attribute List toString method using populate. - */ - @Test - public void testToStringFromSimplePopulate() { - final String strAttrList = "isAgeOver:true"; - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(strAttrList); - Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString()); - } - - /** - * Testing Personal Attribute List toString method using populate. - */ - @Test - public void testToStringFromPopulate() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(SIMPLE_ATTRLIST3); - Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString()); - } - - /** - * Testing Personal Attribute List populate method, with invalid values. - */ - @Test - public void testPopulateWithInvalidValuesFormat() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate("name:type:values:status;"); - Assert.assertEquals(pal, new PersonalAttributeList()); - } - - /** - * Testing Personal Attribute List populate method, with invalid format. - */ - @Test - public void testPopulateWithInvalidFormat() { - - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate("name:type::status;"); - Assert.assertEquals(pal, new PersonalAttributeList()); - } - - /** - * Testing Personal Attribute List clone method using add. - */ - @SuppressWarnings("serial") - @Test - public void testCloneFromAdd() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertNotSame(attrList, attrList.clone()); - } - - /** - * Testing Personal Attribute List clone method using put. - */ - @SuppressWarnings("serial") - @Test - public void testCloneFromPut() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertNotSame(attrList, attrList.clone()); - } - - /** - * Testing Personal Attribute List clone method using populate. - */ - @Test - public void testCloneFromPopulate() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(SIMPLE_ATTRLIST3); - Assert.assertNotSame(pal, pal.clone()); - } - - /** - * Testing Personal Attribute List iterator. - */ - @Test - public void testIterator() { - final String strAttrList = - "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - final Iterator itAttr = pal.iterator(); - while (itAttr.hasNext()) { - final PersonalAttribute attr = itAttr.next(); - Assert.assertEquals(ISAGEOVER_CONS, attr.getName()); - } - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method with empty attribute list. - */ - @Test - public void testGetOptionalAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getOptionalAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method without optional attributes. - */ - @Test - public void testGetOptionalAttributesWithoutOptional() { - final String strAttrList = - "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getOptionalAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method with one optional attribute. - */ - @Test - public void testGetOptionalAttributesWithOneOptional() { - final String strAttrList = - "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method with two optional attribute. - */ - @Test - public void testGetOptionalAttributesWithOnlyOptional() { - final String strAttrList = - "age:false:[]:;isAgeOver:false:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS); - } - - /** - * Testing Personal Attribute List's getMandatoryAttributes method with empty attribute list. - */ - @Test - public void testGetMandatoryAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getMandatoryAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getMandatoryAttributes method without mandatory attributes. - */ - @Test - public void testGetMandatoryAttributesWithoutMandatory() { - final String strAttrList = - "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getMandatoryAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with one mandatory attribute. - */ - @Test - public void testGetMandatoryAttributesWithOneMandatory() { - final String strAttrList = - "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with two mandatory attribute. - */ - @Test - public void testGetMandatoryAttributesWithOnlyMandatory() { - final String strAttrList = - "age:true:[]:;isAgeOver:true:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS); - } - - /** - * Testing Personal Attribute List's getSimpleValueAttributes method with empty attribute list. - */ - @Test - public void testGetSimpleValueAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getSimpleValueAttributes() method without simple attributes. - */ - @Test - public void testGetSimpleValueAttributesWithoutSimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(COMPLEX_ATTRLIST); - Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getSimpleValueAttributes() method with one simple attribute. - */ - @Test - public void testGetSimpleValueAttributesWithOneSimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(STR_MIX_ATTR_LIST); - Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with two simple attribute. - */ - @Test - public void testGetSimpleValueAttributesWithOnlySimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(SIMPLE_ATTRLIST3); - Assert.assertTrue(pal.getSimpleValueAttributes().size() == TWO_CONS); - } - - /** - * Testing Personal Attribute List's getComplexValueAttributes method with empty attribute list. - */ - @Test - public void testGetComplexAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getComplexAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getComplexAttributes() method without complex attributes. - */ - @Test - public void testGetComplexAttributesWithoutSimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(SIMPLE_ATTRLIST2); - Assert.assertTrue(pal.getComplexAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getComplexAttributes() method with one complex attribute. - */ - @Test - public void testGetComplexAttributesWithOneComplex() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(STR_MIX_ATTR_LIST); - Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with only two Complex attribute. - */ - @Test - public void testGetComplexAttributesWithOnlyComplex() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(STR_MIX_ATTR_LIST2); - Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS); - } - -} diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base deleted file mode 100644 index 458d510e0..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base +++ /dev/null @@ -1,182 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import junit.framework.Assert; - -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.STORKStatusCode; - -/** - * The PersonalAttribute's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.4 $, $Date: 2010-11-17 05:17:03 $ - */ -public final class PersonalAttributeTestCase { - - /** - * An empty attribute. - */ - private static final PersonalAttribute EMPTYATTR = new PersonalAttribute(); - - /** - * An attribute with a complex value (canonicalResidenceAddress). - */ - private static PersonalAttribute complexAttrValue = null; - - /** - * An attribute with a simple value (age). - */ - @SuppressWarnings("serial") - private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute( - "age", true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - /** - * Init PersonalAttributeTestCase class. - */ - @SuppressWarnings("serial") - @BeforeClass - public static void runsBeforeTheTestSuite() { - final Map values = new HashMap() { - { - put("countryCodeAddress", "PT"); - put("state", "Porto"); - put("town", "Porto"); - put("postalCode", "4100"); - put("streetName", "Avenida Sidonio Pais"); - put("streetNumber", "379"); - put("apartmentNumber", "B"); - } - }; - - complexAttrValue = - new PersonalAttribute("canonicalResidenceAddress", true, values, - STORKStatusCode.STATUS_AVAILABLE.toString()); - - } - - /** - * Tests the {@link PersonalAttribute#toString()} method for the given simple - * attribute value. Values must match. - */ - @Test - public void testToStringValues() { - Assert.assertEquals("age:true:[15,]:Available;", ATTR_VALUE.toString()); - } - - /** - * Tests the {@link PersonalAttribute#toString()} method for the given complex - * attribute value. Values must match. - */ - @Test - public void testToStringComplexValues() { - Assert.assertEquals( - "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=B," - + "state=Porto,countryCodeAddress=PT,streetNumber=379," - + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;", - complexAttrValue.toString()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given - * empty attribute. Must return true. - */ - @Test - public void testToIsEmptyStatusWithNull() { - Assert.assertTrue(EMPTYATTR.isEmptyStatus()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given - * new attribute. Must return true. - */ - @Test - public void testToIsEmptyStatusWithEmptyString() { - final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone(); - attr.setStatus(""); - Assert.assertTrue(attr.isEmptyStatus()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given - * empty attribute. Must return true. - */ - @Test - public void testToIsEmptyValueWithNull() { - final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone(); - attr.setValue(null); - Assert.assertTrue(attr.isEmptyValue()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given - * empty attribute. Must return true. - */ - @Test - public void testToIsEmptyValue() { - Assert.assertTrue(EMPTYATTR.isEmptyValue()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the - * given empty attribute. Must return true. - */ - @Test - public void testToIsEmptyComplexValueWithNull() { - final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone(); - attr.setComplexValue(null); - Assert.assertTrue(attr.isEmptyComplexValue()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the - * given empty attribute. Must return true. - */ - @Test - public void testToIsEmptyComplexValueWithEmptyComplexValue() { - Assert.assertTrue(EMPTYATTR.isEmptyComplexValue()); - } - - /** - * Tests the {@link PersonalAttribute#clone()} method for the given attribute. - * Must return true. - */ - @Test - public void testCloneToComplexValue() { - Assert.assertNotSame(complexAttrValue, complexAttrValue.clone()); - } - - /** - * Tests the {@link PersonalAttribute#clone()} method for the given attribute. - * Must return true. - */ - @Test - public void testCloneToValue() { - Assert.assertNotSame(ATTR_VALUE, ATTR_VALUE.clone()); - } -} diff --git a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base b/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index 270311128..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package provides all JUnit test classes. - */ -package eu.stork.peps.tests; - diff --git a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/all-wcprops deleted file mode 100644 index a3a21b424..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 63 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/resources -END -log4j.xml -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/resources/log4j.xml -END diff --git a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries b/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries deleted file mode 100644 index e6b7f5399..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -665 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/resources -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -log4j.xml -file - - - - -2013-12-20T12:27:56.542475Z -4e990a84da0033594135b05cd01a9cdd -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -645 - diff --git a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base b/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base deleted file mode 100644 index 0ad2ea9a4..000000000 --- a/id/server/legacy-backup/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 2ca351e81..834a19d03 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -146,8 +146,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.7 + 1.7 @@ -195,8 +195,8 @@ maven-compiler-plugin 2.0.2 - 1.5 - 1.5 + 1.7 + 1.7 diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index 2b74266f2..27a722432 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -76,8 +76,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/id/server/stork2-commons/.svn/all-wcprops b/id/server/stork2-commons/.svn/all-wcprops deleted file mode 100644 index 013d868be..000000000 --- a/id/server/stork2-commons/.svn/all-wcprops +++ /dev/null @@ -1,17 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 45 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons -END -pom.xml -K 25 -svn:wc:ra_dav:version-url -V 53 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/pom.xml -END -Releases -K 25 -svn:wc:ra_dav:version-url -V 54 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/Releases -END diff --git a/id/server/stork2-commons/.svn/dir-prop-base b/id/server/stork2-commons/.svn/dir-prop-base deleted file mode 100644 index 9dc541cfd..000000000 --- a/id/server/stork2-commons/.svn/dir-prop-base +++ /dev/null @@ -1,10 +0,0 @@ -K 10 -svn:ignore -V 44 -.classpath -.project -.settings -report -target - -END diff --git a/id/server/stork2-commons/.svn/entries b/id/server/stork2-commons/.svn/entries deleted file mode 100644 index 6956e0c9c..000000000 --- a/id/server/stork2-commons/.svn/entries +++ /dev/null @@ -1,99 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja -has-props - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -Releases -file - - - - -2014-03-05T09:36:08.094515Z -5013e8d011c7d67a3faac86ae0ec7aae -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2653 - -src -dir - -pom.xml -file - - - - -2014-03-05T09:36:08.086515Z -c245a61144c036e0dc82e0adfed566aa -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -5777 - diff --git a/id/server/stork2-commons/.svn/text-base/Releases.svn-base b/id/server/stork2-commons/.svn/text-base/Releases.svn-base deleted file mode 100644 index 6550affd0..000000000 --- a/id/server/stork2-commons/.svn/text-base/Releases.svn-base +++ /dev/null @@ -1,73 +0,0 @@ -Created 06-04-2011 - -Branch : STORKCommons_0_5_UPDATE_06042011 -Date : 06-04-2011 -Changes: No changes. - -Branch : STORKCommons_0_5_UPDATE_07072011 -Date : 07-07-2011 -Changes: Inserted constants to HttpOnly HTTP Header. - -Branch : STORKCommons_0_6 -Date : 07-11-2011 -Changes: Improved error exception handling (few changes on the exception classes). - Improved Constansts (unused removed, others added). - Unit Tests include (almost all the code is cover). - Fix some minor bugs found on unit tests. - New Copyright License added. - PEPUtils refactored. - Improved error code message (three kind of messages: to citizen, admin and saml token). - -Branch : STORKCommons_0_6_1 -Date : 28-11-2011 -Changes: Removed unnecessary javadoc package file. - Updated pepsUtils.properties file (check attribute value had old error message) - -Branch : STORKCommons_0_9 -Date : 02-12-2011 -Changes: Updated Version to 0.9 - -Branch : STORKCommons_1_0 -Date : 02-12-2011 -Changes: Updated Version to 1.0 - -Branch : STORKCommons_1_1_0 -Date : 01-11-2013 -Changes: Updated Version to 1.1.0 - Dependencies updated - Business Logic Part I changes - SAML Engine Changes merged (from SamlEngine/1.1.0/Commons branch to be easier to merge this branch with trunk) - Fixed some errors on Test Case - -Branch : STORKCommons_1_1_1 -Date : 02-12-2013 -Changes: Updated Version to 1.1.1 - Added mandate error code - PMD quality code changes (some final identifier missing) - Added new methods to personal attribute list to get Mandatory/Optional and/or Simple/Complex attributes - Added new unit tests - -Branch : Commons_1_1_2 -Date : 13-12-2013 -Changes: Updated Version to 1.1.2 - Added request flow of PV (incomplete) - Added AP mandatory attribute to get data for business attributes - *) based on configuration file it adds the missing attributes (eIdentifier, givenName, surname and dateOfBirth) or change isRequired to true. - changes original isRequired state in response - Added new Interface (IAttributeListProcessor) to make some operations on attribute lists - -Branch : Commons_1_1_3 -Date : 21-12-2013 -Changes: Updated Version to 1.1.3 - Power Validation is complete now - Business Logic I and II integration (Request Complete!) - -Branch : Commons_1_1_4 -Date : 08-01-2014 -Changes: Updated Version to 1.1.4 - Added new method to Personal attribute List to check if there is at least one attribute with no value. - -Branch : Commons_1_4_0 -Date : 28-02-2014 -Changes: Updated Version to 1.4.0 - Removed AUB \ No newline at end of file diff --git a/id/server/stork2-commons/.svn/text-base/pom.xml.svn-base b/id/server/stork2-commons/.svn/text-base/pom.xml.svn-base deleted file mode 100644 index 04b35f5f5..000000000 --- a/id/server/stork2-commons/.svn/text-base/pom.xml.svn-base +++ /dev/null @@ -1,213 +0,0 @@ - - 4.0.0 - eu.stork - Commons - jar - Stork Commons - - UTF-8 - 1.4.0 - 2.6.0 - - ${stork.version} - - The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine. - - - - - - - joda-time - joda-time - 2.3 - - - - - log4j - log4j - 1.2.17 - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - mail - javax.mail - - - - - - org.opensaml - opensaml - ${opensaml.version} - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - org.slf4j - jcl-over-slf4j - - - org.slf4j - log4j-over-slf4j - - - org.slf4j - jul-to-slf4j - - - - - - - org.bouncycastle - bcprov-jdk16 - 1.46 - - - - - - javax.servlet - servlet-api - 2.5 - provided - - - - commons-lang - commons-lang - 2.6 - jar - compile - - - junit - junit - 4.11 - test - - - - - commons - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-surefire-plugin - - reversealphabetical - false - - reversealphabetical - **/PEPSUtilTest.java - **/PersonalAttributeTestCase.java - **/PersonalAttributeListTestCase.java - **/DateUtilTestCase.java - **/AttributeUtilTest.java - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - http://commons.apache.org/lang/api/ - http://java.sun.com/j2se/1.6.0/docs/api/ - http://www.bouncycastle.org/docs/docs1.6/ - http://docs.oracle.com/javase/6/docs/api/ - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - verify - - jar-no-fork - - - - - - - - src/test/resources - - log4j.xml - - - - - - - embedded - - - - ${project.basedir}/src/main/resources - - - ${project.basedir}/src/main/config/embedded - - - - - - metrics - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.1 - - - html - xml - - - - - - - - diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 555d6cec7..44ab8ddaf 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -129,8 +129,8 @@ maven-compiler-plugin 3.1 - 1.6 - 1.6 + 1.7 + 1.7 @@ -180,9 +180,8 @@ http://commons.apache.org/lang/api/ - http://java.sun.com/j2se/1.6.0/docs/api/ http://www.bouncycastle.org/docs/docs1.6/ - http://docs.oracle.com/javase/6/docs/api/ + http://docs.oracle.com/javase/7/docs/api/ diff --git a/id/server/stork2-commons/src/.svn/all-wcprops b/id/server/stork2-commons/src/.svn/all-wcprops deleted file mode 100644 index b2a57db4c..000000000 --- a/id/server/stork2-commons/src/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 49 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src -END diff --git a/id/server/stork2-commons/src/.svn/entries b/id/server/stork2-commons/src/.svn/entries deleted file mode 100644 index 35f74102a..000000000 --- a/id/server/stork2-commons/src/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -test -dir - -main -dir - diff --git a/id/server/stork2-commons/src/main/.svn/all-wcprops b/id/server/stork2-commons/src/main/.svn/all-wcprops deleted file mode 100644 index ca1ee03bd..000000000 --- a/id/server/stork2-commons/src/main/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 54 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main -END diff --git a/id/server/stork2-commons/src/main/.svn/entries b/id/server/stork2-commons/src/main/.svn/entries deleted file mode 100644 index 76ff91c7b..000000000 --- a/id/server/stork2-commons/src/main/.svn/entries +++ /dev/null @@ -1,37 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -resources -dir - -java -dir - -config -dir - diff --git a/id/server/stork2-commons/src/main/config/.svn/all-wcprops b/id/server/stork2-commons/src/main/config/.svn/all-wcprops deleted file mode 100644 index e39a1da21..000000000 --- a/id/server/stork2-commons/src/main/config/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 61 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/config -END diff --git a/id/server/stork2-commons/src/main/config/.svn/entries b/id/server/stork2-commons/src/main/config/.svn/entries deleted file mode 100644 index 9a3950062..000000000 --- a/id/server/stork2-commons/src/main/config/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/config -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -embedded -dir - diff --git a/id/server/stork2-commons/src/main/config/embedded/.svn/all-wcprops b/id/server/stork2-commons/src/main/config/embedded/.svn/all-wcprops deleted file mode 100644 index 61c832a4b..000000000 --- a/id/server/stork2-commons/src/main/config/embedded/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 70 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/config/embedded -END -pepsUtil.properties -K 25 -svn:wc:ra_dav:version-url -V 90 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/config/embedded/pepsUtil.properties -END diff --git a/id/server/stork2-commons/src/main/config/embedded/.svn/entries b/id/server/stork2-commons/src/main/config/embedded/.svn/entries deleted file mode 100644 index 3dcc1bccf..000000000 --- a/id/server/stork2-commons/src/main/config/embedded/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/config/embedded -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -pepsUtil.properties -file - - - - -2014-03-05T09:36:08.010515Z -2d984e7eb1a7f6c6ba7048f46b85920b -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -7885 - diff --git a/id/server/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base b/id/server/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base deleted file mode 100644 index ae811dda7..000000000 --- a/id/server/stork2-commons/src/main/config/embedded/.svn/text-base/pepsUtil.properties.svn-base +++ /dev/null @@ -1,269 +0,0 @@ -#Max allowed params size -validation.active=true -max.spUrl.size=150 -max.attrList.size=20000 -max.invalidAttributeList.size=20000 -max.attrName.size=100 -max.callback.size=300 -max.idp.url.size=300 -max.atp.url.size=300 -max.cpepsURL.size=300 -max.attrValue.size=20000 -max.attrType.size=25 -max.spId.size=40 -max.providerName.size=128 -max.spName.size=25 -max.country.size=150 -max.qaaLevel.size=1 -max.spQaaLevel.size=1 -max.errorCode.size=5 -max.errorMessage.size=300 -max.username.size=30 -max.spepsRedirectUrl.size=300 -max.speps.redirectUrl.size=300 -max.cpeps.redirectUrl.size=300 -max.cpepsRedirectUrl.size=300 -max.spepsAssertionUrl.size=300 -max.SAMLRequest.size=131072 -max.SAMLResponse.size=131072 -max.RelayState.size=80 -max.remoteAddr.size=300 -max.remoteHost.size=300 -max.localAddr.size=300 -max.localName.size=300 -max.apepsUrl.size=300 -max.apeps.callbackUrl.size=300 - -dtl.url=http://localhost:8080/DocumentService/DocumentService - -#ERROR codes/messages (accordingly to specification) - -#CountrySelector Interface errors -spCountrySelector.invalidSPQAA.code=0000001 -spCountrySelector.invalidSPQAA.message=invalid.spQAA.parameter - -spCountrySelector.invalidQaaSPid.code=0000001 -spCountrySelector.invalidQaaSPid.message=invalid.spQAAId.parameter - -spCountrySelector.invalidSpId.code=000002 -spCountrySelector.invalidSpId.message=invalid.spId.parameter - -spCountrySelector.invalidSpURL.code=000003 -spCountrySelector.invalidSpURL.message=invalid.spUrl.parameter - -domain.CountrySelectorAction.code=000003 -domain.CountrySelectorAction.message=invalid.cs.domain - -requests.CountrySelectorAction.code=000004 -requests.CountrySelectorAction.message=reached.max.requests.cs - -spCountrySelector.spNotAllowed.code=000006 -spCountrySelector.spNotAllowed.message=attr.access.deny - -spCountrySelector.invalidAttr.code=000007 -spCountrySelector.invalidAttr.message=invalid.spAttr.parameter - -spCountrySelector.invalidProviderName.code=000008 -spCountrySelector.invalidProviderName.message=invalid.spProvidername.parameter - -spCountrySelector.errorCreatingSAML.code=203001 -spCountrySelector.errorCreatingSAML.message=error.create.sp.saml - -spepsSAMLRequest.code=203001 -spepsSAMLRequest.message=error.create.saml.speps - -#ServiceProvider Interface errors -sProviderAction.invalidSPQAA.code=200001 -sProviderAction.invalidSPQAA.message=invalid.sp.qaa - -sProviderAction.invalidSPQAAId.code=200001 -sProviderAction.invalidSPQAAId.message=invalid.sp.qaaid - -sProviderAction.invalidSPId.code=200002 -sProviderAction.invalidSPId.message=invalid.sp.id - -domain.ServiceProviderAction.code=200003 -domain.ServiceProviderAction.message=invalid.sp.domain - -sProviderAction.invalidSPDomain.code=200003 -sProviderAction.invalidSPDomain.message=invalid.sp.domain - -sProviderAction.invalidCountry.code=200004 -sProviderAction.invalidCountry.message=invalid.sp.country - -sProviderAction.spNotAllowed.code=200005 -sProviderAction.spNotAllowed.message=sp.not.allowed - -sProviderAction.invalidSaml.code=200006 -sProviderAction.invalidSaml.message=invalid.sp.samlrequest - -sProviderAction.invalidSPProviderName.code=200007 -sProviderAction.invalidSPProviderName.message=sp.not.identified - -sProviderAction.invalidSPRedirect.code=200008 -sProviderAction.invalidSPRedirect.message=invalid.sp.redirectUrl - -sProviderAction.invalidRelayState.code=200009 -sProviderAction.invalidRelayState.message=invalid.sp.relaystate - -sProviderAction.invalidAttr.code=200011 -sProviderAction.invalidAttr.message=invalid.sp.attr - -requests.ServiceProviderAction.code=200012 -requests.ServiceProviderAction.message=reached.max.requests.sp - -sPPowerValidationAction.invalidSPPVAttrList.code=200013 -sPPowerValidationAction.invalidSPPVAttrList.message=invalid.sp.pv.attrlist - -invalid.sp.pv.attrlist.code=200013 -invalid.sp.pv.attrlist.message=invalid.sp.pv.attrlist - -sProviderAction.invalidSPAlias.code=203003 -sProviderAction.invalidSPAlias.message=invalid.sp.alias - -sProviderAction.errorCreatingSAML.code=203001 -sProviderAction.errorCreatingSAML.message=error.create.saml.speps - -#Internal Error -internalError.code=203001 -internalError.message=internalError - -attrList.code=202005 -attrList.message=invalid.attrList.parameter - -missing.sessionId.code=203010 -missing.sessionId.message=missing.session.id - -sessionError.code=203011 -sessionError.message=invalid.session.id - -invalid.sessionId.code=203011 -invalid.sessionId.message=invalid.session.id - -missing.mandate.code=203013 -missing.mandate.message=missing.mandate - -invalid.session.code=203012 -invalid.session.message=invalid.session - -callback.code=203006 -callback.message=invalid.callback.url - -idp.url.code=203006 -idp.url.message=invalid.idp.url - -IdPSAMLResponse.code=002001 -IdPSAMLResponse.message=invalid.idp.response - -authenticationFailed.code=003002 -authenticationFailed.message=authentication.failed - -username.code=003002 -username.message=authentication.failed - -invalidAttributeList.code=203001 -invalidAttributeList.message=invalid.attrlist - -invalidAttributeValue.code=203001 -invalidAttributeValue.message=invalid.attr.value - -attVerification.mandatory.code=202010 -attVerification.mandatory.message=missing.mandatory.attr - -attrValue.verification.code=203008 -attrValue.verification.message=invalid.stork.attrValue - -cpepsSAMLResponse.code=202012 -cpepsSAMLResponse.message=error.gen.cpeps.saml - -AtPSAMLResponse.code=202009 -AtPSAMLResponse.message=error.gen.atp.saml - -atp.url.code=203006 -atp.url.message=invalid.atp.url - -hash.error.code=203001 -hash.error.message=error.hash - -qaaLevel.code=203006 -qaaLevel.message=invalid.cpeps.qaalevel - -SAMLRequest.code=203001 -SAMLRequest.message=invalid.SAMLRequest - -atp.response.error.code=202011 -atp.response.error.message=atp.response.error - -#Colleague Request Interface errors - -colleagueRequest.invalidSAML.code=201002 -colleagueRequest.invalidSAML.message=invalid.speps.samlrequest - -colleagueRequest.invalidCountryCode.code=002001 -colleagueRequest.invalidCountryCode.message=country.cpeps.nomatch - -colleagueRequest.errorCreatingSAML.code=203001 -colleagueRequest.errorCreatingSAML.message=error.create.saml.cpeps - -colleagueRequest.invalidQaa.code=202004 -colleagueRequest.invalidQaa.message=invalid.requested.cpeps.qaalevel - -colleagueRequest.attrNull.code=202005 -colleagueRequest.attrNull.message=invalid.requested.attrlist.cpeps - -colleaguePVRequest.invalidPVAttrList.code=202013 -colleaguePVRequest.invalidPVAttrList.message=invalid.speps.pv.attrlist - -colleagueRequest.invalidRedirect.code=202001 -colleagueRequest.invalidRedirect.message=invalid.redirecturl.cpeps - -colleagueRequest.invalidDestUrl.code=203006 -colleagueRequest.invalidDestUrl.message=invalid.cpeps.destUrl - -cpepsRedirectUrl.code=203006 -cpepsRedirectUrl.message=invalid.cpeps.redirectUrl - -#Citizen Consent Interfaces errors - -citizenResponse.mandatory.code=202007 -citizenResponse.mandatory.message=no.consent.mand.attr - -cPeps.attrNull.code=202005 -cPeps.attrNull.message=invalid.attrList.cpeps - -citizenNoConsent.mandatory.code=202012 -citizenNoConsent.mandatory.message=no.consent.val.mand.attr - -#Colleague Response Interface errors - -colleagueResponse.invalidSAML.code=202002 -colleagueResponse.invalidSAML.message=invalid.cpeps.samlresp - -auRequestIdError.code=201005 -auRequestIdError.message=invalid.speps.saml.id - -audienceRestrictionError.code=201004 -audienceRestrictionError.message=speps.saml.condition.notmet - -spepsSAMLResponse.code=200010 -spepsSAMLResponse.message=error.gen.speps.saml - - -invalid.apepsRedirectUrl.code=001001 -invalid.apepsRedirectUrl.message=invalid.apeps.redirectUrl - -apepsSAMLRequest.code=001002 -apepsSAMLRequest.message=invalid.apeps.saml.request - -apepsSAMLResponse.code=001003 -apepsSAMLResponse.message=invalid.apeps.saml.response - -invalid.apepsCallbackUrl.code=001004 -invalid.apepsCallbackUrl.message=invalid.apeps.callback.url - -colleagueAttributeRequest.invalidSAML.code=001005 -colleagueAttributeRequest.invalidSAML.message=invalid.attr.request.saml - - -#Hash Digests -hashDigest.className=org.bouncycastle.crypto.digests.SHA512Digest diff --git a/id/server/stork2-commons/src/main/java/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/.svn/all-wcprops deleted file mode 100644 index ca59ad1e3..000000000 --- a/id/server/stork2-commons/src/main/java/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 59 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java -END diff --git a/id/server/stork2-commons/src/main/java/.svn/entries b/id/server/stork2-commons/src/main/java/.svn/entries deleted file mode 100644 index ff9dfce64..000000000 --- a/id/server/stork2-commons/src/main/java/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -eu -dir - diff --git a/id/server/stork2-commons/src/main/java/eu/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/.svn/all-wcprops deleted file mode 100644 index 30e4698c0..000000000 --- a/id/server/stork2-commons/src/main/java/eu/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 62 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu -END diff --git a/id/server/stork2-commons/src/main/java/eu/.svn/entries b/id/server/stork2-commons/src/main/java/eu/.svn/entries deleted file mode 100644 index 4c0ceff03..000000000 --- a/id/server/stork2-commons/src/main/java/eu/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -stork -dir - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops deleted file mode 100644 index 8e248afa5..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 68 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/.svn/entries deleted file mode 100644 index ff2fa64d7..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -peps -dir - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops deleted file mode 100644 index da872cf08..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/entries deleted file mode 100644 index f0c47a6d2..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -auth -dir - -complex -dir - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops deleted file mode 100644 index 78e9d344c..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 78 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/java/eu/stork/peps/auth -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries deleted file mode 100644 index 253bfd218..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -specific -dir - -commons -dir - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops deleted file mode 100644 index edb1120b5..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/all-wcprops +++ /dev/null @@ -1,191 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 86 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/java/eu/stork/peps/auth/commons -END -AttributeSource.java -K 25 -svn:wc:ra_dav:version-url -V 107 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/package-info.java -END -PEPSValues.java -K 25 -svn:wc:ra_dav:version-url -V 102 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java -END -STORKAttrQueryRequest.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java -END -CitizenConsent.java -K 25 -svn:wc:ra_dav:version-url -V 106 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java -END -AttributeProvidersMap.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java -END -STORKAttrQueryResponse.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java -END -PersonalAttributeList.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java -END -AttributeName.java -K 25 -svn:wc:ra_dav:version-url -V 105 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java -END -PEPSUtil.java -K 25 -svn:wc:ra_dav:version-url -V 100 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java -END -PersonalAttribute.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java -END -IAttributeListProcessor.java -K 25 -svn:wc:ra_dav:version-url -V 115 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java -END -STORKAuthnRequest.java -K 25 -svn:wc:ra_dav:version-url -V 108 -/CITnet/svn/STORK2/!svn/ver/56/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java -END -STORKLogoutResponse.java -K 25 -svn:wc:ra_dav:version-url -V 111 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java -END -IStorkLogger.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java -END -DateUtil.java -K 25 -svn:wc:ra_dav:version-url -V 99 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java -END -AttributeProvider.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java -END -IStorkSession.java -K 25 -svn:wc:ra_dav:version-url -V 104 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java -END -Linker.java -K 25 -svn:wc:ra_dav:version-url -V 98 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/Linker.java -END -PEPSParameters.java -K 25 -svn:wc:ra_dav:version-url -V 106 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java -END -AttributeConstants.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java -END -STORKStatusCode.java -K 25 -svn:wc:ra_dav:version-url -V 106 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java -END -AttributeUtil.java -K 25 -svn:wc:ra_dav:version-url -V 105 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java -END -Country.java -K 25 -svn:wc:ra_dav:version-url -V 98 -/CITnet/svn/STORK2/!svn/ver/96/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/Country.java -END -PEPSErrors.java -K 25 -svn:wc:ra_dav:version-url -V 102 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java -END -STORKLogoutRequest.java -K 25 -svn:wc:ra_dav:version-url -V 110 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java -END -IAttributeProvidersMap.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/31/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java -END -STORKSubStatusCode.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java -END -IPersonalAttributeList.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java -END -CountryCodes.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java -END -STORKAuthnResponse.java -K 25 -svn:wc:ra_dav:version-url -V 110 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries deleted file mode 100644 index 0b8070876..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/entries +++ /dev/null @@ -1,1085 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth/commons -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -AttributeConstants.java -file - - - - -2013-12-20T12:27:56.638475Z -940dcb9e93ede62e221f4b25abd6576b -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1831 - -STORKStatusCode.java -file - - - - -2013-12-20T12:27:56.638475Z -771689c75a8263c7e3966e820d59025e -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1906 - -AttributeUtil.java -file - - - - -2014-01-21T08:38:55.336702Z -2859d3335dfe719ca04258fae54e69a3 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -7927 - -exceptions -dir - -Country.java -file - - - - -2013-12-20T12:27:56.638475Z -9cbde5f25b646d02dae7ccf424906b4a -2013-11-01T20:35:30.927048Z -96 -emferreri - - - - - - - - - - - - - - - - - - - - - -2208 - -PEPSErrors.java -file - - - - -2014-01-21T08:38:55.336702Z -bfe69afce772675187fdd637453ed12f -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -12165 - -STORKLogoutRequest.java -file - - - - -2014-01-21T08:38:55.336702Z -af445a2013f21ffecd3db7773ae3236e -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4343 - -IAttributeProvidersMap.java -file - - - - -2013-12-20T12:27:56.634475Z -225257e8d6d7b9e6bcc4bea2463c33be -2013-10-10T17:38:31.956327Z -31 -emlelisst - - - - - - - - - - - - - - - - - - - - - -2534 - -STORKSubStatusCode.java -file - - - - -2013-12-20T12:27:56.634475Z -65e615e0119d4125d5f4f58af8bcd18b -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2181 - -IPersonalAttributeList.java -file - - - - -2014-01-21T08:38:55.336702Z -b441a2c6c3eddcf1043c55e55f48faa6 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -6598 - -STORKAuthnResponse.java -file - - - - -2014-01-21T08:38:55.336702Z -f2247f9a89e8ad01f9a24ad716f993ca -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8724 - -CountryCodes.java -file - - - - -2013-12-20T12:27:56.638475Z -f91b0f8df0b2a68fe1b900d425257c23 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3527 - -package-info.java -file - - - - -2013-12-20T12:27:56.638475Z -8d8068e217f10425f76a8d37192ccd80 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -277 - -AttributeSource.java -file - - - - -2014-01-21T08:38:55.336702Z -a0555599193656bc17e02c3ce23043be -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4501 - -PEPSValues.java -file - - - - -2014-03-05T09:36:07.946515Z -4a94fe7623d8d6b679efddecd8d49009 -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -7899 - -STORKAttrQueryRequest.java -file - - - - -2014-01-21T08:38:55.336702Z -2d4ac505f71020c482ebbefa10484552 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -10617 - -CitizenConsent.java -file - - - - -2014-01-21T08:38:55.336702Z -39e236d6888f266d9b4967f19726126c -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3445 - -AttributeProvidersMap.java -file - - - - -2014-01-21T08:38:55.336702Z -b487da35df5353c8b2aba47ab3cdb68d -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2608 - -STORKAttrQueryResponse.java -file - - - - -2014-01-21T08:38:55.336702Z -93fc508be2bc0fd29ae453b0868e1d2b -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -9080 - -PersonalAttributeList.java -file - - - - -2014-01-21T08:38:55.336702Z -0036d26679cc31fe7d1bdea1b8b3555a -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -12041 - -AttributeName.java -file - - - - -2014-01-21T08:38:55.336702Z -164e63d1f4e5aeb47d371caff534eaab -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1504 - -PEPSUtil.java -file - - - - -2014-03-05T09:36:07.946515Z -9aa5d40e80a49d19293f42db68feca97 -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -12702 - -PersonalAttribute.java -file - - - - -2014-01-21T08:38:55.336702Z -ce98ef39a754869644b5516cdcfcb40d -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8914 - -IAttributeListProcessor.java -file - - - - -2014-01-21T08:38:55.336702Z -07efc5b742cc9e4b80a2f8b17fe4b946 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4713 - -DateUtil.java -file - - - - -2013-12-20T12:27:56.634475Z -59f9cd2a3d1169a0f1a797b28719921a -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -5702 - -IStorkLogger.java -file - - - - -2013-12-20T12:27:56.634475Z -f15979b29f52d1674103528aed914ae7 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4766 - -STORKLogoutResponse.java -file - - - - -2014-01-21T08:38:55.336702Z -880a05076cf8412311766aa40cf6a63f -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -5474 - -STORKAuthnRequest.java -file - - - - -2013-12-20T12:27:56.634475Z -3f36e65f0c4f1c7df753784b2e64f00b -2013-10-24T15:44:04.704923Z -56 -emgrtargr - - - - - - - - - - - - - - - - - - - - - -11269 - -AttributeProvider.java -file - - - - -2014-03-05T09:36:07.946515Z -54177f09aad369707021fb3c0f5b2b1e -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2914 - -IStorkSession.java -file - - - - -2013-12-20T12:27:56.634475Z -5a8701b1fd27998d5cf3280a5c99bcb0 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2745 - -Linker.java -file - - - - -2014-01-21T08:38:55.336702Z -98f46baee16310e3dc59ef224ba5b5ab -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8950 - -PEPSParameters.java -file - - - - -2014-03-05T09:36:07.946515Z -ba1718cf8c1a52eae81aa6b182315b95 -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -15394 - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base deleted file mode 100644 index 09769641c..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeConstants.java.svn-base +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the STORK PEPS, Commons and Specific errors - * constant identifiers. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.2 $, $Date: 2010-11-17 05:15:28 $ - */ -public enum AttributeConstants { - - /** - * Represents the attribute's name index. - */ - ATTR_NAME_INDEX(0), - /** - * Represents the attribute's type index. - */ - ATTR_TYPE_INDEX(1), - /** - * Represents the attribute's value index. - */ - ATTR_VALUE_INDEX(2), - /** - * Represents the attribute's status index. - */ - ATTR_STATUS_INDEX(3), - /** - * Represents the number of allowed tuples. - */ - NUMBER_TUPLES(4); - - /** - * Represents the constant's value. - */ - private int attribute; - - /** - * Solo Constructor. - * - * @param attr The Attribute Constant value. - */ - AttributeConstants(final int attr) { - - this.attribute = attr; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public int intValue() { - - return attribute; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base deleted file mode 100644 index a44768c7e..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeName.java.svn-base +++ /dev/null @@ -1,74 +0,0 @@ -package eu.stork.peps.auth.commons; - -/** - * This class is a bean used to store information relative to Attribute Names. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.00 $, $Date: 2013-11-26 $ - */ -public final class AttributeName { - - /** - * Attribute Id. - */ - private String attributeId; - - /** - * Attribute Name. - */ - private String attributeName; - - /** - * Attribute Name Constructor. - * - * @param aId Id of the Attribute Name. - * @param aName Name of the Attribute Name. - */ - public AttributeName(final String aId, final String aName) { - - this.attributeId = aId; - this.attributeName = aName; - } - - /** - * Getter for the attributeId value. - * - * @return The attributeId value. - */ - public String getAttributeId() { - - return attributeId; - } - - /** - * Setter for the attributeId value. - * - * @param aId Id of the Attribute Name. - */ - public void setAttributeId(final String aId) { - - this.attributeId = aId; - } - - /** - * Getter for the attributeName value. - * - * @return The attributeName value. - */ - public String getAttributeName() { - - return attributeName; - } - - /** - * Setter for the attributeName value. - * - * @param name Name of the Attribute Name. - */ - public void setAttributeName(final String name) { - - this.attributeName = name; - } - -} \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base deleted file mode 100644 index 575732e27..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base +++ /dev/null @@ -1,123 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; -import java.util.List; - -/** - * This class is a bean used to store the information relative to the Attribute Provider. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.01 $, $Date: 2014-01-13 $ - */ -public final class AttributeProvider implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = 7210186241917444559L; - - /** - * Provider Id. - */ - private String providerId; - - /** - * Provider Name. - */ - private String providerName; - - /** - * Allowed groups of attribute names. - */ - private List allowedGroups; - - /** - * Attribute Provider Constructor. - * - * @param pId Id of the Attribute Provider. - * @param pName Name of the Attribute Provider. - */ - public AttributeProvider(final String pId, final String pName, final List pAllowedGroups) { - - this.providerId = pId; - this.providerName = pName; - this.allowedGroups = pAllowedGroups; - } - - /** - * Getter for the providerId value. - * - * @return The providerId value. - */ - public String getProviderId() { - - return providerId; - } - - /** - * Setter for the providerId value. - * - * @param pId Id of the Attribute Provider. - */ - public void setProviderId(final String pId) { - - this.providerId = pId; - } - - /** - * Getter for the providerName value. - * - * @return The providerName value. - */ - public String getProviderName() { - - return providerName; - } - - /** - * Setter for the providerName value. - * - * @param name Name of the Attribute Provider. - */ - public void setProviderName(final String name) { - - this.providerName = name; - } - - /** - * Getter for the allowedGroups value. - * - * @return The allowedGroups value. - */ - public List getAllowedGroups() { - - return allowedGroups; - } - - /** - * Setter for the allowedGroups value. - * - * @param name AllowedGroups of the Attribute Provider. - */ - public void setAllowedGroups(final List pAllowedGroups) { - - this.allowedGroups = pAllowedGroups; - } - - /** - * Check if an attribute name is allowed for this Attribute Provider - * - * @param pAttrName the Attribute Name to check - * @return true if the name is allowed, false otherwise - */ - public boolean isAttributeNameAllowed(final String pAttrName) { - if ( allowedGroups==null || pAttrName==null ) - return false; - else if ( allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_ALL.toString()) ) - return true; - else if ( allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_NONE.toString()) ) - return false; - else - return allowedGroups.contains(pAttrName); - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base deleted file mode 100644 index 85aec2625..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvidersMap.java.svn-base +++ /dev/null @@ -1,96 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.util.Iterator; -import java.util.LinkedHashMap; - -import org.apache.log4j.Logger; - -/** - * Implementation of the AttributeProviderMap using a LinkedHashMap. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.01 $, $Date: 2013-09-20 $ - * - * @see LinkedHashMap - */ -public class AttributeProvidersMap extends LinkedHashMap - implements IAttributeProvidersMap { - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(AttributeProvidersMap.class.getName()); - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 8949081185106296122L; - - /** - * {@inheritDoc} - */ - @Override - public IPersonalAttributeList get(final AttributeSource key) { - return this.get((Object) key); - } - - /** - * {@inheritDoc} - */ - @Override - public IPersonalAttributeList remove(final AttributeSource key) { - return this.remove((Object) key); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean containsKey(final AttributeSource key) { - return this.containsKey((Object) key); - } - - /** - * {@inheritDoc} - */ - @Override - public Iterator keyIterator() { - return this.keySet().iterator(); - } - - public void trace() { - Iterator iterator; - Iterator iterator2; - AttributeSource source; - IPersonalAttributeList pal; - PersonalAttribute pa; - - iterator = this.keyIterator(); - LOG.trace("Start dumping of AttributeProvidersMap\n======================="); - while (iterator.hasNext()) { - source = iterator.next(); - - LOG.trace("Source details: type [" + source.getSourceType() + "], URL [" + source.getProviderURL() + "]"); - - if(source.getSourceType() == AttributeSource.SOURCE_LOCAL_APROVIDER) { - LOG.trace("-> Attribute Provider: ID [" + source.getProvider().getProviderId() + "], name [" + source.getProvider().getProviderName() + "]"); - } - else { - LOG.trace("-> Country: ID [" + source.getCountry().getCountryId() + "], name [" + source.getCountry().getCountryName() + "]"); - } - - pal = this.get(source); - LOG.trace("++++++++=>"); - iterator2 = pal.iterator(); - while (iterator2.hasNext()) { - pa = iterator2.next(); - - LOG.trace("-> Citizen Attribute: name [" + pa.getName() + "], required [" + pa.isRequired() + "]"); - } - LOG.trace("<=++++++++"); - - LOG.trace("-----------------------"); - } - LOG.trace("END\n======================="); - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base deleted file mode 100644 index 846f54f67..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeSource.java.svn-base +++ /dev/null @@ -1,188 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information relative to the Attribute Source (either AttributeProvider or Country). - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.10 $, $Date: 2013-11-29 $ - */ -public final class AttributeSource implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = 432243595968469014L; - - public static final int SOURCE_LOCAL_APROVIDER = 1; - public static final int SOURCE_REMOTE_COUNTRY = 2; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(AttributeSource.class.getName()); - - /** - * Provider source. - */ - private int sourceType; - - /** - * Provider URL. - */ - private String providerURL; - - /** - * The local Attribute Provider. - */ - private AttributeProvider provider; - - /** - * The remote Country. - */ - private Country country; - - /** - * Attribute Source Constructor. - * - * @param provider The local Attribute Provider. - * @param pURL URL of the Attribute Provider. - */ - public AttributeSource(final AttributeProvider provider, final String pURL) { - this.setSourceType(SOURCE_LOCAL_APROVIDER); - - this.setProvider(provider); - this.setProviderURL(pURL); - } - - /** - * Attribute Source Constructor. - * - * @param country The remote Country. - * @param pURL URL of the Country. - */ - public AttributeSource(final Country country, final String pURL) { - this.setSourceType(SOURCE_REMOTE_COUNTRY); - - this.setCountry(country); - this.setProviderURL(pURL); - } - - /** - * @param sourceType the sourceType to set - */ - public void setSourceType(final int sourceType) { - this.sourceType = sourceType; - } - - /** - * @return the sourceType - */ - public int getSourceType() { - return sourceType; - } - - /** - * @param providerURL the providerURL to set - */ - public void setProviderURL(final String providerURL) { - this.providerURL = providerURL; - } - - /** - * @return the providerURL - */ - public String getProviderURL() { - return providerURL; - } - - /** - * @param provider the provider to set - */ - public void setProvider(final AttributeProvider provider) { - this.setSourceType(SOURCE_LOCAL_APROVIDER); - - this.provider = provider; - } - - /** - * @return the provider - */ - public AttributeProvider getProvider() { - return provider; - } - - /** - * @param country the country to set - */ - public void setCountry(final Country country) { - this.setSourceType(SOURCE_REMOTE_COUNTRY); - - this.country = country; - } - - /** - * @return the country - */ - public Country getCountry() { - return country; - } - - /** - * {@inheritDoc} - */ - public boolean equals(Object obj) { - boolean outcome = false; - - LOG.debug("Calling equals with Object."); - if ( obj instanceof AttributeSource ) { - LOG.debug("Calling equals with AttributeSource."); - outcome = this.equals((AttributeSource)obj); - } - - LOG.debug("Object equals outcome: " + outcome); - return outcome; - } - - /** - * Compare the given AttributeSource with the current object in order to determinine - * if they are equal. - * - * @param obj The AttributeSource to compare to - * - * @return true if the two objects are equal - */ - public boolean equals(AttributeSource obj) { - boolean outcome = false; - - if ( this.sourceType==obj.getSourceType() ) { - if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER ) { - if ( this.provider.getProviderId().equals(obj.getProvider().getProviderId()) ) - outcome = true; - } - else if ( this.sourceType==AttributeSource.SOURCE_REMOTE_COUNTRY ) { - if ( this.country.getCountryId().equals(obj.getCountry().getCountryId()) ) - outcome = true; - } - } - - LOG.debug("AttributeSource equals outcome: " + outcome); - return outcome; - } - - /** - * {@inheritDoc} - */ - public int hashCode() { - int hash = 1; - hash = hash * 17 + this.sourceType; - if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER ) - hash = hash * 31 + this.provider.getProviderName().hashCode(); - else - hash = hash * 31 + this.country.getCountryName().hashCode(); - return hash; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base deleted file mode 100644 index af7ab6cf3..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeUtil.java.svn-base +++ /dev/null @@ -1,231 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang.StringUtils; - -/** - * This class holds static helper methods. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.5 $, $Date: 2010-12-15 23:19:59 $ - */ -public final class AttributeUtil { - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private AttributeUtil() { - // empty constructor - } - - /** - * Safe escape any given string. - * - * @param value The HTTP Value to escaped. - * - * @return The value escaped value. - */ - public static String escape(final String value) { - - final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); - final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); - final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); - - final String escAttrSep = "%" + (int) attrSep.charAt(0); - final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); - final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); - - return value.replace(attrSep, escAttrSep) - .replace(attrTupleSep, escAttrTupleSep) - .replace(attrValueSep, escAttrValueSep); - } - - /** - * Unescape any given string. - * - * @param value The HTTP Value to be unescaped. - * - * @return The value unescaped value. - */ - public static String unescape(final String value) { - final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); - final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); - final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); - - final String escAttrSep = "%" + (int) attrSep.charAt(0); - final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); - final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); - - return value.replace(escAttrSep, attrSep) - .replace(escAttrTupleSep, attrTupleSep) - .replace(escAttrValueSep, attrValueSep); - } - - /** - * Appends the string representation of an object to a StringBuilder. - * - * @param strBuilder The StringBuilder to append to. - * @param val The string representation of an object. - */ - public static void appendIfNotNull(final StringBuilder strBuilder, - final Object val) { - - if (val != null) { - strBuilder.append(val); - } - } - - /** - * Given a separator and a list of strings, joins the list, as a string, - * separated by the separator string. - * - * @param list The list of strings to join. - * @param separator The separator string. - * @return the list, as a string, separated by the separator string. - */ - public static String listToString(final List list, - final String separator) { - - final StringBuilder strBuilder = new StringBuilder(); - for (final String s : list) { - if (!StringUtils.isEmpty(s)) { - strBuilder.append(AttributeUtil.escape(s) + separator); - } - } - return strBuilder.toString(); - } - - /** - * Given a separator and a map of strings to strings, joins the map, as a - * string, separated by the separator string with the pair key/value - * concatenated with a '='. - * - * @param map The map of strings to join. - * @param separator The separator string. - * - * @return the map of strings, as a string, separated by the separator string - * with the pair key/value concatenated with a '='. - */ - public static String mapToString(final Map map, - final String separator) { - - final StringBuilder strBuilder = new StringBuilder(); - final Iterator> valuesIt = map.entrySet().iterator(); - while (valuesIt.hasNext()) { - final Entry entry = valuesIt.next(); - strBuilder.append(entry.getKey()); - strBuilder.append('='); - strBuilder.append(AttributeUtil.escape(entry.getValue())); - strBuilder.append(separator); - } - return strBuilder.toString(); - } - - /** - * Validates the attribute value format. - * - * @param value The attribute value to validate. - * - * @return true if value has a valid format. - */ - public static boolean isValidValue(final String value) { - boolean retVal = false; - if (value != null && value.charAt(0) == '[' && value.endsWith("]")) { - final String tmpAttrValue = value.substring(1, value.length() - 1); - final String[] vals = - tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - if (tmpAttrValue.length() >= 0 - || (vals.length > 0 && vals[0].length() > 0)) { - retVal = true; - } - } - return retVal; - } - - /** - * Validates the attribute type value. It's case insensitive. E.g. return true - * value to: a) "true", "TRUE", "True", ... b) "false", "FALSE", "False", ... - * - * @param type The attribute type value. - * - * @return true if type has a true or false (case insensitive) value. - */ - public static boolean isValidType(final String type) { - return StringUtils.isNotEmpty(type) && (PEPSValues.TRUE.toString().equalsIgnoreCase(type) || PEPSValues.FALSE.toString().equalsIgnoreCase(type)) ; - } - - /** - * Validates the Personal attribute tuple. E.g. name:type:[value]:status - * - * @param tuples The Personal attribute's tuple. - * - * @return true if the tuples' format is valid. - * - * @see PEPSUtil#validateParameter(String, String, String) - * @see String#equalsIgnoreCase(String) - */ - public static boolean hasValidTuples(final String[] tuples) { - boolean retVal = false; - - final int numberTuples = AttributeConstants.NUMBER_TUPLES.intValue(); - if (tuples != null && tuples.length == numberTuples) { - // validate attrName - final int attrNameIndex = AttributeConstants.ATTR_NAME_INDEX.intValue(); - final int attrTypeIndex = AttributeConstants.ATTR_TYPE_INDEX.intValue(); - final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue(); - - retVal = - StringUtils.isNotEmpty(tuples[attrNameIndex]) - && StringUtils.isNotEmpty(tuples[attrTypeIndex]) - && StringUtils.isNotEmpty(tuples[attrValueIndex]) - && AttributeUtil.isValidType(tuples[attrTypeIndex]) - && AttributeUtil.isValidValue(tuples[attrValueIndex]); - } - return retVal; - } - - /** - * Check if all mandatory attributes have values. - * - * @param personalAttrList The Personal Attributes List. - * - * @return true if all mandatory attributes have values, false if at least one - * attribute doesn't have value. - */ - public static boolean checkMandatoryAttributes( - final IPersonalAttributeList personalAttrList) { - - final Iterator itAttributes = - personalAttrList.values().iterator(); - boolean retVal = true; - while (itAttributes.hasNext() && retVal) { - final PersonalAttribute attr = itAttributes.next(); - if (attr.isRequired() - && !STORKStatusCode.STATUS_AVAILABLE.toString() - .equals(attr.getStatus())) { - retVal = false; - } - } - return retVal; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base deleted file mode 100644 index 9ebcfbd5a..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CitizenConsent.java.svn-base +++ /dev/null @@ -1,123 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.ArrayList; -import java.util.List; - -/** - * This class is a bean used to store the information relative to the Citizen - * Consent. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class CitizenConsent { - - /** - * Mandatory attributes list. - */ - private List mandatoryList; - - /** - * Optional attributes list. - */ - private List optionalList; - - /** - * Citizen Consent default Constructor. - */ - public CitizenConsent() { - this.mandatoryList = new ArrayList(); - this.optionalList = new ArrayList(); - } - - /** - * Getter for the mandatoryList value. - * - * @return The mandatoryList value. - */ - public List getMandatoryList() { - return this.mandatoryList; - } - - /** - * Setter for the mandatoryList value. - * - * @param mandatoryAttrList Mandatory parameters list. - */ - public void setMandatoryList(final List mandatoryAttrList) { - this.mandatoryList = mandatoryAttrList; - } - - /** - * Setter for some mandatoryAttribute. Adds the input parameter to the - * mandatoryList. - * - * @param mandatoryAttr Attribute to add to the mandatoryList. - */ - public void setMandatoryAttribute(final String mandatoryAttr) { - this.mandatoryList.add(mandatoryAttr); - } - - /** - * Getter for the optionalList value. - * - * @return The optionalList value. - */ - public List getOptionalList() { - return optionalList; - } - - /** - * Setter for the optionalList value. - * - * @param optAttrList Optional parameters list. - */ - public void setOptionalList(final List optAttrList) { - this.optionalList = optAttrList; - } - - /** - * Setter for some optionalAttr. Adds the input parameter to the optionalList. - * - * @param optionalAttr Attribute to add to the optionalList. - */ - public void setOptionalAttribute(final String optionalAttr) { - this.optionalList.add(optionalAttr); - } - - /** - * Returns a string in the following format. "Mandatory attributes: - * mandatoryAttr1;mandatoryAttr2;mandatoryAttrN Optional attributes: - * optionalAttr1;optionalAttr2;optionalAttrN" - * - * @return {@inheritDoc} - */ - public String toString() { - final StringBuilder strbldr = new StringBuilder(46); - strbldr.append("Mandatory attributes: "); - for (final String str : mandatoryList) { - strbldr.append(str).append(';'); - } - strbldr.append(" Optional attributes: "); - for (final String str : optionalList) { - strbldr.append(str).append(';'); - } - return strbldr.toString(); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base deleted file mode 100644 index 001f9317a..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Country.java.svn-base +++ /dev/null @@ -1,95 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -/** - * This class is a bean used to store the information relative to the Country. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.10 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class Country implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1135994036496370993L; - -/** - * Country Id. - */ - private String countryId; - - /** - * Country Name. - */ - private String countryName; - - /** - * Country Constructor. - * - * @param cId Id of the Country. - * @param cName Name of the Country. - */ - public Country(final String cId, final String cName) { - - this.countryId = cId; - this.countryName = cName; - } - - /** - * Getter for the countryId value. - * - * @return The countryId value. - */ - public String getCountryId() { - - return countryId; - } - - /** - * Setter for the countryId value. - * - * @param cId Id of the Country. - */ - public void setCountryId(final String cId) { - - this.countryId = cId; - } - - /** - * Getter for the countryName value. - * - * @return The countryName value. - */ - public String getCountryName() { - - return countryName; - } - - /** - * Setter for the countryName value. - * - * @param name Name of the Country. - */ - public void setCountryName(final String name) { - - this.countryName = name; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base deleted file mode 100644 index 54345f3ea..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/CountryCodes.java.svn-base +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.Arrays; -import java.util.List; - -/** - * This class contains all the ISO 3166-1 Alpha 3 Country Codes. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.2 $, $Date: 2011-04-14 00:24:56 $ - */ -public final class CountryCodes { - - /** - * Private Constructor. - */ - private CountryCodes() { - - } - - /** - * ISO 3166-1 Alpha 3 Country Codes. - */ - private static List countrysAlpha3 = Arrays.asList("ABW", "AFG", - "AGO", "AIA", "ALA", "ALB", "AND", "ANT", "ARE", "ARG", "ARM", "ASM", - "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI", "BEL", "BEN", "BES", - "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU", - "BOL", "BRA", "BRB", "BRN", "BTN", "BUR", "BVT", "BWA", "BYS", "CAF", - "CAN", "CCK", "CHE", "CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK", - "COL", "COM", "CPV", "CRI", "CSK", "CUB", "CUW", "CXR", "CYM", "CYP", - "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY", "ERI", - "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO", "FSM", - "GAB", "GBR", "GEO", "GGY", "GHA", "GIB", "GIN", "GLP", "GMB", "GNB", - "GNQ", "GRC", "GRD", "GRL", "GTM", "GUF", "GUM", "GUY", "HKG", "HMD", - "HND", "HRV", "HTI", "HUN", "IDN", "IMN", "IND", "IOT", "IRL", "IRN", - "IRQ", "ISL", "ISR", "ITA", "JAM", "JEY", "JOR", "JPN", "KAZ", "KEN", - "KGZ", "KHM", "KIR", "KNA", "KOR", "KWT", "LAO", "LBN", "LBR", "LBY", - "LCA", "LIE", "LKA", "LSO", "LTU", "LUX", "LVA", "MAC", "MAF", "MAR", - "MCO", "MDA", "MDG", "MDV", "MEX", "MHL", "MKD", "MLI", "MLT", "MMR", - "MNE", "MNG", "MNP", "MOZ", "MRT", "MSR", "MTQ", "MUS", "MWI", "MYS", - "MYT", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NIU", "NLD", "NOR", - "NPL", "NRU", "NZL", "OMN", "PAK", "PAN", "PCN", "PER", "PHL", "PLW", - "PNG", "POL", "PRI", "PRK", "PRT", "PRY", "PSE", "PYF", "QAT", "REU", - "ROM", "ROU", "RUS", "RWA", "SAU", "SCG", "SDN", "SEN", "SGP", "SGS", - "SHN", "SJM", "SLB", "SLE", "SLV", "SMR", "SOM", "SPM", "SRB", "STP", - "SUR", "SVK", "SVN", "SXW", "SWE", "SWZ", "SYC", "SYR", "TCA", "TCD", - "TGO", "THA", "TJK", "TKL", "TKM", "TLS", "TMP", "TON", "TTO", "TUN", - "TUR", "TUV", "TWN", "TZA", "UGA", "UKR", "UMI", "URY", "USA", "UZB", - "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", - "YUG", "ZAF", "ZAR", "ZMB", "ZWE"); - - /** - * Searches the CountryCode (3166-1 alpha3 format) an return true if it - * exists. - * - * @param countryCode The Country code to search. - * - * @return true if the CountryCode exists, false otherwise. - */ - public static boolean hasCountryCodeAlpha3(final String countryCode) { - - return CountryCodes.countrysAlpha3.contains(countryCode); - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base deleted file mode 100644 index 9c0bd6775..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/DateUtil.java.svn-base +++ /dev/null @@ -1,169 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.sql.Timestamp; -import java.util.GregorianCalendar; - -import org.apache.log4j.Logger; -import org.joda.time.DateTime; -import org.joda.time.Years; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; - -import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException; - -/** - * This class holds static helper methods for Date Operations. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.4 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class DateUtil { - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(DateUtil.class.getName()); - - /** - * yyyy Date format size. - */ - private static final int YEAR_DATE_SIZE = 4; - - /** - * yyyyMM Date format size. - */ - private static final int MONTH_DATE_SIZE = 6; - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private DateUtil() { - // empty constructor - } - - /** - * Fulfils dateValue with a valid date. The following roles are applied: a) If - * the dateValue only contains the year then fulfils with last year's day. - * e.g. this method returns 19951231 to the 1995 dateValue. b) If the - * dateValue contains the year and the month then fulfils with last month's - * day. e.g. this method returns 19950630 to the 199505 dateValue. - * - * @param dateValue The date to be fulfilled. - * - * @return The dateValue fulfilled. - */ - private static String fulfilDate(final String dateValue) { - - final StringBuffer strBuf = new StringBuffer(); - strBuf.append(dateValue); - // if the IdP just provides the year then we must fullfil the date. - if (dateValue.length() == YEAR_DATE_SIZE) { - strBuf.append(PEPSValues.LAST_MONTH.toString()); - } - // if the IdP provides the year and the month then we must fullfil the - // date. - if (dateValue.length() == MONTH_DATE_SIZE - || strBuf.length() == MONTH_DATE_SIZE) { - // IdP doesn't provide the day, so we will use DateTime to - // calculate it. - final String noDayCons = PEPSValues.NO_DAY_DATE_FORMAT.toString(); - final DateTimeFormatter fmt = DateTimeFormat.forPattern(noDayCons); - final DateTime dateTime = fmt.parseDateTime(strBuf.toString()); - // Append the last month's day. - strBuf.append(dateTime.dayOfMonth().withMaximumValue().getDayOfMonth()); - } - - return strBuf.toString(); - } - - /** - * Validates the dateValue format: a) if has a valid size; b) if has a numeric - * value; Note: dateValue must have the format yyyyMMdd. - * - * @param dateValueTmp The date to be validated. - * @param pattern The accepted date format. - * - * @return true if the date has a valid format. - */ - public static boolean isValidFormatDate(final String dateValueTmp, - final String pattern) { - - boolean retVal = true; - try { - final String dateValue = DateUtil.fulfilDate(dateValueTmp); - - final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); - fmt.parseDateTime(dateValue); - } catch (final Exception e) { - // We catch Exception because we only have to return false - // value! - retVal = false; - } - return retVal; - } - - /** - * Calculates the age for a given date string. - * - * @param dateVal The date to be validated. - * @param now The current date. - * @param pattern The date pattern. - * - * @return The age value. - */ - public static int calculateAge(final String dateVal, final DateTime now, - final String pattern) { - - if (DateUtil.isValidFormatDate(dateVal, pattern)) { - try { - final String dateValueTemp = DateUtil.fulfilDate(dateVal); - final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); - final DateTime dateTime = fmt.parseDateTime(dateValueTemp); - // Calculating age - final Years age = Years.yearsBetween(dateTime, now); - - return age.getYears(); - } catch (final IllegalArgumentException e) { - LOG.warn("Invalid date format (" + pattern - + ") or an invalid dateValue."); - throw new SecurityPEPSException( - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()), - e); - } - } else { - LOG.warn("Couldn't calculate Age, invalid date!"); - throw new SecurityPEPSException( - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage())); - } - - } - - /** - * Generates the current timestamp. - * - * @return timestamp The current timestamp - */ - public static Timestamp currentTimeStamp() { - final GregorianCalendar cal = new GregorianCalendar(); - final long millis = cal.getTimeInMillis(); - return new Timestamp(millis); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base deleted file mode 100644 index b13c70f04..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeListProcessor.java.svn-base +++ /dev/null @@ -1,148 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.util.List; -import java.util.Map; - -/** - * Interface for {@link AttributeListProcessor}. - * - * @author ricardo.ferreira@multicert.com - * - * @version $Revision: $, $Date: $ - * - * @see IPersonalAttributeList - */ -public interface IAttributeListProcessor { - - /** - * Checks if attribute list only contains allowed attributes. - * - * @param attrList the requested attribute list - * @param attributes the allowed attributes - * - * @return true is all the attributes are allowed. - * - * @see IPersonalAttributeList - */ - boolean hasAllowedAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Lookup for business attribute. - * - * @param attrList the requested attribute list - * @param normalAttributes the normal attributes - * - * @return true is at least one business attribute was requested. - * - * @see IPersonalAttributeList - */ - boolean hasBusinessAttributes(final IPersonalAttributeList attrList, final List normalAttributes); - - /** - * Lookup for business attribute in normal attribute list (loaded by - * implementation). - * - * @param attrList the requested attribute list - * - * @return true is at least one business attribute was requested. - * - * @see IPersonalAttributeList - */ - boolean hasBusinessAttributes(final IPersonalAttributeList attrList); - - /** - * Adds eIdentifier, name, surname, and DateOfBirth attributes to get business - * attributes from some AP. - * - * @param attrList the requested attribute list - * @param attributes the list of attributes to add (eIdentifier, name, - * surname, and DateOfBirth). - * - * @return the requested attribute list and the new attributes added - * (eIdentifier, name, surname, and DateOfBirth). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Adds eIdentifier, name, surname, and DateOfBirth attributes, loaded by - * implementation, to get business attributes from some AP. - * - * @param attrList the requested attribute list - * - * @return the requested attribute list and the new attributes added - * (eIdentifier, name, surname, and DateOfBirth). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList); - - /** - * Removes from attribute list the given list of attributes. - * - * @param attrList the requested attribute list - * @param attributes the list of attributes to remove. - * - * @return the requested attribute list and the attributes removed. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList removeAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Removes from attribute list the given list of attributes and change - * attributes status if attribute was optional in the request. - * - * @param attrList the requested attribute list - * @param attributes the map of attributes (attribute name, mandatory/optional) to remove. - * - * @return the requested attribute list and the attributes removed - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList removeAPMandatoryAttributes(IPersonalAttributeList attrList, Map attributes); - - /** - * Checks if mandate attribute exist in the requested Attribute List. Power - * attribute name to lookup is loaded by implementation. - * - * @param attrList the requested attribute list. - * - * @return true if mandate attribute exists or false otherwise. - * - * @see IPersonalAttributeList - */ - boolean hasPowerAttribute(final IPersonalAttributeList attrList); - - /** - * Checks if attribute name was requested and has value. - * - * @param attrList the requested attribute list. - * @param attrName the attribute name to lookup for . - * - * @return true if attribute was requested and has value or false otherwise. - * - * @see IPersonalAttributeList - */ - boolean hasAttributeValue(final IPersonalAttributeList attrList, final String attrName); - - /** - * Checks if attribute has value. - * - * @param attr the attribute to check. - * - * @return true if has value; - * - * @see PersonalAttribute - */ - boolean hasAttributeValue(final PersonalAttribute attr); - - /** - * Gets a map (attribute name, attribute isRequired) of attributes added to attribute list. - * - * @return the Map of attributes added and if is required to attribute list. - */ - Map getNormalAttributesAdded(); - -} \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base deleted file mode 100644 index 733399ca3..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IAttributeProvidersMap.java.svn-base +++ /dev/null @@ -1,82 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.util.Iterator; - -/** - * Interface for Attributes Providers map. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.00 $, $Date: 2013-09-20 $ - */ -public interface IAttributeProvidersMap { - - /** - * Returns the object associated the the given key. - * - * @param key with which the specified value is to be associated. - * - * @return The object associated the the given key. - */ - IPersonalAttributeList get(AttributeSource key); - - /** - * Associates a key to a value, and inserts them in the session object. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object put(AttributeSource key, IPersonalAttributeList value); - - /** - * Removes the mapping for this key. - * - * @param key with which the specified value is to be associated. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - IPersonalAttributeList remove(AttributeSource key); - - /** - * Returns the number of key-value mappings in this map. - * - * @return the number of key-value mappings in this map. - */ - int size(); - - /** - * Returns true if this map contains a mapping for the specified key. - * - * @param key with which the specified value is to be associated. - * - * @return true if this map contains a mapping for the specified key. - */ - boolean containsKey(AttributeSource key); - - /** - * Removes all mappings from this map. - */ - void clear(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); - - /** - * Returns an Iterator of the keys contained in this map. The implementation must - * take care in order for the Iterator to have predictable order of the returned - * keys. - * - * @return an iterator of the keys contained in this map - */ - Iterator keyIterator(); -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base deleted file mode 100644 index b24c915c0..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IPersonalAttributeList.java.svn-base +++ /dev/null @@ -1,194 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.Collection; -import java.util.Iterator; -import java.util.Set; - -/** - * Interface for {@link PersonalAttributeList}. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.16 $, $Date: 2010-11-17 05:15:28 $ - * - * @see PersonalAttribute - */ -@SuppressWarnings("PMD.CloneMethodMustImplementCloneable") -public interface IPersonalAttributeList extends Iterable, - Cloneable { - - /** - * Associates the specified value with the specified key in this Personal - * Attribute List. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return the previous value associated with key, or null if there was no - * mapping for key. - * - * @see PersonalAttribute - */ - PersonalAttribute put(String key, PersonalAttribute value); - - /** - * Returns the value to which the specified key is mapped, or null if this map - * contains no mapping for the key. - * - * @param key whose associated value is to be returned. - * - * @return The value to which the specified key is mapped, or null if this map - * contains no mapping for the key. - * - * @see PersonalAttribute - */ - PersonalAttribute get(Object key); - - /** - * Adds to the PersonalAttributeList the given PersonalAttribute. It sets the - * attribute name as the key to the attribute value. - * - * @param value PersonalAttribute to add to the PersonalAttributeList - */ - void add(PersonalAttribute value); - - /** - * Get the size of the Personal Attribute List. - * - * @return size of the Personal Attribute List. - */ - int size(); - - /** - * Checks if the Personal Attribute List contains the given key. - * - * @param key with which the specified value is to be associated. - * - * @return true if the Personal Attribute List contains the given key, false - * otherwise. - */ - boolean containsKey(Object key); - - /** - * Getter for the iterator of the Personal Attribute List values. - * - * @return The iterator for the Personal Attribute List values. - * - * @see PersonalAttribute - */ - Iterator iterator(); - - /** - * Creates a Personal Attribute List from a String representing an Attribute - * List. - * - * @param attrList String Object representing the attribute list. - */ - void populate(String attrList); - - /** - * Removes the mapping for this key from this map if present. - * - * @param key key whose mapping is to be removed from the map. - * @return previous value associated with specified key, or null if - * there was no mapping for key. A null return can also - * indicate that the map previously associated null with the - * specified key. - */ - PersonalAttribute remove(Object key); - - /** - * Returns a collection view of the values contained in this map. The - * collection is backed by the map, so changes to the map are reflected in the - * collection, and vice-versa. The collection supports element removal, which - * removes the corresponding mapping from this map, via the - * Iterator.remove, Collection.remove, removeAll, - * retainAll, and clear operations. It does not support the - * add or addAll operations. - * - * @return a collection view of the values contained in this map. - */ - Collection values(); - - /** - * Returns a {@link Set} view of the keys contained in this map. - * The set is backed by the map, so changes to the map are - * reflected in the set, and vice-versa. If the map is modified - * while an iteration over the set is in progress (except through - * the iterator's own remove operation), the results of - * the iteration are undefined. The set supports element removal, - * which removes the corresponding mapping from the map, via the - * Iterator.remove, Set.remove, - * removeAll, retainAll, and clear - * operations. It does not support the add or addAll - * operations. - * - * @return a set view of the keys contained in this map - */ - Set keySet(); - - - /** - * Returns a IPersonalAttributeList of the complex attributes. - * - * @return an IPersonalAttributeList of the complex attributes. - */ - IPersonalAttributeList getComplexAttributes(); - - /** - * Returns a IPersonalAttributeList of the simple value attributes. - * - * @return an IPersonalAttributeList of the simple value attributes. - */ - IPersonalAttributeList getSimpleValueAttributes(); - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - IPersonalAttributeList getMandatoryAttributes(); - - /** - * Returns a IPersonalAttributeList of the optional attributes in this map. - * - * @return an IPersonalAttributeList of the optional attributes contained in this map. - */ - IPersonalAttributeList getOptionalAttributes(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); - - /** - * Returns true if this map contains at least one element that doesn't have value. - * - * @return true if this map contains at least one element that doesn't have value. - */ - boolean hasMissingValues(); - - /** - * Returns a copy of this IPersonalAttributeList instance. - * - * @return The copy of this IPersonalAttributeList. - */ - Object clone() throws CloneNotSupportedException; - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base deleted file mode 100644 index 33eb618f0..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkLogger.java.svn-base +++ /dev/null @@ -1,239 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * Interface for stork logging. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $ - */ -public interface IStorkLogger { - - /** - * Getter for SpApplication. - * - * @return The SpApplication value. - */ - String getSpApplication(); - - /** - * Setter for SpApplication. - * - * @param spApplication The SP Application. - */ - void setSpApplication(String spApplication); - - /** - * Getter for ProviderName. - * - * @return The ProviderName value. - */ - String getProviderName(); - - /** - * Setter for ProviderName. - * - * @param providerName The provider name. - */ - void setProviderName(String providerName); - - /** - * - * Getter for Origin. - * - * @return The Origin value. - * - */ - String getOrigin(); - - /** - * Setter for Origin. - * - * @param origin The origin. - */ - void setOrigin(String origin); - - /** - * - * Getter for QAA Level. - * - * @return The QAA Level value. - * - */ - int getQaaLevel(); - - /** - * Setter for QAA Level. - * - * @param qaaLevel The qaa level. - */ - void setQaaLevel(int qaaLevel); - - /** - * - * Getter for timestamp. - * - * @return The timestamp value. - * - */ - String getTimestamp(); - - /** - * Setter for timestamp. - * - * @param timestamp The request's timestamp. - */ - void setTimestamp(String timestamp); - - /** - * Getter for InResponseTo. - * - * @return The InResponseTo value. - */ - String getInResponseTo(); - - /** - * Setter for InResponseTo. - * - * @param inResponseTo The Saml's response id. - */ - void setInResponseTo(String inResponseTo); - - /** - * Getter for InResponseToSPReq. - * - * @return The InResponseToSPReq value. - */ - String getInResponseToSPReq(); - - /** - * Setter for InResponseToSPRequ. - * - * @param inResponseToSPReq The Saml's response id. - */ - void setInResponseToSPReq(String inResponseToSPReq); - - /** - * Getter for opType. - * - * @return The opType value. - */ - String getOpType(); - - /** - * Setter for opType. - * - * @param opType The operation type. - */ - void setOpType(String opType); - - /** - * Getter for destination. - * - * @return The destination value. - */ - String getDestination(); - - /** - * Setter for destinationIp. - * - * @param destination The remote IP. - */ - void setDestination(String destination); - - /** - * Getter for message or assertion consumer. - * - * @return The message or assertion consumer. - */ - String getMessage(); - - /** - * Setter for message or assertion consumer. - * - * @param message or assertion consumer. - */ - void setMessage(String message); - - /** - * Getter for country. - * - * @return The country value. - */ - String getCountry(); - - /** - * Setter for country. - * - * @param country The country. - */ - void setCountry(String country); - - /** - * Getter for samlHash. - * - * @return The samlHash value. - */ - byte[] getSamlHash(); - - /** - * Setter for samlHash. - * - * @param samlHash the encrypted SAML token - */ - void setSamlHash(byte[] samlHash); - - /** - * Getter for msgId. - * - * @return the msgId - */ - String getMsgId(); - - /** - * Setter for msgId. - * - * @param msgId the ID of the originator of this message - */ - void setMsgId(String msgId); - - /** - * Getter for sPMsgId. - * - * @return the sPMsgId - */ - String getSPMsgId(); - - /** - * Setter for sPMsgId. - * - * @param sPMsgId the ID of the originator of this message - */ - void setSPMsgId(String sPMsgId); - - /** - * The format of the returned String must be the following: - * "requestCounter#ddMMMyyyykk:mm:ss#opType#originIp#originName - * #destinationIp#destinationName#samlHash#[originatorName#msgId#]" - * - * The values enclosed in '[]' only apply when logging responses. - * - * @return {@inheritDoc} - */ - @Override - String toString(); -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base deleted file mode 100644 index f38b41838..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/IStorkSession.java.svn-base +++ /dev/null @@ -1,85 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * Interface for stork session. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $ - */ -public interface IStorkSession { - - /** - * Returns the object associated the the given key. - * - * @param key with which the specified value is to be associated. - * - * @return The object associated the the given key. - */ - Object get(Object key); - - /** - * Associates a key to a value, and inserts them in the session object. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object put(String key, Object value); - - /** - * Removes the mapping for this key. - * - * @param key with which the specified value is to be associated. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object remove(Object key); - - /** - * Returns the number of key-value mappings in this map. - * - * @return the number of key-value mappings in this map. - */ - int size(); - - /** - * Returns true if this map contains a mapping for the specified key. - * - * @param key with which the specified value is to be associated. - * - * @return true if this map contains a mapping for the specified key. - */ - boolean containsKey(Object key); - - /** - * Removes all mappings from this map. - */ - void clear(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base deleted file mode 100644 index 6e7c891da..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/Linker.java.svn-base +++ /dev/null @@ -1,316 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; - -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information of Attribute Providers, the Attribute - * List to be requested, the Assertions returned by the Attribute Providers and the values - * that each Attribute has. This information along with the current status of the Linker (the - * attribute providers that were queried and the remaining providers) is used by the PEPS - * actions in order to complete the Attribute gathering. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: 1.50 $, $Date: 2013-11-28 $ - */ -public final class Linker implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = -3268006381745987237L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(Linker.class.getName()); - - /** - * Attributes Providers map. - */ - private IAttributeProvidersMap attributeProvidersMap; - - /** - * Assertion map. - */ - private LinkedHashMap assertions; - - /** - * The current index of local (domestic) Attribute Providers. - */ - private int localIndex; - - /** - * The current index of remote (foreign) Attribute Providers - countries. - */ - private int remoteIndex; - - /** - * Constructs an empty Linker object. - */ - public Linker() { - localIndex = 0; - remoteIndex = 0; - - assertions = new LinkedHashMap(); - } - - /** - * Based on the internal state of the Linker it returns the next local Attribute Source - * - * @return The next Attribute Source or null if not found - * - * @see AttributeSource - */ - public AttributeSource getNextLocalProvider() { - Iterator iterator; - AttributeSource source, found; - int curIndex = 0; - - found = null; - - if ( attributeProvidersMap!=null && !attributeProvidersMap.isEmpty() ) { - iterator = attributeProvidersMap.keyIterator(); - while (iterator.hasNext()) { - source = iterator.next(); - - if ( source.getSourceType()==AttributeSource.SOURCE_LOCAL_APROVIDER ) { - if ( curIndex>=localIndex ) { - found = source; - - break; - } - - curIndex++; - } - } - } - - return found; - } - - /** - * Based on the internal state of the Linker it returns the next remote Attribute Source - * - * @return The next Attribute Source or null if not found - * - * @see AttributeSource - */ - public AttributeSource getNextRemoteProvider() { - Iterator iterator; - AttributeSource source, found; - int curIndex = 0; - - found = null; - - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { - iterator = attributeProvidersMap.keyIterator(); - while (iterator.hasNext()) { - source = iterator.next(); - - if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) { - if ( curIndex>=remoteIndex ) { - found = source; - - break; - } - - curIndex++; - } - } - } - - return found; - } - - /** - * It updates the Linker with the values returned by the Attribute Source. It also advances - * to the next index in order to mark this attribute source as completed. - * - * @param source The Attribute Source that was queried for attribute values. - * @param attrResponse The attrResponse returned by the Attribute Source that contains the attribute values. - * - * @see AttributeSource, STORKAttrQueryResponse - */ - public void setProviderReponse(AttributeSource source, STORKAttrQueryResponse attrResponse) { - if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) - remoteIndex++; - else - localIndex++; - - //Assertion storage - this.assertions.put(source, attrResponse); - - this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList()); - //this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList()); - } - - /** - * Reset the internal state of the local Attribute Source in order to start over. - */ - public void resetLocalIndex() { - localIndex = 0; - } - - /** - * Reset the internal state of the remote Attribute Source in order to start over. - */ - public void resetRemoteIndex() { - remoteIndex = 0; - } - - /** - * Setter for attributeProvidersMap. - * - * @param attributeProvidersMap The attributeProvidersMap to set. - */ - public void setAttributeProvidersMap(IAttributeProvidersMap attributeProvidersMap) { - this.attributeProvidersMap = attributeProvidersMap; - } - - /** - * Getter for attributeProvidersMap. - * - * @return attributeProvidersMap - */ - public IAttributeProvidersMap getAttributeProvidersMap() { - return attributeProvidersMap; - } - - /** - * Returns the Personal Attribute list of the provided Attribute Source. - * - * @param source The attributeSource in reference - * - * @return The IPersonalAttributeList assosiated with this source or null if empty - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getProviderAttributes(AttributeSource source) { - if ( attributeProvidersMap.containsKey(source) ) - return attributeProvidersMap.get(source); - else - return null; - } - - /** - * Returns the merged Personal Attribute list from all the Attribute Sources. - * - * @return The IPersonalAttributeList merged Personal Attribute list or null if empty - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getAllAttributes() { - Iterator iterator; - AttributeSource source; - IPersonalAttributeList list, merged; - - merged = null; - - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { - iterator = attributeProvidersMap.keyIterator(); - - merged = new PersonalAttributeList(); - while (iterator.hasNext()) { - source = iterator.next(); - list = this.getProviderAttributes(source); - - for (final PersonalAttribute pa : list) { - merged.add(pa); - } - } - } - - return merged; - } - - /** - * Returns a List with all the assertions gathered by the AAS-PEPS module - * returned both by local APs or remote A-PEPS. - * - * @return The assertions returned from the APs and A-PEPS - */ - public List getAttrQueryResponseList() { - List originalAssertions; - - originalAssertions = new ArrayList(); - - //Gather all assertions - for (STORKAttrQueryResponse element : this.assertions.values()) { - originalAssertions.add(element); - } - - return originalAssertions; - } - - /** - * Checks the internal state of the Linker and if all Attribute Sources where visited - * returns true, otherwise it returns false. So if you go directly from AtPLinkerAction - * to MoreAttributesAction the call will have, since the method setProviderReponse - * was not executed from every Attribute Source. - * - * @return true if everything is OK, false otherwise - */ - public boolean isComplete() { - boolean outcome = false; - - LOG.debug("Check if linkder is complete: R[" + remoteIndex + "], L[" + localIndex + "], S[" + attributeProvidersMap.size() + "]"); - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { - if ( (remoteIndex + localIndex)==attributeProvidersMap.size() ) - outcome = true; - } - else { - outcome = true; - } - - return outcome; - } - - /** - * Merge the two Linker objects. - * - * @param previous The other Linker object to merge with this one. - */ - public void mergeWith(Linker previous) { - //BEFORE - if ( LOG.isDebugEnabled() ) { - LOG.debug("The attributeProvidersMap from the current object."); - ((AttributeProvidersMap)this.attributeProvidersMap).trace(); - LOG.debug("The attributeProvidersMap from the provided object."); - ((AttributeProvidersMap)previous.getAttributeProvidersMap()).trace(); - } - - IAttributeProvidersMap map = previous.getAttributeProvidersMap(); - Iterator items = map.keyIterator(); - while( items.hasNext() ) { - AttributeSource item = items.next(); - IPersonalAttributeList pal = map.get(item); - - if ( this.attributeProvidersMap.containsKey(item) ) { - IPersonalAttributeList new_pal = this.attributeProvidersMap.get(item); - - for(PersonalAttribute pa : pal) - new_pal.add(pa); - } - else { - if ( item.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) - remoteIndex++; - else - localIndex++; - - this.attributeProvidersMap.put(item, pal); - } - } - - //AFTER - if ( LOG.isDebugEnabled() ) { - LOG.debug("The attributeProvidersMap after the merge."); - ((AttributeProvidersMap)this.attributeProvidersMap).trace(); - } - } -} \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base deleted file mode 100644 index 5da9ba494..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSErrors.java.svn-base +++ /dev/null @@ -1,392 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the STORK PEPS, Commons and Specific errors - * constant identifiers. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $ - */ -public enum PEPSErrors { - - /** - * Represents the 'authenticationFailed' constant error identifier. - */ - AUTHENTICATION_FAILED_ERROR("authenticationFailed"), - /** - * Represents the 'spCountrySelector.errorCreatingSAML' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_ERROR_CREATE_SAML("spCountrySelector.errorCreatingSAML"), - /** - * Represents the 'spCountrySelector.destNull' constant error identifier. - */ - SP_COUNTRY_SELECTOR_DESTNULL("spCountrySelector.destNull"), - /** - * Represents the 'spCountrySelector.invalidAttr' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_ATTR("spCountrySelector.invalidAttr"), - /** - * Represents the 'spCountrySelector.invalidProviderName' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_PROVIDER_NAME( - "spCountrySelector.invalidProviderName"), - /** - * Represents the 'spCountrySelector.invalidQaaSPid' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_QAASPID("spCountrySelector.invalidQaaSPid"), - /** - * Represents the 'spCountrySelector.invalidSpId' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPID("spCountrySelector.invalidSpId"), - /** - * Represents the 'spCountrySelector.invalidSPQAA' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPQAA("spCountrySelector.invalidSPQAA"), - /** - * Represents the 'spCountrySelector.invalidSpURL' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPURL("spCountrySelector.invalidSpURL"), - /** - * Represents the 'spCountrySelector.spNotAllowed' constant error identifier. - */ - SP_COUNTRY_SELECTOR_SPNOTALLOWED("spCountrySelector.spNotAllowed"), - - /** - * Represents the 'sProviderAction.errorCreatingSAML' constant error - * identifier. - */ - SPROVIDER_SELECTOR_ERROR_CREATE_SAML("sProviderAction.errorCreatingSAML"), - /** - * Represents the 'sProviderAction.attr' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_ATTR("sProviderAction.invalidAttr"), - /** - * Represents the 'sProviderAction.country' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_COUNTRY("sProviderAction.invalidCountry"), - /** - * Represents the 'sProviderAction.relayState' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_RELAY_STATE("sProviderAction.invalidRelayState"), - /** - * Represents the 'sProviderAction.saml' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SAML("sProviderAction.invalidSaml"), - /** - * Represents the 'sProviderAction.spAlias' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPALIAS("sProviderAction.invalidSPAlias"), - /** - * Represents the 'sProviderAction.spDomain' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPDOMAIN("sProviderAction.invalidSPDomain"), - /** - * Represents the 'sProviderAction.spId' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPID("sProviderAction.invalidSPId"), - /** - * Represents the 'sProviderAction.spQAA' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPQAA("sProviderAction.invalidSPQAA"), - /** - * Represents the 'sProviderAction.spQAAId' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPQAAID("sProviderAction.invalidSPQAAId"), - /** - * Represents the 'sProviderAction.spRedirect' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPREDIRECT("sProviderAction.invalidSPRedirect"), - /** - * Represents the 'sPPowerValidationAction.invalidSPPVAttrList' constant error identifier. - */ - SPPOWERVALIDATION_SELECTOR_INVALID_SP_PV_ATTR_LIST("sPPowerValidationAction.invalidSPPVAttrList"), - - /** - * Represents the 'sProviderAction.invalidSPProviderName' constant error - * identifier. - */ - SPROVIDER_SELECTOR_INVALID_SP_PROVIDERNAME( - "sProviderAction.invalidSPProviderName"), - /** - * Represents the 'sProviderAction.spNotAllowed' constant error identifier. - */ - SPROVIDER_SELECTOR_SPNOTALLOWED("sProviderAction.spNotAllowed"), - - - /** - * Represents the 'internalError' constant error identifier. - */ - INTERNAL_ERROR("internalError"), - - /** - * Represents the 'colleagueRequest.attrNull' constant error identifier. - */ - COLLEAGUE_REQ_ATTR_NULL("colleagueRequest.attrNull"), - /** - * Represents the 'colleagueRequest.errorCreatingSAML' constant error - * identifier. - */ - COLLEAGUE_REQ_ERROR_CREATE_SAML("colleagueRequest.errorCreatingSAML"), - /** - * Represents the 'colleagueRequest.invalidCountryCode' constant error - * identifier. - */ - COLLEAGUE_REQ_INVALID_COUNTRYCODE("colleagueRequest.invalidCountryCode"), - /** - * Represents the 'colleagueRequest.invalidDestUrl' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_DEST_URL("colleagueRequest.invalidDestUrl"), - /** - * Represents the 'colleagueRequest.invalidQaa' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_QAA("colleagueRequest.invalidQaa"), - /** - * Represents the 'colleagueRequest.invalidRedirect' constant error - * identifier. - */ - COLLEAGUE_REQ_INVALID_REDIRECT("colleagueRequest.invalidRedirect"), - /** - * Represents the 'colleagueRequest.invalidSAML' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_SAML("colleagueRequest.invalidSAML"), - - /** - * Represents the 'colleaguePVRequest.invalidPVAttrList' constant error identifier. - */ - COLLEAGUE_PV_REQ_INVALID_PV_ATTR_LIST("colleaguePVRequest.invalidPVAttrList"), - - - /** - * Represents the 'cpepsRedirectUrl' constant error identifier. - */ - CPEPS_REDIRECT_URL("cpepsRedirectUrl"), - /** - * Represents the 'spepsRedirectUrl' constant error identifier. - */ - SPEPS_REDIRECT_URL("spepsRedirectUrl"), - /** - * Represents the 'sProviderAction.invCountry' constant error identifier. - */ - SP_ACTION_INV_COUNTRY("sProviderAction.invCountry"), - - /** - * Represents the 'providernameAlias.invalid' constant error identifier. - */ - PROVIDER_ALIAS_INVALID("providernameAlias.invalid"), - - - /** - * Represents the 'cPeps.attrNull' constant error identifier. - */ - CPEPS_ATTR_NULL("cPeps.attrNull"), - - /** - * Represents the 'colleagueResponse.invalidSAML' constant error identifier. - */ - COLLEAGUE_RESP_INVALID_SAML("colleagueResponse.invalidSAML"), - - /** - * Represents the 'citizenNoConsent.mandatory' constant error identifier. - */ - CITIZEN_NO_CONSENT_MANDATORY("citizenNoConsent.mandatory"), - /** - * Represents the 'citizenResponse.mandatory' constant error identifier. - */ - CITIZEN_RESPONSE_MANDATORY("citizenResponse.mandatory"), - /** - * Represents the 'attVerification.mandatory' constant error identifier. - */ - ATT_VERIFICATION_MANDATORY("attVerification.mandatory"), - /** - * Represents the 'attrValue.verification' constant error identifier. - */ - ATTR_VALUE_VERIFICATION("attrValue.verification"), - - /** - * Represents the 'audienceRestrictionError' constant error identifier. - */ - AUDIENCE_RESTRICTION("audienceRestrictionError"), - /** - * Represents the 'auRequestIdError' constant error identifier. - */ - AU_REQUEST_ID("auRequestIdError"), - /** - * Represents the 'domain' constant error identifier. - */ - DOMAIN("domain"), - /** - * Represents the 'hash.error' constant error identifier. - */ - HASH_ERROR("hash.error"), - /** - * Represents the 'invalidAttributeList' constant error identifier. - */ - INVALID_ATTRIBUTE_LIST("invalidAttributeList"), - /** - * Represents the 'invalidAttributeValue' constant error identifier. - */ - INVALID_ATTRIBUTE_VALUE("invalidAttributeValue"), - /** - * Represents the 'qaaLevel' constant error identifier. - */ - QAALEVEL("qaaLevel"), - /** - * Represents the 'requests' constant error identifier. - */ - REQUESTS("requests"), - /** - * Represents the 'SPSAMLRequest' constant error identifier. - */ - SP_SAML_REQUEST("SPSAMLRequest"), - /** - * Represents the 'spepsSAMLRequest' constant error identifier. - */ - SPEPS_SAML_REQUEST("spepsSAMLRequest"), - /** - * Represents the 'IdPSAMLResponse' constant error identifier. - */ - IDP_SAML_RESPONSE("IdPSAMLResponse"), - /** - * Represents the 'cpepsSAMLResponse' constant error identifier. - */ - CPEPS_SAML_RESPONSE("cpepsSAMLResponse"), - /** - * Represents the 'cpepsSAMLResponse' constant error identifier. - */ - SPEPS_SAML_RESPONSE("spepsSAMLResponse"), - /** - * Represents the 'session' constant error identifier. - */ - SESSION("session"), - /** - * Represents the 'invalid.session' constant error identifier. - */ - INVALID_SESSION("invalid.session"), - /** - * Represents the 'invalid.sessionId' constant error identifier. - */ - INVALID_SESSION_ID("invalid.sessionId"), - /** - * Represents the 'missing.sessionId' constant error identifier. - */ - MISSING_SESSION_ID("sessionError"), - /** - * Represents the 'missing.mandate' constant error identifier. - */ - MISSING_MANDATE("missing.mandate"), - /** - * Represents the 'AtPSAMLResponse' constant error identifier. - */ - ATP_SAML_RESPONSE("AtPSAMLResponse"), - - /** - * Represents the 'AtPSAMLResponse' constant error identifier. - */ - ATP_RESPONSE_ERROR("atp.response.error"), - - /** - * Represents the 'apepsSAMLRequest' constant error identifier. - */ - APEPS_SAML_REQUEST("apepsSAMLRequest"), - - /** - * Represents the 'apepsSAMLResponse' constant error identifier. - */ - APEPS_SAML_RESPONSE("apepsSAMLResponse"), - - /** - * Represents the 'invalid.apepsRedirectUrl' constant error identifier. - */ - INVALID_APEPS_REDIRECT_URL("invalid.apepsRedirectUrl"), - - /** - * Represents the 'invalid.apepsCallbackUrl' constant error identifier. - */ - INVALID_APEPS_CALLBACK_URL("invalid.apepsCallbackUrl"), - - /** - * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier. - */ - COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"); - - /** - * Represents the constant's value. - */ - private String error; - - /** - * Solo Constructor. - * - * @param nError The Constant error value. - */ - PEPSErrors(final String nError) { - this.error = nError; - } - - /** - * Construct the errorCode Constant value. - * - * @return The errorCode Constant. - */ - public String errorCode() { - return error + ".code"; - } - - /** - * Construct the errorCode Constant value with the given code text. - * - * @param text the code text to append to the constant. - * - * @return The errorCode Constant for the given code text. - */ - public String errorCode(final String text) { - return error + "." + text + ".code"; - } - - /** - * Construct the errorMessage constant value. - * - * @return The errorMessage constant. - */ - public String errorMessage() { - return error + ".message"; - } - - /** - * Construct the errorMessage Constant value with the given message text. - * - * @param text the message text to append to the constant. - * - * @return The errorMessage Constant for the given text. - */ - public String errorMessage(final String text) { - return error + "." + text + ".message"; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - return error; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base deleted file mode 100644 index 15c2ae552..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSParameters.java.svn-base +++ /dev/null @@ -1,625 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the STORK PEPS, Commons and Specific Parameters. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2011-07-07 20:48:45 $ - */ -public enum PEPSParameters { - - /** - * Represents the 'apId' parameter constant. - */ - AP_ID("apId"), - /** - * Represents the 'apUrl' parameter constant. - */ - AP_URL("apUrl"), - /** - * Represents the 'ap.number' parameter constant. - */ - AP_NUMBER("ap.number"), - - /** - * Represents the 'assertionConsumerServiceURL' parameter constant. - */ - ASSERTION_CONSUMER_S_URL("assertionConsumerServiceURL"), - - /** - * Represents the 'auth' parameter constant. - */ - AUTHENTICATION("auth"), - - /** - * Represents the 'attr' parameter constant. - */ - ATTRIBUTE("attr"), - /** - * Represents the 'attrName' parameter constant. - */ - ATTRIBUTE_NAME("attrName"), - /** - * Represents the 'attrStatus' parameter constant. - */ - ATTRIBUTE_STATUS("attrStatus"), - /** - * Represents the 'attrType' parameter constant. - */ - ATTRIBUTE_TYPE("attrType"), - /** - * Represents the 'attrValue' parameter constant. - */ - ATTRIBUTE_VALUE("attrValue"), - /** - * Represents the 'attrList' parameter constant. - */ - ATTRIBUTE_LIST("attrList"), - /** - * Represents the 'apMandAttrList' parameter constant. - */ - AP_MANDATORY_ATTRIBUTE_LIST("apMandAttrList"), - /** - * Represents the 'attrTuple' parameter constant. - */ - ATTRIBUTE_TUPLE("attrTuple"), - /** - * Represents the 'attribute-missing' parameter constant. - */ - ATTRIBUTE_MISSING("attribute-missing"), - /** - * Represents the 'attributesNotAllowed' parameter constant. - */ - ATTRIBUTES_NOT_ALLOWED("attributesNotAllowed"), - /** - * Represents the 'authnRequest' parameter constant. - */ - AUTH_REQUEST("authnRequest"), - - /** - * Represents the 'attrValue.number' parameter constant. - */ - ATTR_VALUE_NUMBER("attrValue.number"), - - /** - * Represents the 'derivation.date.format' parameter constant. - */ - DERIVATION_DATE_FORMAT("derivation.date.format"), - /** - * Represents the 'deriveAttr.number' parameter constant. - */ - DERIVE_ATTRIBUTE_NUMBER("deriveAttr.number"), - - /** - * Represents the complex attributes parameter constant. - */ - COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"), - COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"), - COMPLEX_HASDEGREE_VALUE("hasDegree"), - COMPLEX_MANDATECONTENT_VALUE("mandateContent"), - /** - * Represents the 'consent-type' parameter constant. - */ - CONSENT_TYPE("consent-type"), - /** - * Represents the 'consent-value' parameter constant. - */ - CONSENT_VALUE("consent-value"), - /** - * Represents the 'country' parameter constant. - */ - COUNTRY("country"), - /** - * Represents the 'countryOrigin' parameter constant. - */ - COUNTRY_ORIGIN("countryOrigin"), - - /** - * Represents the 'cpepsURL' parameter constant. - */ - CPEPS_URL("cpepsURL"), - /** - * Represents the 'callback' parameter constant. - */ - CPEPS_CALLBACK("callback"), - /** - * Represents the 'peps.specificidpredirect.url' parameter constant. - */ - CPEPS_IDP_CALLBACK_VALUE("peps.specificidpredirect.url"), - /** - * Represents the 'peps.specificapredirect.url' parameter constant. - */ - CPEPS_AP_CALLBACK_VALUE("peps.specificapredirect.url"), - - /** - * Represents the 'errorCode' parameter constant. - */ - ERROR_CODE("errorCode"), - /** - * Represents the 'subCode' parameter constant. - */ - ERROR_SUBCODE("subCode"), - /** - * Represents the 'errorMessage' parameter constant. - */ - ERROR_MESSAGE("errorMessage"), - /** - * Represents the 'errorRedirectUrl' parameter constant. - */ - ERROR_REDIRECT_URL("errorRedirectUrl"), - - /** - * errorRedirectUrl Represents the 'external-authentication' parameter - * constant. - */ - EXTERNAL_AUTH("external-authentication"), - /** - * Represents the 'external-ap' parameter constant. - */ - EXTERNAL_AP("external-ap"), - /** - * Represents the 'external-pv' parameter constant. - */ - EXTERNAL_PV("external-pv"), - /** - * Represents the 'external-sig-module' parameter constant. - */ - EXT_SIG_CREATOR_MOD("external-sig-module"), - - /** - * Represents the 'http-x-forwarded-for' parameter constant. - */ - HTTP_X_FORWARDED_FOR("http-x-forwarded-for"), - - /** - * Represents the 'idp.url' parameter constant. - */ - IDP_URL("idp.url"), - /** - * Represents the 'internal-authentication' parameter constant. - */ - INTERNAL_AUTH("internal-authentication"), - /** - * Represents the 'internal-ap' parameter constant. - */ - INTERNAL_AP("internal-ap"), - /** - * Represents the 'internal-pv' parameter constant. - */ - INTERNAL_PV("internal-pv"), - - /** - * Represents the 'samlIssuer' parameter constant. - */ - ISSUER("samlIssuer"), - /** - * Represents the 'samlIssuer.idp' parameter constant. - */ - ISSUER_IDP("samlIssuer.idp"), - /** - * Represents the 'samlIssuer.atp' parameter constant. - */ - ISSUER_ATP("samlIssuer.atp"), - - /** - * Represents the 'mandatory' parameter constant. - */ - MANDATORY("mandatory"), - /** - * Represents the 'mandatoryAttributeMissing' parameter constant. - */ - MANDATORY_ATTR_MISSING("mandatoryAttributeMissing"), - /** - * Represents the 'mandatoryConsentAttrMissing' parameter constant. - */ - MANDATORY_CONSENT_MISSING("mandatoryConsentAttrMissing"), - /** - * Represents the 'missing-attrs' parameter constant. - */ - MISSING_ATTRS("missing-attrs"), - /** - * Represents the 'no-more-attrs' parameter constant. - */ - NO_MORE_ATTRS("no-more-attrs"), - - /** - * Represents the 'optional' parameter constant. - */ - OPTIONAL("optional"), - - /** - * Represents the 'no-consent-type' parameter constant. - */ - NO_CONSENT_TYPE("no-consent-type"), - /** - * Represents the 'no-consent-value' parameter constant. - */ - NO_CONSENT_VALUE("no-consent-value"), - - /** - * Represents the 'provider.name' parameter constant. - */ - PROVIDER_NAME_VALUE("providerName"), - /** - * Represents the 'cpeps.askconsent' parameter constant. - */ - PEPS_ASK_CONSENT("cpeps.askconsent"), - /** - * Represents the 'cpeps.askconsentvalue' parameter constant. - */ - PEPS_ASK_CONSENT_VALUE("cpeps.askconsentvalue"), - /** - * Represents the 'pepsAuth' parameter constant. - */ - PEPS_AUTH_CONSENT("pepsAuth"), - /** - * Represents the 'validation.bypass' parameter constant. - */ - PEPS_BYPASS("validation.bypass"), - /** - * Represents the 'cpeps.number' parameter constant. - */ - PEPS_NUMBER("cpeps.number"), - /** - * Represents the 'cpeps.specificapredirect.url' parameter constant. - */ - PEPS_SPECIFIC_URL("cpeps.specificapredirect.url"), - /** - * Represents the 'pv.url' parameter constant. - */ - PV_URL("pv.url"), - - /** - * Represents the 'qaaLevel' parameter constant. - */ - QAALEVEL("qaaLevel"), - - /** - * Represents the 'speps.redirectUrl' parameter constant. - */ - SPEPS_REDIRECT_URL("speps.redirectUrl"), - - /** - * Represents the 'sp.redirectUrl' parameter constant. - */ - SP_REDIRECT_URL("sp.redirectUrl"), - /** - * Represents the 'cpeps.redirectUrl' parameter constant. - */ - CPEPS_REDIRECT_URL("cpeps.redirectUrl"), - /** - * Represents the 'RelayState' parameter constant. - */ - RELAY_STATE("RelayState"), - /** - * Represents the 'remoteAddr' parameter constant. - */ - REMOTE_ADDR("remoteAddr"), - /** - * Represents the 'remoteUser' parameter constant. - */ - REMOTE_USER("remoteUser"), - - /** - * Represents the 'SAMLRequest' parameter constant. - */ - SAML_REQUEST("SAMLRequest"), - /** - * Represents the 'SAMLResponse' parameter constant. - */ - SAML_RESPONSE("SAMLResponse"), - /** - * Represents the 'SAMLFail' parameter constant. - */ - SAML_TOKEN_FAIL("SAMLFail"), - /** - * Represents the 'TokenId' parameter constant. - */ - SAML_TOKEN_ID("TokenId"), - /** - * Represents the 'inResponseTo' parameter constant. - */ - SAML_IN_RESPONSE_TO("inResponseTo"), - /** - * Represents the 'inResponseTo.idp' parameter constant. - */ - SAML_IN_RESPONSE_TO_IDP("inResponseTo.idp"), - /** - * Represents the 'inResponseTo.atp' parameter constant. - */ - SAML_IN_RESPONSE_TO_ATP("inResponseTo.atp"), - /** - * Represents the 'SignatureResponse' parameter constant. - */ - SIGNATURE_RESPONSE("SignatureResponse"), - - /** - * Represents the 'cPepsSession' parameter constant. - */ - SESSION_ID_URL("cPepsSession"), - /** - * Represents the 'spId' parameter constant. - */ - SP_ID("spId"), - /** - * Represents the 'spQaaLevel' parameter constant. - */ - SP_QAALEVEL("spQaaLevel"), - /** - * Represents the 'spUrl' parameter constant. - */ - SP_URL("spUrl"), - - /** - * Represents the 'allow.derivation.all' parameter constant. - */ - SPECIFIC_ALLOW_DERIVATION_ALL("allow.derivation.all"), - /** - * Represents the ''allow.unknowns parameter constant. - */ - SPECIFIC_ALLOW_UNKNOWNS("allow.unknowns"), - /** - * Represents the 'derivation.date.separator' parameter constant. - */ - SPECIFIC_DERIVATION_DATE_SEP("derivation.date.separator"), - /** - * Represents the 'derivation.month.position' parameter constant. - */ - SPECIFIC_DERIVATION_MONTH_POS("derivation.month.position"), - /** - * Represents the 'derivation.day.position' parameter constant. - */ - SPECIFIC_DERIVATION_DAY_POS("derivation.day.position"), - /** - * Represents the 'derivation.year.position' parameter constant. - */ - SPECIFIC_DERIVATION_YEAR_POS("derivation.year.position"), - - /** - * sp.authorized.parameters Represents the '' parameter constant. - */ - SPEPS_AUTHORIZED("sp.authorized.parameters"), - - /** - * Represents the 'spSector' constant value. - */ - SPSECTOR("spSector"), - /** - * Represents the 'spApplication' constant value. - */ - SPAPPLICATION("spApplication"), - /** - * Represents the 'spCountry' constant value. - */ - SPCOUNTRY("spCountry"), - /** - * Represents the 'spInstitution' constant value. - */ - SPINSTITUTION("spInstitution"), - /** - * Represents the 'storkAttribute.number' parameter constant. - */ - STORK_ATTRIBUTE_NUMBER("storkAttribute.number"), - /** - * Represents the 'storkAttributeValue.number' parameter constant. - */ - STORK_ATTRIBUTE_VALUE_NUMBER("storkAttributeValue.number"), - - /** - * Represents the 'username' parameter constant. - */ - USERNAME("username"), - - /** - * Represents the 'tooManyParameters' parameter constant. - */ - TOO_MANY_PARAMETERS("tooManyParameters"), - /** - * Represents the 'validation.active' parameter constant. - */ - VALIDATION_ACTIVE("validation.active"), - - /** - * Represents the 'x-forwarded-for' parameter constant. - */ - X_FORWARDED_FOR("x-forwarded-for"), - /** - * Represents the 'x-forwarded-host' parameter constant. - */ - X_FORWARDED_HOST("x-forwarded-host"), - /** - * Represents the 'XMLResponse' parameter constant. - */ - XML_RESPONSE("XMLResponse"), - - /** - * Represents the 'ap-cpeps.number' parameter constant. - */ - AP_PEPS_NUMBER("ap-cpeps.number"), - - /** - * Represents the 'atp.number' parameter constant. - */ - ATTRIBUTE_PROVIDER_NUMBER("atp.number"), - - /** - * Represents the 'atn.number' parameter constant. - */ - ATTRIBUTE_NAME_NUMBER("atn.number"), - - /** - * Represents the 'apLinker' parameter constant. - */ - AP_LINKER("apLinker"), - - /** - * Represents the 'prevApLinker' parameter constant. - */ - PREV_AP_LINKER("prevApLinker"), - - /** - * Represents the 'NOSEL' parameter constant (no attribute provider selected). - */ - AP_NO_SELECTION("NOSEL"), - - /** - * Represents the 'OCSEL' parameter constant (attribute provider in another country). - */ - AP_OTHER_COUNTRY("OCSEL"), - - /** - * Represents the '_provider' suffix parameter constant. - */ - AP_PROVIDER_SELECT_SUFFIX("_provider"), - - /** - * Represents the '_country' suffix parameter constant. - */ - AP_COUNTRY_SELECT_SUFFIX("_country"), - - /** - * Represents the '_name' suffix parameter constant. - */ - AP_NAME_SELECT_SUFFIX("_name"), - - /** - * Represents the 'next-ap' parameter constant. - */ - NEXT_AP("next-ap"), - - /** - * Represents the 'next-apeps' parameter constant. - */ - NEXT_APEPS("next-apeps"), - - /** - * Represents the 'back-to-apeps' parameter constant. - */ - BACK_TO_APEPS("back-to-apeps"), - - /** - * Represents the 'is-remote-apeps' parameter constant. - */ - IS_REMOTE_APEPS("is-remote-apeps"), - - /** - * Represents the 'more-attributes' parameter constant. - */ - MORE_ATTRIBUTES("more-attributes"), - - /** - * Represents the 'attr-filter.number' parameter constant. - */ - ATTRIBUTES_FILTER_NUMBER("attr-filter.number"), - - /** - * Represents the 'attr-group' parameter constant. - */ - ATTRIBUTE_GROUPS("attr-group"), - - /** - * Represents the 'all' parameter constant for attribute groups. - */ - ATTRIBUTE_GROUPS_ALL("all"), - - /** - * Represents the 'none' parameter constant for attribute groups. - */ - ATTRIBUTE_GROUPS_NONE("none"), - - /** - * Represents the 'atp.url' parameter constant. - */ - ATP_URL("atp.url"), - /** - * Represents the 'apepsURL' parameter constant. - */ - APEPS_URL("apepsUrl"), - - /** - * Represents the 'apepsCountry' parameter constant. - */ - APEPS_COUNTRY("apepsCountry"), - - /** - * Represents the 'apepsAuthRequest' parameter constant. - */ - APEPS_ATTR_REQUEST("apepsAttrRequest"), - - /** - * Represents the 'isApepsRequest' parameter constant. - */ - APEPS_REQUEST_COMPLETE("apeps-request-complete"), - - /** - * Represents the 'apeps.callbackUrl' parameter constant. - */ - APEPS_CALLBACK_URL("apeps.callbackUrl"), - /** - * Represents the 'attrListMand' parameter constant. - */ - ATTR_LIST_MAND("attrListMand"), - - /** - * Represents the 'attrListOpt' parameter constant. - */ - ATTR_LIST_OPT("attrListOpt"), - - /** - * Represents the 'simpleAttrListMand' parameter constant. - */ - SIMPLE_ATTR_LIST_MAND("simpleAttrListMand"), - - /** - * Represents the 'simpleAttrListOpt' parameter constant. - */ - SIMPLE_ATTR_LIST_OPT("simpleAttrListOpt"), - - /** - * Represents the 'complexAttrListMand' parameter constant. - */ - COMPLEX_ATTR_LIST_MAND("complexAttrListMand"), - - /** - * Represents the 'complexAttrListOpt' parameter constant. - */ - COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param nValue The Constant value. - */ - PEPSParameters(final String nValue) { - this.value = nValue; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - return value; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base deleted file mode 100644 index 69729c0bb..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSUtil.java.svn-base +++ /dev/null @@ -1,391 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.util.Properties; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.UrlBase64; - -import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException; -import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException; - -/** - * This class holds static helper methods. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.75 $, $Date: 2010-11-23 00:05:35 $ - */ -public final class PEPSUtil { - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(PEPSUtil.class.getName()); - - /** - * Configurations object. - */ - private static Properties configs; - - /** - * Max prefix. - */ - private static final String MAX_PARAM_PREFIX = "max."; - - /** - * Code prefix to get error code. - */ - private static final String CODE_PARAM_SUFFIX = ".code"; - - /** - * param's size prefix to get max param size. - */ - private static final String MAX_PARAM_SUFFIX = ".size"; - - /** - * Message prefix to get error message. - */ - private static final String MSG_PARAM_SUFFIX = ".message"; - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private PEPSUtil() { - // empty constructor - } - - /** - * Creates a single instance of this class and sets the properties. - * - * @param nConfigs The set of available configurations. - * - * @return The created PEPSUtil's class. - */ - public static PEPSUtil createInstance(final Properties nConfigs) { - if (nConfigs != null) { - PEPSUtil.configs = nConfigs; - } - return new PEPSUtil(); - } - - /** - * Getter for the Properties. - * - * @return configs The properties value. - */ - public Properties getConfigs() { - return configs; - } - - /** - * Setter for the Properties. - * - * @param nConfigs The new properties value. - */ - public static void setConfigs(final Properties nConfigs) { - if (nConfigs != null) { - PEPSUtil.configs = nConfigs; - } - } - - /** - * Returns the identifier of some configuration given a set of configurations - * and the corresponding configuration key. - * - * @param configKey The key that IDs some configuration. - * - * @return The configuration String value. - */ - public static String getConfig(final String configKey) { - return configs.getProperty(configKey); - } - - /** - * Validates the input paramValue identified by the paramName. - * - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * - * @return true if the parameter is valid. - */ - public static boolean isValidParameter(final String paramName, - final String paramValue) { - - final String validationParam = - PEPSUtil.getConfig(PEPSParameters.VALIDATION_ACTIVE.toString()); - boolean retVal = true; - - final String paramConf = MAX_PARAM_PREFIX + paramName + MAX_PARAM_SUFFIX; - - if (PEPSValues.TRUE.toString().equals(validationParam)) { - final String paramSizeStr = PEPSUtil.getConfig(paramConf); - // Checking if the parameter size exists and if it's numeric - if (StringUtils.isNumeric(paramSizeStr)) { - final int maxParamSize = Integer.valueOf(paramSizeStr); - if (StringUtils.isEmpty(paramValue) - || paramValue.length() > maxParamSize) { - retVal = false; - LOG.warn("Invalid parameter [" + paramName + "] value " + paramValue); - } - } else { - retVal = false; - LOG.error("Missing " + paramConf - + " configuration in the pepsUtils.properties configuration file"); - } - } - return retVal; - } - - /** - * Validates the Parameter and throws an exception if an error occurs. Throws - * an InvalidParameterPEPSException runtime exception if the parameter is - * invalid. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - */ - public static void validateParameter(final String className, - final String paramName, final Object paramValue) { - - if (paramValue == null) { - PEPSUtil.validateParameter(className, paramName, ""); - } else { - PEPSUtil.validateParameter(className, paramName, paramValue.toString()); - } - } - - /** - * Validates the Parameters and throws an exception if an error occurs. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue) { - - PEPSUtil.validateParameter(className, paramName, paramValue, - PEPSUtil.getErrorCode(paramName), PEPSUtil.getErrorMessage(paramName)); - } - - /** - * Validates the Parameters and throws an exception if an error occurs. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * @param error The PEPSError to get error code and messages from configs. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue, final PEPSErrors error) { - - PEPSUtil.validateParameter(className, paramName, paramValue, - PEPSUtil.getConfig(error.errorCode()), - PEPSUtil.getConfig(error.errorMessage())); - } - - /** - * Validates the HTTP Parameter and throws an exception if an error occurs. - * Throws an InvalidParameterPEPSException runtime exception if the parameter - * is invalid. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * @param errorCode The error code to include on the exception. - * @param errorMessage The error message to include on the exception. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue, final String errorCode, - final String errorMessage) { - - if (!isValidParameter(paramName, paramValue)) { - LOG.warn("Invalid parameter [" + paramName + "] value found at " - + className); - throw new InvalidParameterPEPSException(errorCode, errorMessage); - } - } - - /** - * Getter for the error code of some given error related to the input param. - * - * @param paramName The name of the parameter associated with the error. - * - * @return The code of the error. - */ - private static String getErrorCode(final String paramName) { - return getConfig(paramName + CODE_PARAM_SUFFIX); - } - - /** - * Getter for the error message of some given error related to the input - * parameter. - * - * @param paramName The name of the parameter associated with the message. - * - * @return The message for the error. - */ - private static String getErrorMessage(final String paramName) { - return getConfig(paramName + MSG_PARAM_SUFFIX); - } - - /** - * {@link Base64} encodes the input samlToken parameter. - * - * @param samlToken the SAML Token to be encoded. - * - * @return The Base64 String representing the samlToken. - * - * @see Base64#encode - */ - public static String encodeSAMLToken(final byte[] samlToken) { - try { - return new String(Base64.encode(samlToken), "UTF8"); - } catch (final UnsupportedEncodingException e) { - LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e); - return null; - } - } - - /** - * Encode samltoken url safe - * @param samlToken the saml token to encode - * @return the bas64 encoded string - */ - public static String encodeSAMLTokenUrlSafe(final byte[] samlToken) { - try { - return new String(UrlBase64.encode(samlToken), "UTF8"); - } catch (final UnsupportedEncodingException e) { - LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e); - return null; - } - } - - /** - * Decodes the {@link Base64} String input parameter representing a samlToken. - * - * @param samlToken the SAML Token to be decoded. - * - * @return The samlToken decoded bytes. - * - * @see Base64#decode - */ - public static byte[] decodeSAMLToken(final String samlToken) { - return Base64.decode(samlToken); - } - - /** - * Decode URL save base64 saml token - * @param samlToken the SAML toke to decode - * @return The decoded bytes - */ - public static byte[] decodeSAMLTokenUrlSafe(final String samlToken) { - return UrlBase64.decode(samlToken); - } - - /** - * Hashes a SAML token. Throws an InternalErrorPEPSException runtime exception - * if the Cryptographic Engine fails. - * - * @param samlToken the SAML Token to be hashed. - * - * @return byte[] with the hashed SAML Token. - */ - public static byte[] hashPersonalToken(final byte[] samlToken) { - try { - final String className = - PEPSUtil.getConfig(PEPSValues.HASH_DIGEST_CLASS.toString()); - - final Digest digest = - (Digest) Class.forName(className).getConstructor() - .newInstance((Object[]) null); - digest.update(samlToken, 0, samlToken.length); - - final int retLength = digest.getDigestSize(); - final byte[] ret = new byte[retLength]; - - digest.doFinal(ret, 0); - return ret; - - } catch (final Exception e) { - // For all those exceptions that could be thrown, we always log it and - // thrown an InternalErrorPEPSException. - LOG.error(PEPSErrors.HASH_ERROR.errorMessage(), e); - throw new InternalErrorPEPSException( - PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorCode()), - PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorMessage()), e); - } - } - - /** - * Gets the Stork error code in the error message if exists! - * - * @param errorMessage The message to get the error code if exists; - * - * @return the error code if exists. Returns null otherwise. - */ - public static String getStorkErrorCode(final String errorMessage) { - if (StringUtils.isNotBlank(errorMessage) - && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { - final String[] msgSplitted = - errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); - if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { - return msgSplitted[0]; - } - } - return null; - } - - /** - * Gets the Stork error message in the saml message if exists! - * - * @param errorMessage The message to get in the saml message if exists; - * - * @return the error message if exists. Returns the original message - * otherwise. - */ - public static String getStorkErrorMessage(final String errorMessage) { - if (StringUtils.isNotBlank(errorMessage) - && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { - final String[] msgSplitted = - errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); - if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { - return msgSplitted[1]; - } - } - return errorMessage; - } - - /** - * Get inputstream from string - * @param string the string to convert - * @param codePage the codepage of string - * @return an inputstream - * @throws UnsupportedEncodingException - */ - public static InputStream getStream(final String string, final String codePage) throws UnsupportedEncodingException - { - return new ByteArrayInputStream(string.getBytes(codePage)); - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base deleted file mode 100644 index 89cf8fa9b..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PEPSValues.java.svn-base +++ /dev/null @@ -1,342 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains all the value constants. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.17 $, $Date: 2011-07-07 20:48:45 $ - */ -public enum PEPSValues { - - /** - * Represents the 'all' constant value. - */ - ALL("all"), - /** - * Represents the 'none' constant value. - */ - NONE("none"), - /** - * Represents the 'true' constant value. - */ - TRUE("true"), - /** - * Represents the 'false' constant value. - */ - FALSE("false"), - /** - * Represents the empty string constant value. - */ - EMPTY_STRING(""), - - /** - * Represents the ',' separator constant value. - */ - ATTRIBUTE_VALUE_SEP(","), - /** - * Represents the ';' separator constant value. - */ - ATTRIBUTE_SEP(";"), - /** - * Represents the ':' separator constant value. - */ - ATTRIBUTE_TUPLE_SEP(":"), - /** - * Represents the '/' separator constant value. - */ - EID_SEPARATOR("/"), - /** - * Represents the ' - ' separator constant value. - */ - ERROR_MESSAGE_SEP(" - "), - /** - * Represents the '#' parameter constant value. - */ - LOGGER_SEP("#"), - /** - * Represents the 'NOT_AVAILABLE' parameter constant value. - */ - NOT_AVAILABLE("NotAvailable"), - /** - * Represents the ';' parameter constant value. - */ - SPEPS_AUTHORIZED_SEP(";"), - - /** - * Represents the 'ap' constant value. - */ - AP("ap"), - /** - * Represents the 'C-PEPS' constant value. - */ - CPEPS("C-PEPS"), - /** - * Represents the 'cpeps' constant value. - */ - CPEPS_PREFIX("cpeps"), - /** - * Represents the 'peps' constant value. - */ - PEPS("peps"), - /** - * Represents the '-PEPS' constant value. - */ - PEPS_SUFFIX("-PEPS"), - /** - * Represents the 'SP' constant value. - */ - SP("SP"), - /** - * Represents the 'S-PEPS' constant value. - */ - SPEPS("S-PEPS"), - /** - * Represents the 'speps' constant value. - */ - SPEPS_PREFIX("speps"), - /** - * Represents the 'sp.default.parameters' constant value. - */ - DEFAULT("sp.default.parameters"), - /** - * Represents the default saml id constant value. - */ - DEFAULT_SAML_ID("1"), - /** - * Represents the 'hashDigest.className' constant value. - */ - HASH_DIGEST_CLASS("hashDigest.className"), - - /** - * Represents the 'eu.stork.communication.requests' constant value. - */ - STORK_PACKAGE_REQUEST_LOGGER_VALUE("eu.stork.communication.requests"), - /** - * Represents the 'eu.stork.communication.responses' constant value. - */ - STORK_PACKAGE_RESPONSE_LOGGER_VALUE("eu.stork.communication.responses"), - - /** - * Represents the 'S-PEPS receives request from SP' constant value. - */ - SP_REQUEST("S-PEPS receives request from SP"), - /** - * Represents the 'Get Citizen Consent' constant value. - */ - CITIZEN_CONSENT_LOG("Get Citizen Consent"), - /** - * Represents the 'C-PEPS receives request from S-PEPS' constant value. - */ - CPEPS_REQUEST("C-PEPS receives request from S-PEPS"), - /** - * Represents the 'C-PEPS generates response to S-PEPS' constant value. - */ - CPEPS_RESPONSE("C-PEPS generates response to S-PEPS"), - /** - * Represents the 'S-PEPS generates request to C-PEPS' constant value. - */ - SPEPS_REQUEST("S-PEPS generates request to C-PEPS"), - /** - * Represents the 'S-PEPS receives response from C-PEPS' constant value. - */ - SPEPS_RESPONSE("S-PEPS receives response from C-PEPS"), - /** - * Represents the 'S-PEPS generates response to SP' constant value. - */ - SP_RESPONSE("S-PEPS generates response to SP"), - /** - * Represents the 'Success' constant value. - */ - SUCCESS("Success"), - /** - * Represents the December's month number constant value. - */ - LAST_MONTH("12"), - /** - * Represents the yyyyMM constant value. - */ - NO_DAY_DATE_FORMAT("yyyyMM"), - - /** - * Represents the 'attrValue' constant value. - */ - ATTRIBUTE("attrValue"), - /** - * Represents the 'derivedAttr' constant value. - */ - DERIVE_ATTRIBUTE("deriveAttr"), - /** - * Represents the 'storkAttribute' constant value. - */ - STORK_ATTRIBUTE("storkAttribute"), - - /** - * Represents the 'properties' constant value. - */ - PROPERTIES("properties"), - /** - * Represents the 'referer' constant value. - */ - REFERER("referer"), - /** - * Represents the 'host' constant value. - */ - HOST("host"), - /** - * Represents the 'spid' constant value. - */ - SPID("spid"), - /** - * Represents the 'domain' constant value. - */ - DOMAIN("domain"), - /** - * Represents the '.validation' constant value. - */ - VALIDATION_SUFFIX(".validation"), - /** - * Represents the 'jsessionid' constant value. - */ - EQUAL("="), - /** - * Represents the 'HttpOnly' constant value. - */ - HTTP_ONLY("HttpOnly"), - /** - * Represents the 'SET-COOKIE' constant value. - */ - JSSESSION("JSESSIONID"), - /** - * Represents the '=' constant value. - */ - SETCOOKIE("SET-COOKIE"), - /** - * Represents the ';' constant value. - */ - SEMICOLON(";"), - /** - * Represents the ' ' constant value. - */ - SPACE(" "), - /** - * Represents the 'atp' constant value. - */ - APROVIDER_PREFIX("atp"), - /** - * Represents the 'atn' constant value. - */ - ANAME_PREFIX("atn"), - /** - * Represents the 'ap-cpeps' constant value. - */ - AP_CPEPS_PREFIX("ap-cpeps"), - /** - * Represents the 'attr-filter' constant value. - */ - AP_ATTRFILTER_PREFIX("attr-filter"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - PEPSValues(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".id". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String index(final int index) { - - return value + index + ".id"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".value". - * - * @param index the number. - * - * @return The concatenated string value. - */ - public String value(final int index) { - - return value + index + ".value"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".name". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String name(final int index) { - - return value + index + ".name"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".url". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String url(final int index) { - - return value + index + ".url"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".allowedGroups". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String allowedGroups(final int index) { - - return value + index + ".allowedGroups"; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base deleted file mode 100644 index 5d8281445..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttribute.java.svn-base +++ /dev/null @@ -1,348 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.log4j.Logger; - -import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException; - -/** - * This class is a bean used to store the information relative to the - * PersonalAttribute. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.22 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class PersonalAttribute implements Serializable, Cloneable { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 2612951678412632174L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(PersonalAttribute.class - .getName()); - - /** - * Name of the personal attribute. - */ - private String name; - - /** - * Values of the personal attribute. - */ - private List value = new ArrayList(); - - /** - * Type of the personal attribute. - */ - private String type; - - /** - * Complex values of the personal attribute. - */ - private Map complexValue = new ConcurrentHashMap(); - - /** - * Is the personal attribute mandatory? - */ - private transient boolean required; - - /** - * Returned status of the attribute from the IdP. - */ - private String status; - - /** - * Name of the personal attribute. - */ - private String friendlyName; - - /** - * Empty Constructor. - */ - public PersonalAttribute() { - super(); - } - - /** - * PersonalAttribute Constructor for complex values. - * - * @param attrName The attribute name. - * @param attrIsRequired The attribute type value. - * @param attrComplexValue The attribute's value. - * @param attrStatus The attribute's status value. - */ - public PersonalAttribute(final String attrName, final boolean attrIsRequired, - final List attrComplexValue, final String attrStatus) { - this.setName(attrName); - this.setIsRequired(attrIsRequired); - this.setValue(attrComplexValue); - this.setStatus(attrStatus); - } - - /** - * PersonalAttribute Constructor for complex values. - * - * @param attrName The attribute name. - * @param attrIsRequired The attribute type value. - * @param attrComplexValue The attribute's complex value. - * @param attrStatus The attribute's status value. - */ - public PersonalAttribute(final String attrName, final boolean attrIsRequired, - final Map attrComplexValue, final String attrStatus) { - this.setName(attrName); - this.setIsRequired(attrIsRequired); - this.setComplexValue(attrComplexValue); - this.setStatus(attrStatus); - } - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - public Object clone() { - - try { - final PersonalAttribute personalAttr = (PersonalAttribute) super.clone(); - personalAttr.setIsRequired(this.isRequired()); - personalAttr.setName(this.getName()); - personalAttr.setStatus(this.getStatus()); - if (!isEmptyValue()) { - final List val = - (List) ((ArrayList) this.getValue()).clone(); - personalAttr.setValue(val); - } - if (!isEmptyComplexValue()) { - final Map complexVal = - (Map) ((HashMap) this - .getComplexValue()).clone(); - personalAttr.setComplexValue(complexVal); - } - return personalAttr; - } catch (final CloneNotSupportedException e) { - // assert false; - LOG.trace("Nothing to do."); - throw new InternalErrorPEPSException( - PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorMessage()), e); - } - } - - /** - * Getter for the required value. - * - * @return The required value. - */ - public boolean isRequired() { - return required; - } - - /** - * Setter for the required value. - * - * @param attrIsRequired this attribute? - */ - public void setIsRequired(final boolean attrIsRequired) { - this.required = attrIsRequired; - } - - /** - * Getter for the name value. - * - * @return The name value. - */ - public String getName() { - return name; - } - - /** - * Setter for the name value. - * - * @param attrName The personal attribute name. - */ - public void setName(final String attrName) { - this.name = attrName; - } - - /** - * Getter for the value. - * - * @return The list of values. - */ - public List getValue() { - return value; - } - - /** - * Setter for the list of values. - * - * @param attrValue The personal attribute value. - */ - public void setValue(final List attrValue) { - if (attrValue != null) { - this.value = attrValue; - } - } - - - /** - * Getter for the type value. - * - * @return The name value. - */ - public String getType() { - return type; - } - - /** - * Setter for the type value. - * - * @param attrName The personal attribute type. - */ - public void setType(final String attrType) { - this.type = attrType; - } - - /** - * Getter for the status. - * - * @return The status value. - */ - public String getStatus() { - return status; - } - - /** - * Setter for the status value. - * - * @param attrStatus The personal attribute status. - */ - public void setStatus(final String attrStatus) { - this.status = attrStatus; - } - - /** - * Getter for the complex value. - * - * @return The complex value. - */ - public Map getComplexValue() { - return complexValue; - } - - /** - * Setter for the complex value. - * - * @param complexVal The personal attribute Complex value. - */ - public void setComplexValue(final Map complexVal) { - if (complexVal != null) { - this.complexValue = complexVal; - } - } - - /** - * Getter for the personal's friendly name. - * - * @return The personal's friendly name value. - */ - public String getFriendlyName() { - return friendlyName; - } - - /** - * Setter for the personal's friendly name. - * - * @param fName The personal's friendly name. - */ - public void setFriendlyName(final String fName) { - this.friendlyName = fName; - } - - /** - * Return true the value is empty. - * - * @return True if the value is empty "[]"; - */ - public boolean isEmptyValue() { - return value.isEmpty() || (value.size() == 1 && value.get(0).length() == 0); - } - - /** - * Returns true if the Complex Value is empty. - * - * @return True if the Complex Value is empty; - */ - public boolean isEmptyComplexValue() { - return complexValue.isEmpty(); - } - - /** - * Returns true if the Status is empty. - * - * @return True if the Status is empty; - */ - public boolean isEmptyStatus() { - return (status == null || status.length() == 0); - } - - /** - * Prints the PersonalAttribute in the following format. - * name:required:[v,a,l,u,e,s]|[v=a,l=u,e=s]:status; - * - * @return The PersonalAttribute as a string. - */ - public String toString() { - final StringBuilder strBuild = new StringBuilder(); - - AttributeUtil.appendIfNotNull(strBuild, getName()); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - AttributeUtil.appendIfNotNull(strBuild, String.valueOf(isRequired())); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - strBuild.append('['); - - if (isEmptyValue()) { - if (!isEmptyComplexValue()) { - AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.mapToString( - getComplexValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); - } - } else { - AttributeUtil.appendIfNotNull( - strBuild, - AttributeUtil.listToString(getValue(), - PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); - } - - strBuild.append(']'); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - AttributeUtil.appendIfNotNull(strBuild, getStatus()); - strBuild.append(PEPSValues.ATTRIBUTE_SEP.toString()); - - return strBuild.toString(); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base deleted file mode 100644 index 642b249d4..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/PersonalAttributeList.java.svn-base +++ /dev/null @@ -1,396 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.StringTokenizer; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information relative to the - * PersonalAttributeList. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.27 $, $Date: 2010-11-18 22:54:56 $ - * - * @see PersonalAttribute - */ -@SuppressWarnings("PMD") -public final class PersonalAttributeList extends - ConcurrentHashMap implements IPersonalAttributeList{ - - /** - * Logger object. - */ - private static final Logger LOG = Logger - .getLogger(PersonalAttributeList.class.getName()); - - /** - * Serial id. - */ - private static final long serialVersionUID = 7375127363889975062L; - - /** - * Hash with the latest fetched attribute name alias. - */ - private final transient Map latestAttrAlias = - new HashMap(); - - /** - * Hash with mapping number of alias or the attribute name. - */ - private final transient Map attrAliasNumber = - new HashMap(); - - /** - * Default constructor. - */ - public PersonalAttributeList() { - // The best practices recommend to call the super constructor. - super(); - } - - /** - * Constructor with initial capacity for the PersonalAttributeList size. - * - * @param capacity The initial capacity for the PersonalAttributeList. - */ - public PersonalAttributeList(final int capacity) { - super(capacity); - } - - /** - * {@inheritDoc} - */ - public Iterator iterator() { - return this.values().iterator(); - } - - /** - * {@inheritDoc} - */ - public PersonalAttribute get(final Object key) { - String attrName = (String) key; - - if (this.latestAttrAlias.containsKey(key)) { - attrName = attrName + this.latestAttrAlias.get(key); - } else { - if (this.attrAliasNumber.containsKey(key)) { - this.latestAttrAlias.put(attrName, this.attrAliasNumber.get(key)); - } - } - return super.get(attrName); - } - - /** - * {@inheritDoc} - */ - public void add(final PersonalAttribute value) { - if (value != null) { - this.put(value.getName(), value); - } - } - - /** - * {@inheritDoc} - */ - public PersonalAttribute put(final String key, final PersonalAttribute val) { - if (StringUtils.isNotEmpty(key) && val != null) { - // Validate if attribute name already exists! - String attrAlias = key; - if (this.containsKey(attrAlias)) { - //TODO isAgeOver should not be hardcoded, a better way of handling multipe isAgeOver requests should be implemented. - if (!val.isEmptyValue() && StringUtils.isNumeric(val.getValue().get(0)) && "isAgeOver".equals( val.getName() ) ) { - final String attrValue = val.getValue().get(0); - attrAlias = key + attrValue; - this.attrAliasNumber.put(key, Integer.valueOf(attrValue)); - } else { - final PersonalAttribute attr = super.get(key); - if (!attr.isEmptyValue() - && StringUtils.isNumeric(attr.getValue().get(0))) { - attrAlias = key + attr.getValue().get(0); - super.put(key, (PersonalAttribute) attr); - this.attrAliasNumber.put(key, null); - } - } - } - return super.put(attrAlias, val); - } else { - return null; - } - } - - /** - * {@inheritDoc} - */ - public void populate(final String attrList) { - final StringTokenizer strToken = - new StringTokenizer(attrList, PEPSValues.ATTRIBUTE_SEP.toString()); - - while (strToken.hasMoreTokens()) { - final PersonalAttribute persAttr = new PersonalAttribute(); - String[] tuples = - strToken.nextToken().split(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(), - AttributeConstants.NUMBER_TUPLES.intValue()); - - // Convert to the new format if needed! - tuples = convertFormat(tuples); - - if (AttributeUtil.hasValidTuples(tuples)) { - final int attrValueIndex = - AttributeConstants.ATTR_VALUE_INDEX.intValue(); - final String tmpAttrValue = - tuples[attrValueIndex].substring(1, - tuples[attrValueIndex].length() - 1); - final String[] vals = - tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - persAttr.setName(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()]); - persAttr.setIsRequired(Boolean - .valueOf(tuples[AttributeConstants.ATTR_TYPE_INDEX.intValue()])); - - // check if it is a complex value - if (isComplexValue(vals)) { - persAttr.setComplexValue(createComplexValue(vals)); - } - else - { - persAttr.setValue(createValues(vals)); - } - - if (tuples.length == AttributeConstants.NUMBER_TUPLES.intValue()) { - persAttr.setStatus(tuples[AttributeConstants.ATTR_STATUS_INDEX - .intValue()]); - } - this.put(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()], - persAttr); - - } else { - LOG.warn("Invalid personal attribute list tuples"); - } - - } - } - - /** - * Returns a copy of this IPersonalAttributeList instance. - * - * @return The copy of this IPersonalAttributeList. - */ - public Object clone() { - try { - return (PersonalAttributeList) super.clone(); - } catch (CloneNotSupportedException e) { - return null; - } - } - - /** - * Creates a string in the following format. - * - * attrName:attrType:[attrValue1,attrValue2=attrComplexValue]:attrStatus; - * - * @return {@inheritDoc} - */ - @Override - public String toString() { - final Iterator> itAttrs = - this.entrySet().iterator(); - final StringBuilder strBuilder = new StringBuilder(); - - while (itAttrs.hasNext()) { - final Entry attrEntry = itAttrs.next(); - final PersonalAttribute attr = attrEntry.getValue(); - //strBuilder.append(attr.toString()); - strBuilder.insert(0, attr.toString()); - } - - return strBuilder.toString(); - } - - /** - * Validates and creates the attribute's complex values. - * - * @param values The complex values. - * - * @return The {@link Map} with the complex values. - * - * @see Map - */ - private Map createComplexValue(final String[] values) { - final Map complexValue = new HashMap(); - for (final String val : values) { - final String[] tVal = val.split("="); - if (StringUtils.isNotEmpty(val) && tVal.length == 2) { - complexValue.put(tVal[0], AttributeUtil.unescape(tVal[1])); - } - } - return complexValue; - } - - /** - * Checks if value is complex or not - * @param values The values to check - * @return True if succesful - */ - private boolean isComplexValue(final String[] values) { - boolean isComplex = false; - if (values.length > 0) { - final String[] tVal = values[0].split("="); - if (StringUtils.isNotEmpty(values[0]) && tVal.length == 2) { - isComplex = true; - } - } - return isComplex; - } - - /** - * Validates and creates the attribute values. - * - * @param vals The attribute values. - * - * @return The {@link List} with the attribute values. - * - * @see List - */ - private List createValues(final String[] vals) { - final List values = new ArrayList(); - for (final String val : vals) { - if (StringUtils.isNotEmpty(val)) { - values.add(AttributeUtil.unescape(val)); - } - } - return values; - } - - /** - * Converts the attribute tuple (attrName:attrType...) to the new format. - * - * @param tuples The attribute tuples to convert. - * - * @return The attribute tuples in the new format. - */ - private String[] convertFormat(final String[] tuples) { - final String[] newFormatTuples = - new String[AttributeConstants.NUMBER_TUPLES.intValue()]; - if (tuples != null) { - System.arraycopy(tuples, 0, newFormatTuples, 0, tuples.length); - - for (int i = tuples.length; i < newFormatTuples.length; i++) { - if (i == AttributeConstants.ATTR_VALUE_INDEX.intValue()) { - newFormatTuples[i] = "[]"; - } else { - newFormatTuples[i] = ""; - } - } - } - return newFormatTuples; - } - - /** - * Returns a IPersonalAttributeList of the complex attributes in this map. - * - * @return an IPersonalAttributeList of the complex attributes contained in this map. - */ - public IPersonalAttributeList getComplexAttributes() { - LOG.info("get complex attributes"); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(!attr.getComplexValue().isEmpty()) { - attrList.put(attr.getName(), attr); - LOG.info("adding complex attribute:"+attr.getName()); - } - } - return attrList; - } - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - public IPersonalAttributeList getSimpleValueAttributes() { - LOG.info("get simple attributes"); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(attr.getComplexValue().isEmpty()) { - attrList.put(attr.getName(), attr); - LOG.info("adding simple attribute:"+attr.getName()); - } - } - return attrList; - } - - - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - public IPersonalAttributeList getMandatoryAttributes() { - return getAttributesByParam(true); - } - - - /** - * Returns a IPersonalAttributeList of the attributes in this map by parameter value. - * - * @param compareValue The boolean to get mandatory (true) or optional (false) attributes. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map if compareValue is true or optional otherwise. - */ - private IPersonalAttributeList getAttributesByParam(final boolean compareValue) { - LOG.info("get attributes by param :"+compareValue); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(attr.isRequired() == compareValue) { - attrList.put(attr.getName(), attr); - LOG.info("adding attribute:"+attr.getName()); - } - } - return attrList; - } - - - /** - * Returns a IPersonalAttributeList of the optional attributes in this map. - * - * @return an IPersonalAttributeList of the optional attributes contained in this map. - */ - public IPersonalAttributeList getOptionalAttributes() { - return getAttributesByParam(false); - } - - /** - * {@inheritDoc} - */ - public boolean hasMissingValues() { - for(PersonalAttribute attr: this) { - if(attr.isEmptyValue() && attr.isEmptyComplexValue()) { - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base deleted file mode 100644 index 65936f1a8..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryRequest.java.svn-base +++ /dev/null @@ -1,447 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -import org.apache.log4j.Logger; - -public class STORKAttrQueryRequest implements Serializable, Cloneable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 4778480781609392750L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAttrQueryRequest.class - .getName()); - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The assertion consumer service url. */ - private String serviceURL; - - /** The distinguished name. */ - private String distinguishedName; - - /** The e id sector share. */ - private boolean eIDSectorShare; - - /** The e id cross sector share. */ - private boolean eIDCrossSectorShare; - - /** The e id cross border share. */ - private boolean eIDCrossBorderShare; - - /** The personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The service provider sector. */ - private String spSector; - - /** The service provider institution. */ - private String spInstitution; - - /** The service provider application. */ - private String spApplication; - - /** The service provider country. */ - private String spCountry; - - /** The country. */ - private String country; - - /** The citizen country code. */ - private String citizenCountry; - - /** The Service Provider ID. */ - private String sPID; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the SP ID. - * - * @return sPID The SP ID. - */ - public String getSPID() { - return sPID; - } - - /** - * Sets the SP ID. - * - * @param sPId The new sp samlId. - */ - public void setSPID(final String sPId) { - this.sPID = sPId; - } - - /** - * Gets the citizen country code. - * - * @return The citizen country code value. - */ - public String getCitizenCountryCode() { - return citizenCountry; - } - - /** - * Sets the citizen country code. - * - * @param countryCode the new citizen country code value. - */ - public void setCitizenCountryCode(final String countryCode) { - this.citizenCountry = countryCode; - } - - /** - * Gets the sp country. - * - * @return The sp country value. - */ - public String getSpCountry() { - return spCountry; - } - - /** - * Sets the sp country. - * - * @param sPCountry the new sp country value. - */ - public void setSpCountry(final String sPCountry) { - this.spCountry = sPCountry; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the serviceURL value. - * - * @return The serviceURL value. - */ - public String getAssertionConsumerServiceURL() { - return serviceURL; - } - - /** - * Setter for the serviceURL value. - * - * @param newServiceURL the assertion consumer service URL. - */ - public void setAssertionConsumerServiceURL(final String newServiceURL) { - this.serviceURL = newServiceURL; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - - /** - * Getter for the attributeList value. - * - * @return The attributeList value. - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the attributeList value. - * - * @param attrList the personal attribute list value. - * - * @see IPersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** - * Gets the service provider sector. - * - * @return The service provider sector value. - */ - public String getSpSector() { - return spSector; - } - - /** - * Sets the service provider sector. - * - * @param samlSPSector the new service provider sector value. - */ - public void setSpSector(final String samlSPSector) { - this.spSector = samlSPSector; - } - - /** - * Gets the service provider institution. - * - * @return The service provider institution value. - */ - public String getSpInstitution() { - return spInstitution; - } - - /** - * Sets the service provider institution. - * - * @param samlSPInst the new service provider institution value. - */ - public void setSpInstitution(final String samlSPInst) { - this.spInstitution = samlSPInst; - } - - /** - * Gets the service provider application. - * - * @return The service provider application value. - */ - public String getSpApplication() { - return spApplication; - } - - /** - * Sets the service provider application. - * - * @param samlSPApp the new service provider application value. - */ - public void setSpApplication(final String samlSPApp) { - this.spApplication = samlSPApp; - } - - /** - * Checks if is eId sector share. - * - * @return true, if is eId sector share. - */ - public boolean isEIDSectorShare() { - return eIDSectorShare; - } - - /** - * Sets the eId sector share. - * - * @param eIdSectorShare the new eId sector share value. - */ - public void setEIDSectorShare(final boolean eIdSectorShare) { - this.eIDSectorShare = eIdSectorShare; - } - - /** - * Checks if is eId cross sector share. - * - * @return true, if is eId cross sector share. - */ - public boolean isEIDCrossSectorShare() { - return eIDCrossSectorShare; - } - - /** - * Sets the eId cross sector share. - * - * @param eIdCrossSectorShare the new eId cross sector share value. - */ - public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { - this.eIDCrossSectorShare = eIdCrossSectorShare; - } - - /** - * Checks if is eId cross border share. - * - * @return true, if is eId cross border share. - */ - public boolean isEIDCrossBorderShare() { - return eIDCrossBorderShare; - } - - /** - * Sets the eId cross border share. - * - * @param eIdCrossBorderShare the new eId cross border share value. - */ - public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { - this.eIDCrossBorderShare = eIdCrossBorderShare; - } - - /** - * Returns a copy of this STORKAttrQueryRequest instance. - * - * @return The copy of this STORKAttrQueryRequest. - * @throws CloneNotSupportedException on clone exception - */ - @Override - public Object clone() throws CloneNotSupportedException{ - STORKAttrQueryRequest storkAttrQueryReq = null; - storkAttrQueryReq = (STORKAttrQueryRequest) super.clone(); - storkAttrQueryReq.setPersonalAttributeList(getPersonalAttributeList()); - storkAttrQueryReq.setTokenSaml(getTokenSaml()); - return storkAttrQueryReq; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base deleted file mode 100644 index 4e40d6d01..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAttrQueryResponse.java.svn-base +++ /dev/null @@ -1,388 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.List; - -import org.apache.log4j.Logger; -import org.joda.time.DateTime; -import org.opensaml.saml2.core.Assertion; - -public class STORKAttrQueryResponse { - - /** Response Id. */ - private String samlId; - - /** Request failed? */ - private boolean fail; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Audience restriction. */ - private transient String audienceRest; - - /** Error message. */ - private String message; - - /** Id of the request that originated this response. */ - private String inResponseTo; - - /** Expiration date. */ - private DateTime notOnOrAfter; - - /** Creation date. */ - private DateTime notBefore; - - /** The SAML token. */ - private byte[] tokenSaml = new byte[0]; - - /** Country. */ - private String country; - - /** The complete assertion **/ - private Assertion assertion; - - /** List of all assertions in response **/ - private List assertions; - - /** The complete list from all assertions **/ - private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); - - /** All personal attribute lists **/ - private List attributeLists; - - /** Citizen's personal attribute list. */ - private transient IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAttrQueryResponse.class.getName()); - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Getter for audienceRest. - * - * @return The audienceRest value. - */ - public String getAudienceRestriction() { - return audienceRest; - } - - /** - * Setter for audienceRest. - * - * @param audRest the new audienceRest value. - */ - public void setAudienceRestriction(final String audRest) { - this.audienceRest = audRest; - } - - /** - * Getter for the samlToken. - * - * @return The samlToken value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Setter for samlToken. - * - * @param samlToken the new tokenSaml value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Getter for the country name. - * - * @return The country name value. - */ - public String getCountry() { - return country; - } - - /** - * Setter for the country name. - * - * @param cCountry the new country name value. - */ - public void setCountry(final String cCountry) { - this.country = cCountry; - } - - /** - * Getter for pal value. - * - * @return The pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the inResponseTo value. - * - * @return The inResponseTo value. - */ - public String getInResponseTo() { - return inResponseTo; - } - - /** - * Setter for the inResponseTo value. - * - * @param samlInResponseTo the new inResponseTo value. - */ - public void setInResponseTo(final String samlInResponseTo) { - this.inResponseTo = samlInResponseTo; - } - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the message value. - * - * @return The message value. - */ - public String getMessage() { - return message; - } - - /** - * Setter for the message value. - * - * @param msg the new message value. - */ - public void setMessage(final String msg) { - this.message = msg; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param nSamlId the new samlId value. - */ - public void setSamlId(final String nSamlId) { - this.samlId = nSamlId; - } - - /** - * Getter for the notOnOrAfter value. - * - * @return The notOnOrAfter value. - * - * @see DateTime - */ - public DateTime getNotOnOrAfter() { - return this.notOnOrAfter; - } - - /** - * Setter for the notOnOrAfter value. - * - * @param nOnOrAfter the new notOnOrAfter value. - * - * @see DateTime - */ - public void setNotOnOrAfter(final DateTime nOnOrAfter) { - this.notOnOrAfter = nOnOrAfter; - } - - /** - * Getter for the notBefore value. - * - * @return The notBefore value. - * - * @see DateTime - */ - public DateTime getNotBefore() { - return notBefore; - } - - /** - * Setter for the notBefore value. - * - * @param nBefore the new notBefore value. - * - * @see DateTime - */ - public void setNotBefore(final DateTime nBefore) { - this.notBefore = nBefore; - } - - /** Get the assertion from the response **/ - public Assertion getAssertion() { - return assertion; - } - - /** Set the assertion in the response **/ - public void setAssertion(final Assertion nAssertion) { - this.assertion = nAssertion; - } - - public void setAssertions(List newAssert) { - this.assertions = newAssert; - } - - public List getAssertions() { - return assertions; - } - - /** - * Getter for the toal pal value. - * - * @return The total pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getTotalPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the total Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.totalAttributeList = attrList; - } - } - - /** - * Getter for personal attribute lists - * - * @return The lists - * - * @see PersonalAttributeList - */ - public List getPersonalAttributeLists() { - return attributeLists; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeLists(final List attrLists) { - if (attrLists != null) { - this.attributeLists = attrLists; - } - } - -} - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base deleted file mode 100644 index 2354d0eb1..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnRequest.java.svn-base +++ /dev/null @@ -1,495 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -import org.apache.log4j.Logger; - -/** - * This class is a bean used to store the information relative to the - * STORKAuthnRequest (SAML Token Request). - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.21 $, $Date: 2011-02-17 22:44:34 $ - */ -public final class STORKAuthnRequest implements Serializable, Cloneable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 4778480781609392750L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAuthnRequest.class - .getName()); - - /** The samlId. */ - private String samlId; - - /** The assertion consumer service url. */ - private String serviceURL; - - /** The destination. */ - private String destination; - - /** The provider name. */ - private String providerName; - - /** The distinguished name. */ - private String distinguishedName; - - /** The e id sector share. */ - private boolean eIDSectorShare; - - /** The e id cross sector share. */ - private boolean eIDCrossSectorShare; - - /** The e id cross border share. */ - private boolean eIDCrossBorderShare; - - /** The personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The service provider sector. */ - private String spSector; - - /** The service provider institution. */ - private String spInstitution; - - /** The service provider application. */ - private String spApplication; - - /** The service provider country. */ - private String spCountry; - - /** The country. */ - private String country; - - /** The citizen country code. */ - private String citizenCountry; - - /** The Service Provider ID. */ - private String sPID; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the SP ID. - * - * @return sPID The SP ID. - */ - public String getSPID() { - return sPID; - } - - /** - * Sets the SP ID. - * - * @param sPId The new sp samlId. - */ - public void setSPID(final String sPId) { - this.sPID = sPId; - } - - /** - * Gets the citizen country code. - * - * @return The citizen country code value. - */ - public String getCitizenCountryCode() { - return citizenCountry; - } - - /** - * Sets the citizen country code. - * - * @param countryCode the new citizen country code value. - */ - public void setCitizenCountryCode(final String countryCode) { - this.citizenCountry = countryCode; - } - - /** - * Gets the sp country. - * - * @return The sp country value. - */ - public String getSpCountry() { - return spCountry; - } - - /** - * Sets the sp country. - * - * @param sPCountry the new sp country value. - */ - public void setSpCountry(final String sPCountry) { - this.spCountry = sPCountry; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the serviceURL value. - * - * @return The serviceURL value. - */ - public String getAssertionConsumerServiceURL() { - return serviceURL; - } - - /** - * Setter for the serviceURL value. - * - * @param newServiceURL the assertion consumer service URL. - */ - public void setAssertionConsumerServiceURL(final String newServiceURL) { - this.serviceURL = newServiceURL; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the providerName value. - * - * @return The provider name value. - */ - public String getProviderName() { - return providerName; - } - - /** - * Setter for the providerName value. - * - * @param samlProvider the provider name value. - */ - public void setProviderName(final String samlProvider) { - this.providerName = samlProvider; - } - - /** - * Getter for the attributeList value. - * - * @return The attributeList value. - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the attributeList value. - * - * @param attrList the personal attribute list value. - * - * @see IPersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** - * Gets the service provider sector. - * - * @return The service provider sector value. - */ - public String getSpSector() { - return spSector; - } - - /** - * Sets the service provider sector. - * - * @param samlSPSector the new service provider sector value. - */ - public void setSpSector(final String samlSPSector) { - this.spSector = samlSPSector; - } - - /** - * Gets the service provider institution. - * - * @return The service provider institution value. - */ - public String getSpInstitution() { - return spInstitution; - } - - /** - * Sets the service provider institution. - * - * @param samlSPInst the new service provider institution value. - */ - public void setSpInstitution(final String samlSPInst) { - this.spInstitution = samlSPInst; - } - - /** - * Gets the service provider application. - * - * @return The service provider application value. - */ - public String getSpApplication() { - return spApplication; - } - - /** - * Sets the service provider application. - * - * @param samlSPApp the new service provider application value. - */ - public void setSpApplication(final String samlSPApp) { - this.spApplication = samlSPApp; - } - - /** - * Checks if is eId sector share. - * - * @return true, if is eId sector share. - */ - public boolean isEIDSectorShare() { - return eIDSectorShare; - } - - /** - * Sets the eId sector share. - * - * @param eIdSectorShare the new eId sector share value. - */ - public void setEIDSectorShare(final boolean eIdSectorShare) { - this.eIDSectorShare = eIdSectorShare; - } - - /** - * Checks if is eId cross sector share. - * - * @return true, if is eId cross sector share. - */ - public boolean isEIDCrossSectorShare() { - return eIDCrossSectorShare; - } - - /** - * Sets the eId cross sector share. - * - * @param eIdCrossSectorShare the new eId cross sector share value. - */ - public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { - this.eIDCrossSectorShare = eIdCrossSectorShare; - } - - /** - * Checks if is eId cross border share. - * - * @return true, if is eId cross border share. - */ - public boolean isEIDCrossBorderShare() { - return eIDCrossBorderShare; - } - - /** - * Sets the eId cross border share. - * - * @param eIdCrossBorderShare the new eId cross border share value. - */ - public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { - this.eIDCrossBorderShare = eIdCrossBorderShare; - } - - /** - * Returns a copy of this STORKAuthnRequest instance. - * - * @return The copy of this STORKAuthnRequest. - * @throws CloneNotSupportedException on clone exception - */ - @Override - public Object clone() throws CloneNotSupportedException{ - STORKAuthnRequest storkAuthnReq = null; - try { - storkAuthnReq = (STORKAuthnRequest) super.clone(); - storkAuthnReq.setPersonalAttributeList(getPersonalAttributeList()); - storkAuthnReq.setTokenSaml(getTokenSaml()); - } catch (final CloneNotSupportedException e) { - // assert false; - LOG.trace("[PersonalAttribute] Nothing to do."); - } - - return storkAuthnReq; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base deleted file mode 100644 index 84fadd023..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKAuthnResponse.java.svn-base +++ /dev/null @@ -1,383 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -import java.util.List; - -import org.apache.log4j.Logger; -import org.joda.time.DateTime; -import org.opensaml.saml2.core.Assertion; - -/** - * This class is a bean used to store the information relative to the - * STORKAuthnResponse. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class STORKAuthnResponse { - - /** Response Id. */ - private String samlId; - - /** Authentication failed? */ - private boolean fail; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Audience restriction. */ - private transient String audienceRest; - - /** Error message. */ - private String message; - - /** Id of the request that originated this response. */ - private String inResponseTo; - - /** Expiration date. */ - private DateTime notOnOrAfter; - - /** Creation date. */ - private DateTime notBefore; - - /** The SAML token. */ - private byte[] tokenSaml = new byte[0]; - - /** Country. */ - private String country; - - /** Citizen's personal attribute list. */ - private transient IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** List of all assertions in response **/ - private List assertions; - - /** The complete list from all assertions **/ - private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); - - /** All personal attribute lists **/ - private List attributeLists; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAuthnResponse.class.getName()); - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Getter for audienceRest. - * - * @return The audienceRest value. - */ - public String getAudienceRestriction() { - return audienceRest; - } - - /** - * Setter for audienceRest. - * - * @param audRest the new audienceRest value. - */ - public void setAudienceRestriction(final String audRest) { - this.audienceRest = audRest; - } - - /** - * Getter for the samlToken. - * - * @return The samlToken value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Setter for samlToken. - * - * @param samlToken the new tokenSaml value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Getter for the country name. - * - * @return The country name value. - */ - public String getCountry() { - return country; - } - - /** - * Setter for the country name. - * - * @param cCountry the new country name value. - */ - public void setCountry(final String cCountry) { - this.country = cCountry; - } - - /** - * Getter for pal value. - * - * @return The pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the inResponseTo value. - * - * @return The inResponseTo value. - */ - public String getInResponseTo() { - return inResponseTo; - } - - /** - * Setter for the inResponseTo value. - * - * @param samlInResponseTo the new inResponseTo value. - */ - public void setInResponseTo(final String samlInResponseTo) { - this.inResponseTo = samlInResponseTo; - } - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the message value. - * - * @return The message value. - */ - public String getMessage() { - return message; - } - - /** - * Setter for the message value. - * - * @param msg the new message value. - */ - public void setMessage(final String msg) { - this.message = msg; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param nSamlId the new samlId value. - */ - public void setSamlId(final String nSamlId) { - this.samlId = nSamlId; - } - - /** - * Getter for the notOnOrAfter value. - * - * @return The notOnOrAfter value. - * - * @see DateTime - */ - public DateTime getNotOnOrAfter() { - return this.notOnOrAfter; - } - - /** - * Setter for the notOnOrAfter value. - * - * @param nOnOrAfter the new notOnOrAfter value. - * - * @see DateTime - */ - public void setNotOnOrAfter(final DateTime nOnOrAfter) { - this.notOnOrAfter = nOnOrAfter; - } - - /** - * Getter for the notBefore value. - * - * @return The notBefore value. - * - * @see DateTime - */ - public DateTime getNotBefore() { - return notBefore; - } - - /** - * Setter for the notBefore value. - * - * @param nBefore the new notBefore value. - * - * @see DateTime - */ - public void setNotBefore(final DateTime nBefore) { - this.notBefore = nBefore; - } - - public void setAssertions(List newAssert) { - this.assertions = newAssert; - } - - public List getAssertions() { - return assertions; - } - - /** - * Getter for the toal pal value. - * - * @return The total pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getTotalPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the total Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.totalAttributeList = attrList; - } - } - - /** - * Getter for personal attribute lists - * - * @return The lists - * - * @see PersonalAttributeList - */ - public List getPersonalAttributeLists() { - return attributeLists; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeLists(final List attrLists) { - if (attrLists != null) { - this.attributeLists = attrLists; - } - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base deleted file mode 100644 index 44811aee2..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutRequest.java.svn-base +++ /dev/null @@ -1,197 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -public class STORKLogoutRequest implements Serializable, Cloneable { - private static final long serialVersionUID = 4778480781609392750L; - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The distinguished name. */ - private String distinguishedName; - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The country. */ - private String country; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** The ID of principal as known to SP **/ - private String spProvidedId; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** Getter for spProvidedId **/ - public String getSpProvidedId() { - return spProvidedId; - } - - public void setSpProvidedId(final String nSpProvidedId) { - this.spProvidedId = nSpProvidedId; - } - - @Override - public Object clone() throws CloneNotSupportedException{ - STORKLogoutRequest storkLogoutRequest = null; - storkLogoutRequest = (STORKLogoutRequest) super.clone(); - storkLogoutRequest.setTokenSaml(getTokenSaml()); - return storkLogoutRequest; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base deleted file mode 100644 index 21b53a652..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKLogoutResponse.java.svn-base +++ /dev/null @@ -1,250 +0,0 @@ -package eu.stork.peps.auth.commons; - -import java.io.Serializable; - -public class STORKLogoutResponse implements Serializable, Cloneable { - private static final long serialVersionUID = 4778480781609392750L; - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The distinguished name. */ - private String distinguishedName; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The country. */ - private String country; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Status message. */ - private String statusMessage; - - /** Logout failed? */ - private boolean fail; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Setter for the statusMessage value. - * - * @param status the new statusMessage value. - */ - public void setStatusMessage(final String status) { - this.statusMessage = status; - } - - /** - * Getter for the statusMessage value. - * - * @return The statusMessage value. - */ - public String getStatusMessage() { - return statusMessage; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - @Override - public Object clone() throws CloneNotSupportedException{ - STORKLogoutResponse storkLogoutResponse = null; - storkLogoutResponse = (STORKLogoutResponse) super.clone(); - storkLogoutResponse.setTokenSaml(getTokenSaml()); - return storkLogoutResponse; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base deleted file mode 100644 index a9c4a156b..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKStatusCode.java.svn-base +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains the SAML Token Status Code. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ - */ -public enum STORKStatusCode { - - /** URI for Requester status code. */ - REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"), - - /** URI for Responder status code. */ - RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"), - - /** URI for Success status code. */ - SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"), - - /** Attribute is Available. */ - STATUS_AVAILABLE("Available"), - - /** Attribute is NotAvailable. */ - STATUS_NOT_AVAILABLE("NotAvailable"), - - /** Attribute is Withheld. */ - STATUS_WITHHELD("Withheld"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - private STORKStatusCode(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base deleted file mode 100644 index 0a711c9b7..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/STORKSubStatusCode.java.svn-base +++ /dev/null @@ -1,71 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons; - -/** - * This enum class contains the SAML Token Sub Status Code. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.7 $, $Date: 2010-11-17 05:15:28 $ - */ -public enum STORKSubStatusCode { - - /** URI for AuthnFailed status code. */ - AUTHN_FAILED_URI("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"), - - /** URI for InvalidAttrNameOrValue status code. */ - INVALID_ATTR_NAME_VALUE_URI( - "urn:oasis:names:tc:SAML:2.0:status:InvalidAttrNameOrValue"), - - /** URI for InvalidNameIDPolicy status code. */ - INVALID_NAMEID_POLICY_URI( - "urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"), - - /** URI for VersionMismatch status code. */ - VERSION_MISMATCH_URI("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"), - - /** URI for RequestDenied status code. */ - REQUEST_DENIED_URI("urn:oasis:names:tc:SAML:2.0:status:RequestDenied"), - - /** URI for QaaNotSupported status code. */ - QAA_NOT_SUPPORTED( - "http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - private STORKSubStatusCode(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index 19d45aaa2..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Common Authentication Service functionalities to be deployed in every PEPS - * is contained in this package. - * In particular, it contains the SAML Engine that implements the SAML messages - * management - * - * @since 1.0 - */ -package eu.stork.peps.auth.commons; diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops deleted file mode 100644 index 14f05b17c..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/all-wcprops +++ /dev/null @@ -1,53 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 96 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions -END -InvalidParameterPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 131 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java -END -SecurityPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 123 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java -END -InvalidSessionPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 129 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/package-info.java -END -CPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 116 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java -END -StorkPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 120 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java -END -AbstractPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 123 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java -END -InternalErrorPEPSException.java -K 25 -svn:wc:ra_dav:version-url -V 128 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries deleted file mode 100644 index 8ca1e325f..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/entries +++ /dev/null @@ -1,300 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth/commons/exceptions -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -CPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -5d3cb4a7303baeaf2104aaa7da301b21 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3570 - -StorkPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -fea01f750728ea5f15b449acb517f4b2 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1690 - -AbstractPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -c9aedb030e6dbc9f002c7cd3d52cf03f -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -4422 - -InternalErrorPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -36d8f6310e84c550f65bef78d5dc4238 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2471 - -InvalidParameterPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -c6ad53378b03a346ca0fc48a381ed771 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1800 - -SecurityPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -78d50b78a69cb0c630e4e14420e3b7be -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -2199 - -InvalidSessionPEPSException.java -file - - - - -2013-12-20T12:27:56.626475Z -5fd7f04ad6f6cc121084e682b2a4e678 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1555 - -package-info.java -file - - - - -2013-12-20T12:27:56.626475Z -7055c01b74382c525c7fcf110646d8fc -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -129 - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base deleted file mode 100644 index e9a96d7c2..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/AbstractPEPSException.java.svn-base +++ /dev/null @@ -1,173 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -import java.io.Serializable; - -/** - * Abstract class to represent the various PEPS exceptions. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ - */ -public abstract class AbstractPEPSException extends RuntimeException implements - Serializable { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = -1884417567740138022L; - - /** - * Error code. - */ - private String errorCode; - - /** - * Error message. - */ - private String errorMessage; - - /** - * SAML token. - */ - private String samlTokenFail; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param code The error code value. - * @param message The error message value. - */ - public AbstractPEPSException(final String code, final String message) { - - super(message); - this.errorCode = code; - this.errorMessage = message; - } - - /** - * Exception Constructor with the errorMessage as parameters and the Throwable - * cause. - * - * @param message The error message value. - * @param cause The throwable object. - */ - public AbstractPEPSException(final String message, final Throwable cause) { - - super(message, cause); - this.errorMessage = message; - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param code The error code value. - * @param message The error message value. - * @param cause The throwable object. - */ - public AbstractPEPSException(final String code, final String message, - final Throwable cause) { - - super(message, cause); - this.errorCode = code; - this.errorMessage = message; - } - - /** - * Exception Constructor with three Strings representing the errorCode, - * errorMessage and encoded samlToken as parameters. - * - * @param code The error code value. - * @param message The error message value. - * @param samlToken The error SAML Token. - */ - public AbstractPEPSException(final String code, final String message, - final String samlToken) { - - super(message); - this.errorCode = code; - this.errorMessage = message; - this.samlTokenFail = samlToken; - } - - /** - * Constructor with SAML Token as argument. Error message and error code are - * embedded in the SAML. - * - * @param samlToken The error SAML Token. - */ - public AbstractPEPSException(final String samlToken) { - super(); - this.samlTokenFail = samlToken; - } - - /** - * Getter for errorCode. - * - * @return The errorCode value. - */ - public final String getErrorCode() { - return errorCode; - } - - /** - * Setter for errorCode. - * - * @param code The error code value. - */ - public final void setErrorCode(final String code) { - this.errorCode = code; - } - - /** - * Getter for errorMessage. - * - * @return The error Message value. - */ - public final String getErrorMessage() { - return errorMessage; - } - - /** - * Setter for errorMessage. - * - * @param message The error message value. - */ - public final void setErrorMessage(final String message) { - this.errorMessage = message; - } - - /** - * Getter for SAMLTokenFail. - * - * @return The error SAML Token. - */ - public final String getSamlTokenFail() { - return samlTokenFail; - } - - /** - * Setter for SAMLTokenFail. - * - * @param samlToken The error SAML token. - */ - public final void setSamlTokenFail(final String samlToken) { - this.samlTokenFail = samlToken; - } -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base deleted file mode 100644 index 69cb20fdd..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/CPEPSException.java.svn-base +++ /dev/null @@ -1,143 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * This exception is thrown by the C-PEPS service and holds the relative - * information to present to the citizen. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $ - */ -public final class CPEPSException extends RuntimeException { - - /** - * Serial id. - */ - private static final long serialVersionUID = -4012295047127999362L; - - /** - * Error code. - */ - private String errorCode; - - /** - * Error message. - */ - private String errorMessage; - - /** - * SAML token. - */ - private String samlTokenFail; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param samlToken The SAML Token. - * @param code The error code value. - * @param message The error message value. - */ - public CPEPSException(final String samlToken, final String code, - final String message) { - - super(message); - this.setErrorCode(code); - this.setErrorMessage(message); - this.setSamlTokenFail(samlToken); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param samlToken The SAML Token. - * @param code The error code value. - * @param message The error message value. - * @param cause The original exception; - */ - public CPEPSException(final String samlToken, final String code, - final String message, final Throwable cause) { - - super(message, cause); - this.setErrorCode(code); - this.setErrorMessage(message); - this.setSamlTokenFail(samlToken); - } - - /** - * {@inheritDoc} - */ - public String getMessage() { - return this.getErrorMessage() + " (" + this.getErrorCode() + ")"; - } - - /** - * Getter for the error code. - * - * @return The errorCode value. - */ - public String getErrorCode() { - return errorCode; - } - - /** - * Setter for the error code. - * - * @param code The error code. - */ - public void setErrorCode(final String code) { - this.errorCode = code; - } - - /** - * Getter for the error message. - * - * @return The errorMessage value. - */ - public String getErrorMessage() { - return errorMessage; - } - - /** - * Setter for the error message. - * - * @param message The error message. - */ - public void setErrorMessage(final String message) { - this.errorMessage = message; - } - - /** - * Getter for the samlTokenFail. - * - * @return The samlTokenFail value. - */ - public String getSamlTokenFail() { - return samlTokenFail; - } - - /** - * Setter for the samlTokenFail. - * - * @param samlToken The error Saml Token. - */ - public void setSamlTokenFail(final String samlToken) { - this.samlTokenFail = samlToken; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base deleted file mode 100644 index 67514d4fe..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InternalErrorPEPSException.java.svn-base +++ /dev/null @@ -1,74 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Internal Error Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ - * - * @see AbstractPEPSException - */ -public final class InternalErrorPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 1193001455410319795L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param cause The throwable object. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage, final Throwable cause) { - - super(errorCode, errorMessage, cause); - } - - /** - * Exception Constructor with three strings representing the errorCode, - * errorMessage and encoded samlToken as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param samlTokenFail The error SAML Token. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage, final String samlTokenFail) { - - super(errorCode, errorMessage, samlTokenFail); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage) { - - super(errorCode, errorMessage); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base deleted file mode 100644 index 12c83b589..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidParameterPEPSException.java.svn-base +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Invalid Parameter Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.11 $, $Date: 2010-11-17 05:15:28 $ - * - * @see InvalidParameterPEPSException - */ -public class InvalidParameterPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 2046282148740524875L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error code message value. - */ - public InvalidParameterPEPSException(final String errorCode, - final String errorMessage) { - super(errorCode, errorMessage); - } - - /** - * Exception Constructor with one String representing the encoded samlToken. - * - * @param samlTokenFail The error SAML Token. - */ - public InvalidParameterPEPSException(final String samlTokenFail) { - super(samlTokenFail); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base deleted file mode 100644 index 800525eee..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/InvalidSessionPEPSException.java.svn-base +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Invalid session Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.14 $, $Date: 2010-11-17 05:15:28 $ - * - * @see InvalidParameterPEPSException - */ -public class InvalidSessionPEPSException extends InvalidParameterPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 7147090160978319016L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - */ - public InvalidSessionPEPSException(final String errorCode, - final String errorMessage) { - - super(errorCode, errorMessage); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base deleted file mode 100644 index fc27371d2..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/SecurityPEPSException.java.svn-base +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Security PEPS Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.18 $, $Date: 2010-11-17 05:15:28 $ - * - * @see AbstractPEPSException - */ -public final class SecurityPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 5605743302478554967L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMsg The error message value. - */ - public SecurityPEPSException(final String errorCode, final String errorMsg) { - super(errorCode, errorMsg); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param cause The throwable object. - */ - public SecurityPEPSException(final String errorCode, - final String errorMessage, final Throwable cause) { - - super(errorCode, errorMessage, cause); - } - - /** - * Exception Constructor with one String representing the encoded samlToken. - * - * @param samlTokenFail The error SAML Token. - */ - public SecurityPEPSException(final String samlTokenFail) { - super(samlTokenFail); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base deleted file mode 100644 index a2da61a02..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/StorkPEPSException.java.svn-base +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.commons.exceptions; - -/** - * Security PEPS Exception class. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ - * - * @see AbstractPEPSException - */ -public final class StorkPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 8048033129798427574L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMsg The error message value. - */ - public StorkPEPSException(final String errorCode, final String errorMsg) { - super(errorCode, errorMsg); - } - - /** - * {@inheritDoc} - */ - public String getMessage() { - - return "Security Error (" + this.getErrorCode() + ") processing request : " - + this.getErrorMessage(); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index d83068beb..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Package for the PEPS’ Exceptions handling. - * - * @since 1.0 - */ -package eu.stork.peps.auth.commons.exceptions; - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops deleted file mode 100644 index 3cd5d5378..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/all-wcprops +++ /dev/null @@ -1,41 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 87 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific -END -IDeriveAttribute.java -K 25 -svn:wc:ra_dav:version-url -V 108 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java -END -IAUService.java -K 25 -svn:wc:ra_dav:version-url -V 103 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java -END -INormaliseValue.java -K 25 -svn:wc:ra_dav:version-url -V 107 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java -END -ITranslatorService.java -K 25 -svn:wc:ra_dav:version-url -V 111 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 104 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/package-info.java -END -ICheckAttributeValue.java -K 25 -svn:wc:ra_dav:version-url -V 112 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries deleted file mode 100644 index acd798b61..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/entries +++ /dev/null @@ -1,232 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/auth/specific -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -ITranslatorService.java -file - - - - -2014-01-21T08:38:55.228702Z -c027ed5506150c744b8e586b325de5fb -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -3120 - -package-info.java -file - - - - -2013-12-20T12:27:56.654475Z -eef7721d55c2edb02a432fc08ae9e487 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -164 - -ICheckAttributeValue.java -file - - - - -2013-12-20T12:27:56.654475Z -b0472ff15d1c86f175da134b0f0eda71 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1321 - -IDeriveAttribute.java -file - - - - -2013-12-20T12:27:56.654475Z -dce3856a97583f739cdf50ca78491277 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1504 - -IAUService.java -file - - - - -2014-01-21T08:38:55.228702Z -b622aaaa29b0cd72261ca7799db691b9 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -7023 - -INormaliseValue.java -file - - - - -2013-12-20T12:27:56.654475Z -09f6e376875762fca294be4dfecb71f1 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -1237 - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base deleted file mode 100644 index 5c24cc5a8..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IAUService.java.svn-base +++ /dev/null @@ -1,215 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import java.util.Map; - -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.IStorkSession; -import eu.stork.peps.auth.commons.STORKAttrQueryResponse; -import eu.stork.peps.auth.commons.STORKAuthnResponse; - -/** - * Interface for Specific Authentication methods. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface IAUService { - - /** - * Prepares the citizen to be redirected to the IdP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The Requested attributes. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] prepareCitizenAuthentication(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Prepares the citizen to be redirected to the PV. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The Requested attributes. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] preparePVRequest(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Authenticates a citizen. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The requested attributes. - * - * @return The updated Personal Attribute List. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList authenticateCitizen( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Validates a power. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The requested attributes. - * - * @return The updated Personal Attribute List (power validated). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList powerValidation( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Prepares the Citizen browser to be redirected to the AP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The requested attributes. - * - * @return true in case of no error. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - boolean prepareAPRedirect(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Returns the attributes values from the AP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The request attributes. - * - * @return The updated Personal Attribute List. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList getAttributesFromAttributeProviders( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Get the attributes from the AP with verification. - * - * @param personalList The Personal Attribute List. - * @param parameters The HTTP Parameters. - * @param requestAttributes The requested Attributes. - * @param session The session object. - * @param auProcessId The SAML identifier. - * - * @return true if the attributes were correctly verified. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - boolean getAttributesWithVerification(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session, String auProcessId); - - /** - * Validates a SAML Response. - * - * @param samlToken The SAML Token. - * @param session The session object. - * - * @return the STORKAuthnResponse associated with the validated response. - * - * @see IStorkSession - */ - STORKAuthnResponse processAuthenticationResponse(byte[] samlToken, - IStorkSession session); - - /** - * Generates a SAML Response in case of error. - * - * @param inResponseTo The SAML's identifier to response. - * @param issuer The issuer value. - * @param assertionURL The assertion URL. - * @param code The error code. - * @param subcode The sub error code. - * @param message The error message. - * @param ipUserAddress The user IP address. - * - * @return byte[] containing the SAML Response. - */ - byte[] generateErrorAuthenticationResponse(String inResponseTo, - String issuer, String assertionURL, String code, String subcode, - String message, String ipUserAddress); - - /** - * Compares two given personal attribute lists. - * - * @param original The original Personal Attribute List. - * @param modified The modified Personal Attribute List. - * @return true if the original list contains the modified one. False - * otherwise. - * - * @see IPersonalAttributeList - */ - boolean comparePersonalAttributeLists(IPersonalAttributeList original, - IPersonalAttributeList modified); - - /** - * Prepares the citizen to be redirected to the AtP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] prepareAttributeRequest(IPersonalAttributeList personalList, - Map parameters, IStorkSession session); - - /** - * Validates a SAML Response. - * - * @param samlToken The SAML Token. - * @param session The session object. - * - * @return the STORKAttrQueryResponse associated with the validated response. - * - * @see IStorkSession - */ - STORKAttrQueryResponse processAttributeResponse(byte[] samlToken, - IStorkSession session); -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base deleted file mode 100644 index 31a8d78ff..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ICheckAttributeValue.java.svn-base +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import java.util.List; - -/** - * Interface that defines the methods to work with the validation of attributes. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface ICheckAttributeValue { - - /** - * Checks if the list of values contains the expected value. - * - * @param values The List of values. - * @param expectedValue The value to check if it exists on the list. - * - * @return boolean true, if the value is present in the list. False, - * otherwise. - */ - boolean checkValue(List values, String expectedValue); - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base deleted file mode 100644 index 78eb53004..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/IDeriveAttribute.java.svn-base +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import eu.stork.peps.auth.commons.IStorkSession; -import eu.stork.peps.auth.commons.PersonalAttribute; - -/** - * Interface that defines the methods to work with derivation of attributes. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface IDeriveAttribute { - - /** - * Derives the attribute value. Set the Personal Attribute value to null if - * the value in session or the value of age are invalid (non-numeric or null). - * - * @param personalAttrList The Personal Attribute List. - * @param session The session object. - * - * @see PersonalAttribute The personal Attribute - * @see IStorkSession The session object. - */ - void deriveAttributeToData(PersonalAttribute personalAttrList, - IStorkSession session); - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base deleted file mode 100644 index ca2114e32..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/INormaliseValue.java.svn-base +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import eu.stork.peps.auth.commons.PersonalAttribute; - -/** - * Interface for attribute's value normalisation. - * - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface INormaliseValue { - - /** - * Translates the attribute's value from local format to STORK format. - * - * @param personalAttribute The Personal Attribute to normalise the value. - * - * @see PersonalAttribute - */ - void normaliseAttributeValueToStork(PersonalAttribute personalAttribute); -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base deleted file mode 100644 index 8a33897d8..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/ITranslatorService.java.svn-base +++ /dev/null @@ -1,100 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.auth.specific; - -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.IStorkSession; -import eu.stork.peps.auth.commons.STORKAuthnRequest; - -/** - * Interface for attributes normalization. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com - */ -public interface ITranslatorService { - - /** - * Translates the attributes from local format to STORK format. - * - * @param personalList The Personal Attribute List. - * - * @return The Personal Attribute List with normalised attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeNamesToStork( - IPersonalAttributeList personalList); - - /** - * Translates the attributes values from local format to STORK format. - * - * @param personalList The Personal Attribute List. - * - * @return The PersonalAttributeList with normalised values. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeValuesToStork( - IPersonalAttributeList personalList); - - /** - * Translates the attributes from STORK format to local format. - * - * @param personalList The Personal Attribute List. - * - * @return The PersonalAttributeList with normalised attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeNamesFromStork( - IPersonalAttributeList personalList); - - /** - * Derive Attribute Names To Stork format. - * - * @param personalList The Personal Attribute List, - * - * @return The PersonalAttributeList with derived attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList deriveAttributeFromStork( - IPersonalAttributeList personalList); - - /** - * Derive Attribute Names from Stork format. - * - * @param session The session object. - * @param modifiedList The Personal Attribute List. - * - * @return The PersonalAttributeList with derived attributes. - * - * @see IStorkSession - * @see IPersonalAttributeList - */ - IPersonalAttributeList deriveAttributeToStork(IStorkSession session, - IPersonalAttributeList modifiedList); - - /** - * Validate the values of the attributes. - * - * @param pal The attribute list - * - * @return True, if all the attributes have values. False, otherwise. - * - * @see STORKAuthnRequest - */ - boolean checkAttributeValues(IPersonalAttributeList pa); -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index a25c52311..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Specific PEPS Interfaces that implements functionality of the Authentication - * Service. - * - * @since 1.0 - */ -package eu.stork.peps.auth.specific; - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/all-wcprops deleted file mode 100644 index d792fc132..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 81 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/entries deleted file mode 100644 index e43413c41..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/complex -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -attributes -dir - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/all-wcprops b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/all-wcprops deleted file mode 100644 index 76286973c..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/all-wcprops +++ /dev/null @@ -1,125 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 92 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes -END -ObjectFactory.java -K 25 -svn:wc:ra_dav:version-url -V 111 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java -END -IsTeacherOfType.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/IsTeacherOfType.java -END -CanonicalAddressType.java -K 25 -svn:wc:ra_dav:version-url -V 118 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/CanonicalAddressType.java -END -IsCourseCoordinatorType.java -K 25 -svn:wc:ra_dav:version-url -V 121 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/IsCourseCoordinatorType.java -END -MandateContentType.java -K 25 -svn:wc:ra_dav:version-url -V 116 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/MandateContentType.java -END -Habilitation.java -K 25 -svn:wc:ra_dav:version-url -V 110 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/Habilitation.java -END -IsHCPType.java -K 25 -svn:wc:ra_dav:version-url -V 107 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/IsHCPType.java -END -IsAcademicStaffType.java -K 25 -svn:wc:ra_dav:version-url -V 117 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/IsAcademicStaffType.java -END -AttributeStatusType.java -K 25 -svn:wc:ra_dav:version-url -V 117 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/AttributeStatusType.java -END -HabilitationType.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/HabilitationType.java -END -IsAdminStaffType.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/IsAdminStaffType.java -END -MandateType.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/MandateType.java -END -HasAccountInBankType.java -K 25 -svn:wc:ra_dav:version-url -V 118 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/HasAccountInBankType.java -END -IsHealthCareProfessionalType.java -K 25 -svn:wc:ra_dav:version-url -V 126 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalType.java -END -IsStudentType.java -K 25 -svn:wc:ra_dav:version-url -V 111 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/IsStudentType.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 110 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/package-info.java -END -AcTitleType.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/AcTitleType.java -END -RequestedAttributeType.java -K 25 -svn:wc:ra_dav:version-url -V 120 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/RequestedAttributeType.java -END -HasDegreeType.java -K 25 -svn:wc:ra_dav:version-url -V 111 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/HasDegreeType.java -END -RepresentationPersonType.java -K 25 -svn:wc:ra_dav:version-url -V 122 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes/RepresentationPersonType.java -END diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries deleted file mode 100644 index 434de60f8..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries +++ /dev/null @@ -1,708 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/java/eu/stork/peps/complex/attributes -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -IsHCPType.java -file - - - - -2014-03-05T09:36:07.898515Z -c7794f438dce3f5e4e27e605a642a22a -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -3801 - -IsAcademicStaffType.java -file - - - - -2014-03-05T09:36:07.898515Z -43d67ea6cedb4601555d0394db95417a -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -3818 - -HabilitationType.java -file - - - - -2014-03-05T09:36:07.898515Z -6e9cc940cbe5298156c5e7b524936f11 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2314 - -AttributeStatusType.java -file - - - - -2014-03-05T09:36:07.898515Z -4e30a60177a9ab03aececf580482fad1 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -1734 - -IsAdminStaffType.java -file - - - - -2014-03-05T09:36:07.898515Z -5a49a39f1d260a3c306216069751260f -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2341 - -MandateType.java -file - - - - -2014-03-05T09:36:07.898515Z -2fbb38548efd320e4df27959a9842731 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -3581 - -HasAccountInBankType.java -file - - - - -2014-03-05T09:36:07.894515Z -f71b4c28dd5c9580fb87c3573435837b -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2339 - -IsHealthCareProfessionalType.java -file - - - - -2014-03-05T09:36:07.894515Z -2a4106ac8c87cc056b853b7f9ffb6fbc -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -3834 - -package-info.java -file - - - - -2014-03-05T09:36:07.894515Z -5a2f7df8040e53c9e0dc7beacc8f3457 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -549 - -IsStudentType.java -file - - - - -2014-03-05T09:36:07.894515Z -a576b2ef395482c49cb968e91e33ec89 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -3714 - -AcTitleType.java -file - - - - -2014-03-05T09:36:07.894515Z -df18729d7dbd509aeeac2f17ef036e19 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2388 - -RequestedAttributeType.java -file - - - - -2014-03-05T09:36:07.894515Z -c6ada26a7ff439713e9a4588d1b62b0a -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -6089 - -HasDegreeType.java -file - - - - -2014-03-05T09:36:07.894515Z -3a54a31f40c97b44d31f1a70e0767daa -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -4432 - -RepresentationPersonType.java -file - - - - -2014-03-05T09:36:07.898515Z -84b6c9432085cf590c3ed06e58b4307f -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -7205 - -ObjectFactory.java -file - - - - -2014-03-05T09:36:07.898515Z -bc36df4b11e93ab03119dfb25626bfb1 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -18679 - -IsTeacherOfType.java -file - - - - -2014-03-05T09:36:07.898515Z -1575bd6840471d713bd61c5d337d3900 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -3668 - -CanonicalAddressType.java -file - - - - -2014-03-05T09:36:07.898515Z -63bc0e23343775a0c252a03a5a3b09d1 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -6847 - -IsCourseCoordinatorType.java -file - - - - -2014-03-05T09:36:07.898515Z -9927ea145575d05bd2984bee0e3550be -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2423 - -MandateContentType.java -file - - - - -2014-03-05T09:36:07.898515Z -debc98ce374d669b7621dea674120dfc -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -6205 - -Habilitation.java -file - - - - -2014-03-05T09:36:07.898515Z -248b26e8c89ddc3366c528cf3852d27b -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2298 - diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AcTitleType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AcTitleType.java.svn-base deleted file mode 100644 index 3c214cb7b..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AcTitleType.java.svn-base +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for acTitleType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="acTitleType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="titleNormalised" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}titleNormalisedType"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "acTitleType", propOrder = { - "titleNormalised", - "aqaa" -}) -public class AcTitleType { - - @XmlElement(required = true) - protected String titleNormalised; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the titleNormalised property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTitleNormalised() { - return titleNormalised; - } - - /** - * Sets the value of the titleNormalised property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTitleNormalised(String value) { - this.titleNormalised = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AttributeStatusType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AttributeStatusType.java.svn-base deleted file mode 100644 index 1a815e944..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/AttributeStatusType.java.svn-base +++ /dev/null @@ -1,61 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for AttributeStatusType. - * - *

The following schema fragment specifies the expected content contained within this class. - *

- *

- * <simpleType name="AttributeStatusType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Available"/>
- *     <enumeration value="NotAvailable"/>
- *     <enumeration value="Withheld"/>
- *   </restriction>
- * </simpleType>
- * 
- * - */ -@XmlType(name = "AttributeStatusType") -@XmlEnum -public enum AttributeStatusType { - - @XmlEnumValue("Available") - AVAILABLE("Available"), - @XmlEnumValue("NotAvailable") - NOT_AVAILABLE("NotAvailable"), - @XmlEnumValue("Withheld") - WITHHELD("Withheld"); - private final String value; - - AttributeStatusType(String v) { - value = v; - } - - public String value() { - return value; - } - - public static AttributeStatusType fromValue(String v) { - for (AttributeStatusType c: AttributeStatusType.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/CanonicalAddressType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/CanonicalAddressType.java.svn-base deleted file mode 100644 index fa0289cfa..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/CanonicalAddressType.java.svn-base +++ /dev/null @@ -1,264 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - -/** - *

Java class for canonicalAddressType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="canonicalAddressType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="countryCodeAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}CountryCodeType"/>
- *         <element name="state" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="municipalityCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="town" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="postalCode" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="streetName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="streetNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="apartmentNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "canonicalAddressType", propOrder = { - "countryCodeAddress", - "state", - "municipalityCode", - "town", - "postalCode", - "streetName", - "streetNumber", - "apartmentNumber" -}) -public class CanonicalAddressType { - - @XmlElement(required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - protected String countryCodeAddress; - protected String state; - protected String municipalityCode; - @XmlElement(required = true) - protected String town; - @XmlElement(required = true) - protected String postalCode; - @XmlElement(required = true) - protected String streetName; - protected String streetNumber; - protected String apartmentNumber; - - /** - * Gets the value of the countryCodeAddress property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCountryCodeAddress() { - return countryCodeAddress; - } - - /** - * Sets the value of the countryCodeAddress property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCountryCodeAddress(String value) { - this.countryCodeAddress = value; - } - - /** - * Gets the value of the state property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getState() { - return state; - } - - /** - * Sets the value of the state property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setState(String value) { - this.state = value; - } - - /** - * Gets the value of the municipalityCode property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMunicipalityCode() { - return municipalityCode; - } - - /** - * Sets the value of the municipalityCode property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMunicipalityCode(String value) { - this.municipalityCode = value; - } - - /** - * Gets the value of the town property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTown() { - return town; - } - - /** - * Sets the value of the town property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTown(String value) { - this.town = value; - } - - /** - * Gets the value of the postalCode property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPostalCode() { - return postalCode; - } - - /** - * Sets the value of the postalCode property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPostalCode(String value) { - this.postalCode = value; - } - - /** - * Gets the value of the streetName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStreetName() { - return streetName; - } - - /** - * Sets the value of the streetName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStreetName(String value) { - this.streetName = value; - } - - /** - * Gets the value of the streetNumber property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStreetNumber() { - return streetNumber; - } - - /** - * Sets the value of the streetNumber property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStreetNumber(String value) { - this.streetNumber = value; - } - - /** - * Gets the value of the apartmentNumber property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getApartmentNumber() { - return apartmentNumber; - } - - /** - * Sets the value of the apartmentNumber property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setApartmentNumber(String value) { - this.apartmentNumber = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/Habilitation.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/Habilitation.java.svn-base deleted file mode 100644 index 3d99c9600..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/Habilitation.java.svn-base +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for habilitation complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="habilitation">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "habilitation", propOrder = { - "ability", - "aqaa" -}) -public class Habilitation { - - @XmlElement(required = true) - protected String ability; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the ability property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAbility() { - return ability; - } - - /** - * Sets the value of the ability property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAbility(String value) { - this.ability = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HabilitationType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HabilitationType.java.svn-base deleted file mode 100644 index 6a5cb7b00..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HabilitationType.java.svn-base +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for habilitationType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="habilitationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "habilitationType", propOrder = { - "ability", - "aqaa" -}) -public class HabilitationType { - - @XmlElement(required = true) - protected String ability; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the ability property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAbility() { - return ability; - } - - /** - * Sets the value of the ability property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAbility(String value) { - this.ability = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasAccountInBankType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasAccountInBankType.java.svn-base deleted file mode 100644 index cc09f0486..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasAccountInBankType.java.svn-base +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for hasAccountInBankType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="hasAccountInBankType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="bankName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "hasAccountInBankType", propOrder = { - "bankName", - "aqaa" -}) -public class HasAccountInBankType { - - @XmlElement(required = true) - protected String bankName; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the bankName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getBankName() { - return bankName; - } - - /** - * Sets the value of the bankName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setBankName(String value) { - this.bankName = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasDegreeType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasDegreeType.java.svn-base deleted file mode 100644 index ea466cb18..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/HasDegreeType.java.svn-base +++ /dev/null @@ -1,174 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for hasDegreeType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="hasDegreeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="study" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}studyType"/>
- *         <element name="level" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}LevelType"/>
- *         <element name="yearObtained" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "hasDegreeType", propOrder = { - "study", - "level", - "yearObtained", - "nameOfInstitution", - "aqaa" -}) -public class HasDegreeType { - - @XmlElement(required = true) - protected String study; - @XmlElement(required = true) - protected String level; - @XmlElement(required = true) - protected BigInteger yearObtained; - @XmlElement(required = true) - protected String nameOfInstitution; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the study property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStudy() { - return study; - } - - /** - * Sets the value of the study property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStudy(String value) { - this.study = value; - } - - /** - * Gets the value of the level property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLevel() { - return level; - } - - /** - * Sets the value of the level property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLevel(String value) { - this.level = value; - } - - /** - * Gets the value of the yearObtained property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getYearObtained() { - return yearObtained; - } - - /** - * Sets the value of the yearObtained property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setYearObtained(BigInteger value) { - this.yearObtained = value; - } - - /** - * Gets the value of the nameOfInstitution property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameOfInstitution() { - return nameOfInstitution; - } - - /** - * Sets the value of the nameOfInstitution property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameOfInstitution(String value) { - this.nameOfInstitution = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAcademicStaffType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAcademicStaffType.java.svn-base deleted file mode 100644 index 02d9286d8..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAcademicStaffType.java.svn-base +++ /dev/null @@ -1,145 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isAcademicStaffType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="isAcademicStaffType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="occupation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}occupationType"/>
- *         <element name="knowledgearea" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isAcademicStaffType", propOrder = { - "nameOfInstitution", - "occupation", - "knowledgearea", - "aqaa" -}) -public class IsAcademicStaffType { - - @XmlElement(required = true) - protected String nameOfInstitution; - @XmlElement(required = true) - protected String occupation; - @XmlElement(required = true) - protected String knowledgearea; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the nameOfInstitution property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameOfInstitution() { - return nameOfInstitution; - } - - /** - * Sets the value of the nameOfInstitution property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameOfInstitution(String value) { - this.nameOfInstitution = value; - } - - /** - * Gets the value of the occupation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getOccupation() { - return occupation; - } - - /** - * Sets the value of the occupation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setOccupation(String value) { - this.occupation = value; - } - - /** - * Gets the value of the knowledgearea property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getKnowledgearea() { - return knowledgearea; - } - - /** - * Sets the value of the knowledgearea property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setKnowledgearea(String value) { - this.knowledgearea = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAdminStaffType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAdminStaffType.java.svn-base deleted file mode 100644 index 0de16ee77..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsAdminStaffType.java.svn-base +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isAdminStaffType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="isAdminStaffType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="adminStaff" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isAdminStaffType", propOrder = { - "adminStaff", - "aqaa" -}) -public class IsAdminStaffType { - - @XmlElement(required = true) - protected String adminStaff; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the adminStaff property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAdminStaff() { - return adminStaff; - } - - /** - * Sets the value of the adminStaff property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAdminStaff(String value) { - this.adminStaff = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsCourseCoordinatorType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsCourseCoordinatorType.java.svn-base deleted file mode 100644 index 58caa2f22..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsCourseCoordinatorType.java.svn-base +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isCourseCoordinatorType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="isCourseCoordinatorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="courseCoodinator" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isCourseCoordinatorType", propOrder = { - "courseCoodinator", - "aqaa" -}) -public class IsCourseCoordinatorType { - - @XmlElement(required = true) - protected String courseCoodinator; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the courseCoodinator property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCourseCoodinator() { - return courseCoodinator; - } - - /** - * Sets the value of the courseCoodinator property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCourseCoodinator(String value) { - this.courseCoodinator = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHCPType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHCPType.java.svn-base deleted file mode 100644 index 17e315d2d..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHCPType.java.svn-base +++ /dev/null @@ -1,145 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isHCPType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="isHCPType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="nameOfOrganisation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="HCPType" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}HCPType"/>
- *         <element name="specialisation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}specialisationType"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isHCPType", propOrder = { - "nameOfOrganisation", - "hcpType", - "specialisation", - "aqaa" -}) -public class IsHCPType { - - @XmlElement(required = true) - protected String nameOfOrganisation; - @XmlElement(name = "HCPType", required = true) - protected String hcpType; - @XmlElement(required = true) - protected String specialisation; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the nameOfOrganisation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameOfOrganisation() { - return nameOfOrganisation; - } - - /** - * Sets the value of the nameOfOrganisation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameOfOrganisation(String value) { - this.nameOfOrganisation = value; - } - - /** - * Gets the value of the hcpType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHCPType() { - return hcpType; - } - - /** - * Sets the value of the hcpType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHCPType(String value) { - this.hcpType = value; - } - - /** - * Gets the value of the specialisation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSpecialisation() { - return specialisation; - } - - /** - * Sets the value of the specialisation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSpecialisation(String value) { - this.specialisation = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHealthCareProfessionalType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHealthCareProfessionalType.java.svn-base deleted file mode 100644 index de2003a3f..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsHealthCareProfessionalType.java.svn-base +++ /dev/null @@ -1,145 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isHealthCareProfessionalType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="isHealthCareProfessionalType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="nameOfOrganisation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}HCPType"/>
- *         <element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}specialisation"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isHealthCareProfessionalType", propOrder = { - "nameOfOrganisation", - "hcpType", - "specialisation", - "aqaa" -}) -public class IsHealthCareProfessionalType { - - @XmlElement(required = true) - protected String nameOfOrganisation; - @XmlElement(name = "HCPType", required = true) - protected String hcpType; - @XmlElement(required = true) - protected String specialisation; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the nameOfOrganisation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameOfOrganisation() { - return nameOfOrganisation; - } - - /** - * Sets the value of the nameOfOrganisation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameOfOrganisation(String value) { - this.nameOfOrganisation = value; - } - - /** - * Gets the value of the hcpType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHCPType() { - return hcpType; - } - - /** - * Sets the value of the hcpType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHCPType(String value) { - this.hcpType = value; - } - - /** - * Gets the value of the specialisation property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSpecialisation() { - return specialisation; - } - - /** - * Sets the value of the specialisation property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSpecialisation(String value) { - this.specialisation = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsStudentType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsStudentType.java.svn-base deleted file mode 100644 index 6a7dc838a..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsStudentType.java.svn-base +++ /dev/null @@ -1,146 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isStudentType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="isStudentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}study"/>
- *         <element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="course" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isStudentType", propOrder = { - "study", - "nameOfInstitution", - "course", - "aqaa" -}) -public class IsStudentType { - - @XmlElement(required = true) - protected String study; - @XmlElement(required = true) - protected String nameOfInstitution; - @XmlElement(required = true) - protected BigInteger course; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the study property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStudy() { - return study; - } - - /** - * Sets the value of the study property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStudy(String value) { - this.study = value; - } - - /** - * Gets the value of the nameOfInstitution property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameOfInstitution() { - return nameOfInstitution; - } - - /** - * Sets the value of the nameOfInstitution property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameOfInstitution(String value) { - this.nameOfInstitution = value; - } - - /** - * Gets the value of the course property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getCourse() { - return course; - } - - /** - * Sets the value of the course property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setCourse(BigInteger value) { - this.course = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsTeacherOfType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsTeacherOfType.java.svn-base deleted file mode 100644 index 810f652c1..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/IsTeacherOfType.java.svn-base +++ /dev/null @@ -1,145 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for isTeacherOfType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="isTeacherOfType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="course" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="role" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "isTeacherOfType", propOrder = { - "nameOfInstitution", - "course", - "role", - "aqaa" -}) -public class IsTeacherOfType { - - @XmlElement(required = true) - protected String nameOfInstitution; - @XmlElement(required = true) - protected String course; - @XmlElement(required = true) - protected String role; - @XmlElement(name = "AQAA") - protected int aqaa; - - /** - * Gets the value of the nameOfInstitution property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameOfInstitution() { - return nameOfInstitution; - } - - /** - * Sets the value of the nameOfInstitution property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameOfInstitution(String value) { - this.nameOfInstitution = value; - } - - /** - * Gets the value of the course property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCourse() { - return course; - } - - /** - * Sets the value of the course property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCourse(String value) { - this.course = value; - } - - /** - * Gets the value of the role property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getRole() { - return role; - } - - /** - * Sets the value of the role property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setRole(String value) { - this.role = value; - } - - /** - * Gets the value of the aqaa property. - * - */ - public int getAQAA() { - return aqaa; - } - - /** - * Sets the value of the aqaa property. - * - */ - public void setAQAA(int value) { - this.aqaa = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateContentType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateContentType.java.svn-base deleted file mode 100644 index 84ce2727b..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateContentType.java.svn-base +++ /dev/null @@ -1,233 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.datatype.XMLGregorianCalendar; - - -/** - *

Java class for mandateContentType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="mandateContentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="validFrom" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="validTo" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="transactionLimit" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="transactionLimitCurrency" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}currencyType"/>
- *         <element name="isJoint" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="ischained" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="typePower" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "mandateContentType", propOrder = { - "validFrom", - "validTo", - "transactionLimit", - "transactionLimitCurrency", - "isJoint", - "ischained", - "typePower" -}) -public class MandateContentType { - - @XmlElement(required = true) - @XmlSchemaType(name = "date") - protected XMLGregorianCalendar validFrom; - @XmlElement(required = true) - @XmlSchemaType(name = "date") - protected XMLGregorianCalendar validTo; - @XmlElement(required = true) - protected BigInteger transactionLimit; - @XmlElement(required = true) - protected String transactionLimitCurrency; - @XmlElement(required = true) - protected String isJoint; - protected boolean ischained; - @XmlElement(required = true) - protected String typePower; - - /** - * Gets the value of the validFrom property. - * - * @return - * possible object is - * {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getValidFrom() { - return validFrom; - } - - /** - * Sets the value of the validFrom property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setValidFrom(XMLGregorianCalendar value) { - this.validFrom = value; - } - - /** - * Gets the value of the validTo property. - * - * @return - * possible object is - * {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getValidTo() { - return validTo; - } - - /** - * Sets the value of the validTo property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setValidTo(XMLGregorianCalendar value) { - this.validTo = value; - } - - /** - * Gets the value of the transactionLimit property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getTransactionLimit() { - return transactionLimit; - } - - /** - * Sets the value of the transactionLimit property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setTransactionLimit(BigInteger value) { - this.transactionLimit = value; - } - - /** - * Gets the value of the transactionLimitCurrency property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTransactionLimitCurrency() { - return transactionLimitCurrency; - } - - /** - * Sets the value of the transactionLimitCurrency property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTransactionLimitCurrency(String value) { - this.transactionLimitCurrency = value; - } - - /** - * Gets the value of the isJoint property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIsJoint() { - return isJoint; - } - - /** - * Sets the value of the isJoint property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIsJoint(String value) { - this.isJoint = value; - } - - /** - * Gets the value of the ischained property. - * - */ - public boolean isIschained() { - return ischained; - } - - /** - * Sets the value of the ischained property. - * - */ - public void setIschained(boolean value) { - this.ischained = value; - } - - /** - * Gets the value of the typePower property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTypePower() { - return typePower; - } - - /** - * Sets the value of the typePower property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTypePower(String value) { - this.typePower = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateType.java.svn-base deleted file mode 100644 index 26597dc6b..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateType.java.svn-base +++ /dev/null @@ -1,125 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for mandateType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="mandateType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="represented" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>
- *         <element name="representing" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>
- *         <element name="mandateContent" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}mandateContentType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "mandateType", propOrder = { - "represented", - "representing", - "mandateContent" -}) -public class MandateType { - - @XmlElement(required = true) - protected RepresentationPersonType represented; - @XmlElement(required = true) - protected RepresentationPersonType representing; - @XmlElement(required = true) - protected MandateContentType mandateContent; - - /** - * Gets the value of the represented property. - * - * @return - * possible object is - * {@link RepresentationPersonType } - * - */ - public RepresentationPersonType getRepresented() { - return represented; - } - - /** - * Sets the value of the represented property. - * - * @param value - * allowed object is - * {@link RepresentationPersonType } - * - */ - public void setRepresented(RepresentationPersonType value) { - this.represented = value; - } - - /** - * Gets the value of the representing property. - * - * @return - * possible object is - * {@link RepresentationPersonType } - * - */ - public RepresentationPersonType getRepresenting() { - return representing; - } - - /** - * Sets the value of the representing property. - * - * @param value - * allowed object is - * {@link RepresentationPersonType } - * - */ - public void setRepresenting(RepresentationPersonType value) { - this.representing = value; - } - - /** - * Gets the value of the mandateContent property. - * - * @return - * possible object is - * {@link MandateContentType } - * - */ - public MandateContentType getMandateContent() { - return mandateContent; - } - - /** - * Sets the value of the mandateContent property. - * - * @param value - * allowed object is - * {@link MandateContentType } - * - */ - public void setMandateContent(MandateContentType value) { - this.mandateContent = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/ObjectFactory.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/ObjectFactory.java.svn-base deleted file mode 100644 index eca4ca3de..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/ObjectFactory.java.svn-base +++ /dev/null @@ -1,433 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the eu.stork.peps.complex.attributes package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _Habilitation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "habilitation"); - private final static QName _HasDegree_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasDegree"); - private final static QName _SpApplication_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spApplication"); - private final static QName _Specialisation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "specialisation"); - private final static QName _IsStudent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isStudent"); - private final static QName _AQAA_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AQAA"); - private final static QName _HCPType_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "HCPType"); - private final static QName _CanonicalResidenceAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalResidenceAddress"); - private final static QName _AcTitle_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "acTitle"); - private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel"); - private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff"); - private final static QName _IsTeacherOf_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isTeacherOf"); - private final static QName _IsCourseCoordinator_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isCourseCoordinator"); - private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress"); - private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry"); - private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff"); - private final static QName _CitizenCountryCode_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "CitizenCountryCode"); - private final static QName _AttributeValue_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AttributeValue"); - private final static QName _HasAccountInBank_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasAccountInBank"); - private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "countryCodeAddress"); - private final static QName _Study_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "study"); - private final static QName _IsHealthCareProfessional_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional"); - private final static QName _Mandate_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandate"); - private final static QName _RequestedAttribute_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "RequestedAttribute"); - private final static QName _SpSector_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spSector"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.peps.complex.attributes - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link RequestedAttributeType } - * - */ - public RequestedAttributeType createRequestedAttributeType() { - return new RequestedAttributeType(); - } - - /** - * Create an instance of {@link MandateType } - * - */ - public MandateType createMandateType() { - return new MandateType(); - } - - /** - * Create an instance of {@link HasAccountInBankType } - * - */ - public HasAccountInBankType createHasAccountInBankType() { - return new HasAccountInBankType(); - } - - /** - * Create an instance of {@link IsHealthCareProfessionalType } - * - */ - public IsHealthCareProfessionalType createIsHealthCareProfessionalType() { - return new IsHealthCareProfessionalType(); - } - - /** - * Create an instance of {@link IsAdminStaffType } - * - */ - public IsAdminStaffType createIsAdminStaffType() { - return new IsAdminStaffType(); - } - - /** - * Create an instance of {@link CanonicalAddressType } - * - */ - public CanonicalAddressType createCanonicalAddressType() { - return new CanonicalAddressType(); - } - - /** - * Create an instance of {@link IsCourseCoordinatorType } - * - */ - public IsCourseCoordinatorType createIsCourseCoordinatorType() { - return new IsCourseCoordinatorType(); - } - - /** - * Create an instance of {@link IsAcademicStaffType } - * - */ - public IsAcademicStaffType createIsAcademicStaffType() { - return new IsAcademicStaffType(); - } - - /** - * Create an instance of {@link IsTeacherOfType } - * - */ - public IsTeacherOfType createIsTeacherOfType() { - return new IsTeacherOfType(); - } - - /** - * Create an instance of {@link AcTitleType } - * - */ - public AcTitleType createAcTitleType() { - return new AcTitleType(); - } - - /** - * Create an instance of {@link IsStudentType } - * - */ - public IsStudentType createIsStudentType() { - return new IsStudentType(); - } - - /** - * Create an instance of {@link HasDegreeType } - * - */ - public HasDegreeType createHasDegreeType() { - return new HasDegreeType(); - } - - /** - * Create an instance of {@link HabilitationType } - * - */ - public HabilitationType createHabilitationType() { - return new HabilitationType(); - } - - /** - * Create an instance of {@link MandateContentType } - * - */ - public MandateContentType createMandateContentType() { - return new MandateContentType(); - } - - /** - * Create an instance of {@link RepresentationPersonType } - * - */ - public RepresentationPersonType createRepresentationPersonType() { - return new RepresentationPersonType(); - } - - /** - * Create an instance of {@link Habilitation } - * - */ - public Habilitation createHabilitation() { - return new Habilitation(); - } - - /** - * Create an instance of {@link IsHCPType } - * - */ - public IsHCPType createIsHCPType() { - return new IsHCPType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "habilitation") - public JAXBElement createHabilitation(HabilitationType value) { - return new JAXBElement(_Habilitation_QNAME, HabilitationType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link HasDegreeType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasDegree") - public JAXBElement createHasDegree(HasDegreeType value) { - return new JAXBElement(_HasDegree_QNAME, HasDegreeType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spApplication") - public JAXBElement createSpApplication(String value) { - return new JAXBElement(_SpApplication_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "specialisation") - public JAXBElement createSpecialisation(String value) { - return new JAXBElement(_Specialisation_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsStudentType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isStudent") - public JAXBElement createIsStudent(IsStudentType value) { - return new JAXBElement(_IsStudent_QNAME, IsStudentType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AQAA") - public JAXBElement createAQAA(Integer value) { - return new JAXBElement(_AQAA_QNAME, Integer.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "HCPType") - public JAXBElement createHCPType(String value) { - return new JAXBElement(_HCPType_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalResidenceAddress") - public JAXBElement createCanonicalResidenceAddress(CanonicalAddressType value) { - return new JAXBElement(_CanonicalResidenceAddress_QNAME, CanonicalAddressType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AcTitleType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "acTitle") - public JAXBElement createAcTitle(AcTitleType value) { - return new JAXBElement(_AcTitle_QNAME, AcTitleType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "QualityAuthenticationAssuranceLevel") - public JAXBElement createQualityAuthenticationAssuranceLevel(Integer value) { - return new JAXBElement(_QualityAuthenticationAssuranceLevel_QNAME, Integer.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsAcademicStaffType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAcademicStaff") - public JAXBElement createIsAcademicStaff(IsAcademicStaffType value) { - return new JAXBElement(_IsAcademicStaff_QNAME, IsAcademicStaffType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsTeacherOfType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isTeacherOf") - public JAXBElement createIsTeacherOf(IsTeacherOfType value) { - return new JAXBElement(_IsTeacherOf_QNAME, IsTeacherOfType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsCourseCoordinatorType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isCourseCoordinator") - public JAXBElement createIsCourseCoordinator(IsCourseCoordinatorType value) { - return new JAXBElement(_IsCourseCoordinator_QNAME, IsCourseCoordinatorType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalRegisteredAddress") - public JAXBElement createCanonicalRegisteredAddress(CanonicalAddressType value) { - return new JAXBElement(_CanonicalRegisteredAddress_QNAME, CanonicalAddressType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spCountry") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement createSpCountry(String value) { - return new JAXBElement(_SpCountry_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsAdminStaffType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAdminStaff") - public JAXBElement createIsAdminStaff(IsAdminStaffType value) { - return new JAXBElement(_IsAdminStaff_QNAME, IsAdminStaffType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "CitizenCountryCode") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement createCitizenCountryCode(String value) { - return new JAXBElement(_CitizenCountryCode_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AttributeValue") - public JAXBElement createAttributeValue(Object value) { - return new JAXBElement(_AttributeValue_QNAME, Object.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link HasAccountInBankType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasAccountInBank") - public JAXBElement createHasAccountInBank(HasAccountInBankType value) { - return new JAXBElement(_HasAccountInBank_QNAME, HasAccountInBankType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "countryCodeAddress") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement createCountryCodeAddress(String value) { - return new JAXBElement(_CountryCodeAddress_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "study") - public JAXBElement createStudy(String value) { - return new JAXBElement(_Study_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional") - public JAXBElement createIsHealthCareProfessional(IsHealthCareProfessionalType value) { - return new JAXBElement(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate") - public JAXBElement createMandate(MandateType value) { - return new JAXBElement(_Mandate_QNAME, MandateType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "RequestedAttribute") - public JAXBElement createRequestedAttribute(RequestedAttributeType value) { - return new JAXBElement(_RequestedAttribute_QNAME, RequestedAttributeType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spSector") - public JAXBElement createSpSector(String value) { - return new JAXBElement(_SpSector_QNAME, String.class, null, value); - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RepresentationPersonType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RepresentationPersonType.java.svn-base deleted file mode 100644 index b1d993f89..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RepresentationPersonType.java.svn-base +++ /dev/null @@ -1,289 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for representationPersonType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="representationPersonType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element name="eIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="givenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="surname" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="dateOfBirth" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         </sequence>
- *         <sequence>
- *           <element name="eLPIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="address" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="canonicalAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}canonicalAddressType"/>
- *           <element name="type" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "representationPersonType", propOrder = { - "eIdentifier", - "givenName", - "surname", - "dateOfBirth", - "elpIdentifier", - "name", - "address", - "canonicalAddress", - "type" -}) -public class RepresentationPersonType { - - protected String eIdentifier; - protected String givenName; - protected String surname; - protected String dateOfBirth; - @XmlElement(name = "eLPIdentifier") - protected String elpIdentifier; - protected String name; - protected String address; - protected CanonicalAddressType canonicalAddress; - protected String type; - - /** - * Gets the value of the eIdentifier property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEIdentifier() { - return eIdentifier; - } - - /** - * Sets the value of the eIdentifier property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEIdentifier(String value) { - this.eIdentifier = value; - } - - /** - * Gets the value of the givenName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getGivenName() { - return givenName; - } - - /** - * Sets the value of the givenName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setGivenName(String value) { - this.givenName = value; - } - - /** - * Gets the value of the surname property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSurname() { - return surname; - } - - /** - * Sets the value of the surname property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSurname(String value) { - this.surname = value; - } - - /** - * Gets the value of the dateOfBirth property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDateOfBirth() { - return dateOfBirth; - } - - /** - * Sets the value of the dateOfBirth property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDateOfBirth(String value) { - this.dateOfBirth = value; - } - - /** - * Gets the value of the elpIdentifier property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getELPIdentifier() { - return elpIdentifier; - } - - /** - * Sets the value of the elpIdentifier property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setELPIdentifier(String value) { - this.elpIdentifier = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the address property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAddress() { - return address; - } - - /** - * Sets the value of the address property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAddress(String value) { - this.address = value; - } - - /** - * Gets the value of the canonicalAddress property. - * - * @return - * possible object is - * {@link CanonicalAddressType } - * - */ - public CanonicalAddressType getCanonicalAddress() { - return canonicalAddress; - } - - /** - * Sets the value of the canonicalAddress property. - * - * @param value - * allowed object is - * {@link CanonicalAddressType } - * - */ - public void setCanonicalAddress(CanonicalAddressType value) { - this.canonicalAddress = value; - } - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RequestedAttributeType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RequestedAttributeType.java.svn-base deleted file mode 100644 index 6a7c0b443..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/RequestedAttributeType.java.svn-base +++ /dev/null @@ -1,212 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - - -package eu.stork.peps.complex.attributes; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - - -/** - *

Java class for RequestedAttributeType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="RequestedAttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="NameFormat" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <anyAttribute processContents='lax' namespace='##other'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RequestedAttributeType", propOrder = { - "attributeValue" -}) -public class RequestedAttributeType { - - @XmlElement(name = "AttributeValue") - protected List attributeValue; - @XmlAttribute(name = "Name", required = true) - protected String name; - @XmlAttribute(name = "NameFormat", required = true) - @XmlSchemaType(name = "anyURI") - protected String nameFormat; - @XmlAttribute(name = "FriendlyName") - protected String friendlyName; - @XmlAttribute(name = "isRequired") - protected Boolean isRequired; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the attributeValue property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the attributeValue property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAttributeValue().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * - * - */ - public List getAttributeValue() { - if (attributeValue == null) { - attributeValue = new ArrayList(); - } - return this.attributeValue; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the nameFormat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameFormat() { - return nameFormat; - } - - /** - * Sets the value of the nameFormat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameFormat(String value) { - this.nameFormat = value; - } - - /** - * Gets the value of the friendlyName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFriendlyName() { - return friendlyName; - } - - /** - * Sets the value of the friendlyName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFriendlyName(String value) { - this.friendlyName = value; - } - - /** - * Gets the value of the isRequired property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsRequired() { - return isRequired; - } - - /** - * Sets the value of the isRequired property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsRequired(Boolean value) { - this.isRequired = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/package-info.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index 47e225d22..000000000 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.02.17 at 10:36:59 AM GMT -// - -@javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package eu.stork.peps.complex.attributes; diff --git a/id/server/stork2-commons/src/main/resources/.svn/all-wcprops b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops deleted file mode 100644 index 7f5879720..000000000 --- a/id/server/stork2-commons/src/main/resources/.svn/all-wcprops +++ /dev/null @@ -1,17 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 64 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/resources -END -log4j.xml -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources/log4j.xml -END -StorkcomplexAttributes.xsd -K 25 -svn:wc:ra_dav:version-url -V 91 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/resources/StorkcomplexAttributes.xsd -END diff --git a/id/server/stork2-commons/src/main/resources/.svn/entries b/id/server/stork2-commons/src/main/resources/.svn/entries deleted file mode 100644 index 3cafa50cf..000000000 --- a/id/server/stork2-commons/src/main/resources/.svn/entries +++ /dev/null @@ -1,96 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/resources -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -log4j.xml -file - - - - -2013-12-20T12:27:56.554475Z -aa8c46e41a236b8c7049713b3eeecc49 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -660 - -StorkcomplexAttributes.xsd -file - - - - -2014-03-05T09:36:07.834515Z -312be97fd22ecb2f274bf9fdebd85b29 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -10938 - diff --git a/id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base b/id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base deleted file mode 100644 index 3c56bd318..000000000 --- a/id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base deleted file mode 100644 index 8bce0bec0..000000000 --- a/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/id/server/stork2-commons/src/test/.svn/all-wcprops b/id/server/stork2-commons/src/test/.svn/all-wcprops deleted file mode 100644 index 20c6abf40..000000000 --- a/id/server/stork2-commons/src/test/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 54 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/test -END diff --git a/id/server/stork2-commons/src/test/.svn/entries b/id/server/stork2-commons/src/test/.svn/entries deleted file mode 100644 index 2340f1ba0..000000000 --- a/id/server/stork2-commons/src/test/.svn/entries +++ /dev/null @@ -1,34 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -resources -dir - -java -dir - diff --git a/id/server/stork2-commons/src/test/java/.svn/all-wcprops b/id/server/stork2-commons/src/test/java/.svn/all-wcprops deleted file mode 100644 index 0539c7776..000000000 --- a/id/server/stork2-commons/src/test/java/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 59 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/test/java -END diff --git a/id/server/stork2-commons/src/test/java/.svn/entries b/id/server/stork2-commons/src/test/java/.svn/entries deleted file mode 100644 index 022ccbba6..000000000 --- a/id/server/stork2-commons/src/test/java/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -eu -dir - diff --git a/id/server/stork2-commons/src/test/java/eu/.svn/all-wcprops b/id/server/stork2-commons/src/test/java/eu/.svn/all-wcprops deleted file mode 100644 index 1074db391..000000000 --- a/id/server/stork2-commons/src/test/java/eu/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 62 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/test/java/eu -END diff --git a/id/server/stork2-commons/src/test/java/eu/.svn/entries b/id/server/stork2-commons/src/test/java/eu/.svn/entries deleted file mode 100644 index b692975a3..000000000 --- a/id/server/stork2-commons/src/test/java/eu/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -stork -dir - diff --git a/id/server/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops b/id/server/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops deleted file mode 100644 index 7b9321684..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 68 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/test/java/eu/stork -END diff --git a/id/server/stork2-commons/src/test/java/eu/stork/.svn/entries b/id/server/stork2-commons/src/test/java/eu/stork/.svn/entries deleted file mode 100644 index 1b9026249..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu/stork -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -peps -dir - diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops b/id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops deleted file mode 100644 index 1a4a3889b..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/test/java/eu/stork/peps -END diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/entries b/id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/entries deleted file mode 100644 index 568fa8c62..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/.svn/entries +++ /dev/null @@ -1,31 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu/stork/peps -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -tests -dir - diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops deleted file mode 100644 index fd0288d3a..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/all-wcprops +++ /dev/null @@ -1,59 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 79 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/test/java/eu/stork/peps/tests -END -AttributeSourceTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 108 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java -END -ComplexAttributesMarshalling.java -K 25 -svn:wc:ra_dav:version-url -V 113 -/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java -END -PEPSUtilTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 100 -/CITnet/svn/STORK2/!svn/ver/96/trunk/Commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java -END -PersonalAttributeTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 109 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java -END -package-info.java -K 25 -svn:wc:ra_dav:version-url -V 96 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/java/eu/stork/peps/tests/package-info.java -END -DateUtilTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 100 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java -END -AttributeProvidersMapTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/712/trunk/Commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java -END -AttributeUtilTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 105 -/CITnet/svn/STORK2/!svn/ver/96/trunk/Commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java -END -PersonalAttributeListTestCase.java -K 25 -svn:wc:ra_dav:version-url -V 114 -/CITnet/svn/STORK2/!svn/ver/484/trunk/Commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java -END diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries deleted file mode 100644 index 7c5cf8a9d..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/entries +++ /dev/null @@ -1,334 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/java/eu/stork/peps/tests -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -PersonalAttributeTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -77386880d5ffadd21c9b3a3c7d51b990 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -5449 - -package-info.java -file - - - - -2013-12-20T12:27:56.518475Z -04f136539bda0caa3d5ccdfee912cfce -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -92 - -DateUtilTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -244cc6104660a7835dbf72dadb305d71 -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -8907 - -AttributeProvidersMapTestCase.java -file - - - - -2014-03-05T09:36:07.758515Z -1490c44149a87308c4a6cc0e2af88a85 -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -3995 - -AttributeUtilTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -6037f125adf7f4c2f6873a0d99ab0705 -2013-11-01T20:35:30.927048Z -96 -emferreri - - - - - - - - - - - - - - - - - - - - - -16318 - -PersonalAttributeListTestCase.java -file - - - - -2014-01-21T08:38:55.140702Z -ae552dce95a6b83d15e381306e2f5e59 -2014-01-15T09:44:59.969756Z -484 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -24508 - -AttributeSourceTestCase.java -file - - - - -2014-03-05T09:36:07.758515Z -1505085e4fd6c684d4f6a8db3d5ba233 -2014-03-03T15:10:40.224759Z -712 -emrepisja - - - - - - - - - - - - - - - - - - - - - -2465 - -ComplexAttributesMarshalling.java -file - - - - -2014-03-05T09:36:07.758515Z -aca1d76d312b0dc5026f852bb14ab5a5 -2014-03-04T14:10:03.192908Z -721 -emrepisja - - - - - - - - - - - - - - - - - - - - - -6363 - -PEPSUtilTestCase.java -file - - - - -2013-12-20T12:27:56.518475Z -f54beadeab9af936f44af326eb1116d2 -2013-11-01T20:35:30.927048Z -96 -emferreri - - - - - - - - - - - - - - - - - - - - - -16714 - diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base deleted file mode 100644 index 89f5adbed..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeProvidersMapTestCase.java.svn-base +++ /dev/null @@ -1,134 +0,0 @@ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import eu.stork.peps.auth.commons.AttributeProvider; -import eu.stork.peps.auth.commons.AttributeProvidersMap; -import eu.stork.peps.auth.commons.AttributeSource; -import eu.stork.peps.auth.commons.Country; -import eu.stork.peps.auth.commons.IAttributeProvidersMap; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PersonalAttributeList; - -/** - * The AttributeSource's Test Case. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: $, $Date: $ - */ -public class AttributeProvidersMapTestCase { - - @Test - public void testObjectOK1() { - final IAttributeProvidersMap map = new AttributeProvidersMap(); - final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(source) ) { - outcome = true; - } - - assertTrue(outcome); - } - - @Test - public void testObjectOK2() { - final IAttributeProvidersMap map = new AttributeProvidersMap(); - final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(source) ) { - if ( map.get(source)!=null ) { - outcome = true; - } - } - - assertTrue(outcome); - } - - @Test - public void testObjectOK3() { - final IAttributeProvidersMap map = new AttributeProvidersMap(); - final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - outcome = true; - } - - assertTrue(outcome); - } - - @Test - public void testObjectOK4() { - final IAttributeProvidersMap map = new AttributeProvidersMap(); - final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - if ( map.get(target)!=null ) { - outcome = true; - } - } - - assertTrue(outcome); - } - - @Test - public void testObjectNOK1() { - final IAttributeProvidersMap map = new AttributeProvidersMap(); - final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final AttributeSource target = new AttributeSource(new Country("ID1", "Name 1"), "URL"); - final IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - outcome = true; - } - - assertFalse(outcome); - } - - @Test - public void testObjectNOK2() { - final IAttributeProvidersMap map = new AttributeProvidersMap(); - final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL"); - final AttributeSource target = new AttributeSource(new AttributeProvider("ID2", "Name 1", null), "URL"); - final IPersonalAttributeList pal = new PersonalAttributeList(); - boolean outcome = false; - - //Add a single item - map.put(source, pal); - - if ( map.containsKey(target) ) { - outcome = true; - } - - assertFalse(outcome); - } -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base deleted file mode 100644 index e0f685ade..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base +++ /dev/null @@ -1,88 +0,0 @@ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -import eu.stork.peps.auth.commons.AttributeProvider; -import eu.stork.peps.auth.commons.AttributeSource; -import eu.stork.peps.auth.commons.Country; - -/** - * The AttributeSource's Test Case. - * - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) - * - * @version $Revision: $, $Date: $ - */ -public final class AttributeSourceTestCase { - private final AttributeSource ap1 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1"); - private final AttributeSource ap2 = new AttributeSource(new AttributeProvider("ID2", "Name 2", null), "URL2"); - private final AttributeSource ap3 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL2"); - private final AttributeSource ap4 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL1"); - private final AttributeSource ap5 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1"); - - private final AttributeSource c1 = new AttributeSource(new Country("ID1", "Name 1"), "URL1"); - private final AttributeSource c2 = new AttributeSource(new Country("ID2", "Name 2"), "URL2"); - private final AttributeSource c3 = new AttributeSource(new Country("ID1", "Name 2"), "URL2"); - private final AttributeSource c4 = new AttributeSource(new Country("ID1", "Name 2"), "URL1"); - private final AttributeSource c5 = new AttributeSource(new Country("ID1", "Name 1"), "URL1"); - - @Test - public void testNotEquals1() { - assertFalse(ap1.equals(ap2)); - } - - @Test - public void testNotEquals2() { - assertFalse(ap1.equals(c1)); - } - - @Test - public void testNotEquals3() { - assertFalse(c1.equals(c2)); - } - - @Test - public void testEquals1() { - assertTrue(ap1.equals(ap3)); - } - - @Test - public void testEquals2() { - assertTrue(ap1.equals(ap4)); - } - - @Test - public void testEquals3() { - assertTrue(ap1.equals(ap5)); - } - - @Test - public void testEquals4() { - assertTrue(c1.equals(c3)); - } - - @Test - public void testEquals5() { - assertTrue(c1.equals(c4)); - } - - @Test - public void testEquals6() { - assertTrue(c1.equals(c5)); - } - - @Test - public void testEquals7() { - final Object obj = ap5; - assertTrue(ap1.equals(obj)); - } - - @Test - public void testEquals8() { - final Object obj = c5; - assertTrue(c1.equals(obj)); - } -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base deleted file mode 100644 index 77fc4b9c2..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeUtilTestCase.java.svn-base +++ /dev/null @@ -1,537 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.Test; - -import eu.stork.peps.auth.commons.AttributeUtil; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSValues; -import eu.stork.peps.auth.commons.PersonalAttributeList; - -/** - * The AttributeUtil's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com - * - * @version $Revision: $, $Date: $ - */ -public final class AttributeUtilTestCase { - - /** - * Empty String to be used on the tests. - */ - private static final String EMPTY_STRING = ""; - - /** - * Tuple value sample to be used on the tests. - */ - private static final String[] TUPLE_STRING = new String[] { "age", "true", - "[18]", "Available" }; - - /** - * Complex value to be used on escape/unescape tests. - */ - private static final String COMPLEX_VAL = "postalCode=4100," - + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379," - + "streetName=Avenida Sidonio Pais,town=Porto,"; - - /** - * Escaped Complex value to be used on escape/unescape tests. - */ - private static final String ESC_COMPLEX_VAL = "postalCode=4100%44" - + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44" - + "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44"; - - /** - * Simple value to be used on escape/unescape tests. - */ - private static final String SIMPLE_VAL = "Avenida da Boavista, Porto"; - - /** - * Escaped simple value to be used on escape/unescape tests. - */ - private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto"; - - /** - * Simple text to be used on escape/unescape tests. Must match the escaped - * text. - */ - private static final String SIMPLE_TEXT = "John Doe"; - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given complex - * attribute value (canonical address' example attribute value). - */ - @Test - public void testEscapeSpecialCharsComplexVal() { - assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given - * attribute value. - */ - @Test - public void testEscapeSpecialCharsVal() { - assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given simple - * text: no special characters to escape. - */ - @Test - public void testEscapeNormalChars() { - assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#unescape(String)} method for the given - * escape complex attribute value (canonical address' example attribute - * value). - */ - @Test - public void testUnescapeSpecialCharsComplexVal() { - assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given escape - * attribute value. - */ - @Test - public void testUnescapeSpecialCharsVal() { - assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL); - } - - /** - * Tests the {@link AttributeUtil#escape(String)} method for the given simple - * text: no special characters to unescape. - */ - @Test - public void testUnescapeNormalChars() { - assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} - * method for the given empty string. - */ - @Test - public void testAppendIfNotNullEmptyStr() { - final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT); - AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING); - assertEquals(strBuilder.toString(), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} - * method for the given string. - */ - @Test - public void testAppendIfNotNullStr() { - final StringBuilder strBuilder = new StringBuilder(); - AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT); - assertEquals(strBuilder.toString(), SIMPLE_TEXT); - } - - /** - * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} - * method for the given null value. - */ - @Test - public void testAppendIfNotNull() { - final StringBuilder strBuilder = new StringBuilder(); - AttributeUtil.appendIfNotNull(strBuilder, null); - assertEquals(strBuilder.toString(), EMPTY_STRING); - } - - /** - * Tests the {@link AttributeUtil#listToString(List, String)} method for the - * given List with two values. - */ - @Test - public void testListToStringTwoVals() { - final List vals = new ArrayList(); - vals.add(SIMPLE_VAL); - vals.add(SIMPLE_TEXT); - - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append(SIMPLE_TEXT); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - assertEquals( - AttributeUtil.listToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#listToString(List, String)} method for the - * given List with one values. - */ - @Test - public void testListToStringOneVal() { - final List vals = new ArrayList(); - vals.add(SIMPLE_VAL); - - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - assertEquals( - AttributeUtil.listToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#listToString(List, String)} method for the - * given List with one value. - */ - @Test - public void testListToStringEmptyVal() { - final List vals = new ArrayList(); - - final StringBuilder strBuilder = new StringBuilder(); - - assertEquals( - AttributeUtil.listToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method - * for the given Map with one value. - */ - @Test - public void testMapToStringOneVal() { - final Map vals = new HashMap(); - vals.put("CanonicalAddress", COMPLEX_VAL); - - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("CanonicalAddress="); - strBuilder.append(ESC_COMPLEX_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - assertEquals(AttributeUtil.mapToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method - * for the given empty Map. - */ - @Test - public void testMapToStringEmptyVal() { - final Map vals = new HashMap(); - - final StringBuilder strBuilder = new StringBuilder(); - - assertEquals(AttributeUtil.mapToString(vals, - PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString()); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * invalid List. - */ - @Test - public void testIsValidValueInvalidList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append("]"); - assertFalse(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * null value. - */ - @Test - public void testIsValidValueNullList() { - assertFalse(AttributeUtil.isValidValue(null)); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * empty List. - */ - @Test - public void testIsValidValueEmptyList() { - assertTrue(AttributeUtil.isValidValue("[]")); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * empty List. - */ - @Test - public void testIsValidValueEmptyCommaList() { - assertTrue(AttributeUtil.isValidValue("[,]")); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one simple value List. - */ - @Test - public void testIsValidValueOneValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one simple value List. - */ - @Test - public void testIsValidValueOneValueCommaList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one complex value List. - */ - @Test - public void testIsValidValueOneComplexValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_COMPLEX_VAL); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * one complex value List. - */ - @Test - public void testIsValidValueOneComplexValueCommaList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_COMPLEX_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * multi value List. - */ - @Test - public void testIsValidValueMultiValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append("["); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append(SIMPLE_TEXT); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertTrue(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidValue(String)} method for the given - * invalid multi value List. - */ - @Test - public void testIsValidValueInvalidMultiValueList() { - final StringBuilder strBuilder = new StringBuilder(); - strBuilder.append(ESC_SIMPLE_VAL); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append(SIMPLE_TEXT); - strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - strBuilder.append("]"); - assertFalse(AttributeUtil.isValidValue(strBuilder.toString())); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * true type. - */ - @Test - public void testIsValidTypetrue() { - assertTrue(AttributeUtil.isValidType("true")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * True type. - */ - @Test - public void testIsValidTypeTrue() { - assertTrue(AttributeUtil.isValidType("True")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * TRUE type. - */ - @Test - public void testIsValidTypeTRUE() { - assertTrue(AttributeUtil.isValidType("TRUE")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * invalid type. - */ - @Test - public void testIsValidTypeInvalidType() { - assertFalse(AttributeUtil.isValidType("str")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * false type. - */ - @Test - public void testIsValidTypefalse() { - assertTrue(AttributeUtil.isValidType("false")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * False type. - */ - @Test - public void testIsValidTypeFalse() { - assertTrue(AttributeUtil.isValidType("False")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * FALSE type. - */ - @Test - public void testIsValidTypeFALSEVal() { - assertTrue(AttributeUtil.isValidType("False")); - } - - /** - * Tests the {@link AttributeUtil#isValidType(String)} method for the given - * null. - */ - @Test - public void testIsValidTypeNullVal() { - assertFalse(AttributeUtil.isValidType(null)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given valid tuple. - */ - @Test - public void testHasValidTuples() { - assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given invalid tuple. - */ - @Test - public void testHasValidTuplesInvalid() { - final String[] tuple = new String[]{"name", "type"}; - assertFalse(AttributeUtil.hasValidTuples(tuple)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given invalid tuple with valid size. - */ - @Test - public void testHasValidTuplesSameSizeInvalidValues() { - final String[] tuple = new String[] { "age", "type", "[18]", "Available"}; - assertFalse(AttributeUtil.hasValidTuples(tuple)); - } - - /** - * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the - * given null value. - */ - @Test - public void testHasValidTuplesNull() { - assertFalse(AttributeUtil.hasValidTuples(null)); - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given attribute list.. - */ - @Test - public void testCheckMandatoryAttributes() { - final IPersonalAttributeList attrList = new PersonalAttributeList(); - attrList.populate("isAgeOver:true:[18,]:Available;"); - assertTrue(AttributeUtil.checkMandatoryAttributes(attrList)); - - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given null value. - */ - @Test(expected = NullPointerException.class) - public void testCheckMandatoryAttributesNullAttrList() { - assertTrue(AttributeUtil.checkMandatoryAttributes(null)); - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given empty attribute list. - */ - @Test - public void testCheckMandatoryAttributesEmptyAttrList() { - final IPersonalAttributeList attrList = new PersonalAttributeList(); - assertTrue(AttributeUtil.checkMandatoryAttributes(attrList)); - } - - /** - * Tests the - * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} - * method for the given attribute list (missing mandatory attribute). - */ - @Test - public void testCheckMandatoryAttributesMissingAttr() { - final IPersonalAttributeList attrList = new PersonalAttributeList(); - attrList.populate("isAgeOver:true:[]:NotAvailable;"); - assertFalse(AttributeUtil.checkMandatoryAttributes(attrList)); - } - -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/ComplexAttributesMarshalling.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/ComplexAttributesMarshalling.java.svn-base deleted file mode 100644 index c7e195fa6..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/ComplexAttributesMarshalling.java.svn-base +++ /dev/null @@ -1,187 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * --- - * - * Test cases for marshalling complex attributes. - * - * Implemented are two testcases for marshalling and unmarshalling. These testcases are - * for canonical residenc address and has bank account. - */ - -package eu.stork.peps.tests; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; - -import org.junit.Test; - -import eu.stork.peps.complex.attributes.CanonicalAddressType; -import eu.stork.peps.complex.attributes.HasAccountInBankType; -import eu.stork.peps.complex.attributes.ObjectFactory; - -/** - * @author Advania - * - * Examples on how to use the jaxb marshaller. - * - * The classes are created from the StorkcomplexAttributes.xsd schema located in resources. - * - * @version $Revision: 1.00 $, $Date: 2014-17-02 11:15:00 $ - * - */ - -public class ComplexAttributesMarshalling { - - /** - * Test marshalling canonical address - * - * - * IS - * Reykjavik - * RVK - * Reykjavik - * 101 - * Laugavegur - * 1 - * 10 - * - */ - @Test - public void testMarshallCanonicalResidencAddress() - { - try - { - final CanonicalAddressType object = new CanonicalAddressType(); - object.setApartmentNumber("10"); - object.setCountryCodeAddress("IS"); - object.setMunicipalityCode("RVK"); - object.setPostalCode("101"); - object.setState("Reykjavik"); - object.setStreetName("Laugavegur"); - object.setStreetNumber("1"); - object.setTown("Reykjavik"); - - final JAXBContext context = JAXBContext.newInstance(CanonicalAddressType.class); - final Marshaller m = context.createMarshaller(); - m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); - final ObjectFactory objf = new ObjectFactory(); - - m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml")); - m.marshal(objf.createCanonicalResidenceAddress(object), System.out); - } - catch (JAXBException | FileNotFoundException e) - { - e.printStackTrace(); - } - } - - /** - * Test unmarshalling canonical address - * - * - * IS - * Reykjavik - * RVK - * Reykjavik - * 101 - * Laugavegur - * 1 - * 10 - * - */ - @Test - public void testUnmarshallCanonicalAddress() - { - JAXBContext uContext; - try - { - uContext = JAXBContext.newInstance(CanonicalAddressType.class); - final Unmarshaller u = uContext.createUnmarshaller(); - final File file = new File("CanonicalAddressType.xml"); - - final JAXBElement root = u.unmarshal(new StreamSource(file), CanonicalAddressType.class); - final CanonicalAddressType foo = root.getValue(); - - final String A = foo.getStreetName(); - final String B = foo.getStreetNumber(); - - System.out.println("Streetname: " + A); - System.out.println("Streetnumber: " + B); - - } - catch (final JAXBException e) - { - e.printStackTrace(); - } - } - - /** - * Test marshalling has bank account - * - * - * Arion - * 3 - * - */ - @Test - public void testMarshallHasBankAccount() - { - try - { - final HasAccountInBankType object = new HasAccountInBankType(); - object.setAQAA(3); - object.setBankName("Arion Bank"); - final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class); - final Marshaller m = context.createMarshaller(); - final ObjectFactory o = new ObjectFactory(); - m.marshal(o.createHasAccountInBank(object), new FileOutputStream ("hasbankaccount.xml")); - m.marshal(o.createHasAccountInBank(object), System.out); - - } catch (JAXBException | FileNotFoundException e) { - e.printStackTrace(); - } - } - /** - * Test unmarshalling has bank account - * - * - * Arion - * 3 - * - */ - @Test - public void testUnmarshallHasBankAccount() - { - try - { - final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class); - final Unmarshaller um = context.createUnmarshaller(); - final File file = new File("hasbankaccount.xml"); - final JAXBElement root = um.unmarshal(new StreamSource(file), HasAccountInBankType.class); - final HasAccountInBankType foo = root.getValue(); - System.out.println(foo.getBankName()); - } catch (final JAXBException e) { - e.printStackTrace(); - } - } - -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base deleted file mode 100644 index 5d2296997..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/DateUtilTestCase.java.svn-base +++ /dev/null @@ -1,294 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import java.sql.Timestamp; -import java.util.Properties; - -import org.joda.time.DateTime; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.DateUtil; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException; - -/** - * The PersonalAttribute's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.2 $, $Date: 2010-11-17 05:17:03 $ - */ -public final class DateUtilTestCase { - - /** - * Stork Format date. - */ - private static final String FORMAT = "yyyyMMdd"; - - /** - * Expected 10 value. - */ - private static final int TEN = 10; - - /** - * Expected 11 value. - */ - private static final int ELEVEN = 11; - - /** - * The testing Date ("current" date). - */ - private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20, - 0, 0); - - /** - * Init DateUtilTestCase class. - */ - @BeforeClass - public static void runsBeforeTheTestSuite() { - final Properties configs = new Properties(); - configs.setProperty("invalidAgeDateValue.code", "35"); - configs.setProperty("invalidAttributeValue.code", "34"); - configs - .setProperty( - "invalidAttributeValue.message", - "Unexpected or invalid content was encountered within a " - + " or element."); - PEPSUtil.createInstance(configs); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year against - * the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromYear() { - Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year and month - * against the testDate: 2011-10-10 15:20:00.0. Must return 11. - */ - @Test - public void calculateAgeFromEarlyMonth() { - Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE, - FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year and month - * against the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromSameMonth() { - Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given year and month - * against the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromLaterMonth() { - Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return 11. - */ - @Test - public void calculateAgeFromEarlyFullDate() { - Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE, - FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return 11. - */ - @Test - public void calculateAgeFromSameDay() { - Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE, - FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return 10. - */ - @Test - public void calculateAgeFromLaterFullDate() { - Assert.assertTrue(TEN == DateUtil - .calculateAge("20001011", TESTDATE, FORMAT)); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromInvalidDate() { - DateUtil.calculateAge("200", TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromInvalidMonth() { - DateUtil.calculateAge("200013", TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromInvalidDay() { - DateUtil.calculateAge("20000230", TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromNullDate() { - DateUtil.calculateAge(null, TESTDATE, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromNullCurDate() { - DateUtil.calculateAge("2000", null, FORMAT); - } - - /** - * Tests the {@link DateUtil#calculateAge} method for the given full date - * against the testDate: 2011-10-10 15:20:00.0. Must return a - * SecurityPEPSException exception. - */ - @Test(expected = SecurityPEPSException.class) - public void calculateAgeFromNullFormat() { - DateUtil.calculateAge("2000", TESTDATE, null); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return true - */ - @Test - public void isValidFormatDateFromYear() { - Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year and - * month. Must return true. - */ - @Test - public void isValidFormatDateFromMonth() { - Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDate() { - Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateInvalidYear() { - Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateInvalidMonth() { - Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateInvalidDate() { - Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateNullDate() { - Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT)); - } - - /** - * Tests the {@link DateUtil#isValidFormatDate} method for the given year. - * Must return false. - */ - @Test - public void isValidFormatDateNullFormat() { - Assert.assertFalse(DateUtil.isValidFormatDate("2000", null)); - } - - /** - * Tests the {@link DateUtil#currentTimeStamp()} method for the current - * TimeStamp (TS). Must return true. - */ - @Test - public void testCurrentTimeStampBefore() { - Timestamp ts = DateUtil.currentTimeStamp(); - Assert.assertNotSame(ts, DateUtil.currentTimeStamp()); - } - - /** - * Tests the {@link DateUtil#currentTimeStamp()} method for the current - * TimeStamp (TS). Must return true. - */ - @Test - public void testCurrentTimeStampAfter() { - Timestamp ts = DateUtil.currentTimeStamp(); - Assert.assertEquals(DateUtil.currentTimeStamp(), ts); - } - -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base deleted file mode 100644 index d4841ed43..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PEPSUtilTestCase.java.svn-base +++ /dev/null @@ -1,553 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; - -import java.util.Properties; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSErrors; -import eu.stork.peps.auth.commons.PEPSParameters; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.PersonalAttributeList; -import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException; -import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException; - -/** - * The PEPSUtil's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com - * - * @version $Revision: $, $Date: $ - */ -public final class PEPSUtilTestCase { - - /** - * Message example. - */ - private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed"; - - /** - * Error message example. - */ - private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed"; - - /** - * Error code example. - */ - private static final String ERROR_CODE_SAMPLE = "003002"; - - /** - * Properties values for testing proposes. - */ - private static final Properties CONFIGS1 = new Properties(); - - /** - * Properties values for testing proposes. - */ - private static final Properties CONFIGS2 = new Properties(); - - /** - * The empty string value: "". - */ - private static final String EMPTY_STRING = ""; - - /** - * The empty byte value: []. - */ - private static final byte[] EMPTY_BYTE = new byte[] {}; - - /** - * The empty byte hash value. - */ - private static final byte[] EMPTY_HASH_BYTE = new byte[] { -49, -125, -31, - 53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28, - 5, 11, 87, 21, -36, -125, -12, -87, 33, -45, 108, -23, -50, 71, -48, -47, - 60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49, - -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62 }; - - /** - * The SAML example byte[] value. - */ - private static final byte[] SAML_BYTE_SAMPLE = new byte[] { 60, 115, 97, 109, - 108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108 }; - - /** - * The SAML's Base64 example value. - */ - private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s"; - - /** - * The SAML's Base64 byte[] example value. - */ - private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[] { 80, 72, 78, 104, - 98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115 }; - - /** - * The SAML's Base64 Hash byte[] example value. - */ - private static byte[] HASH_BYTE_SAMPLE = new byte[] { 67, 38, 11, 115, 49, - -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67, - 90, 101, 30, 82, -13, 60, -106, -72, -103, -75, 19, 2, -107, 107, -6, -56, - 34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12, - -102, 12, -56, 30, -59, -104, -21, -42, -103, 82 }; - - /** - * Init PEPSUtilTestCase class. - */ - @BeforeClass - public static void runsBeforeTheTestSuite() { - - CONFIGS1.setProperty("max.attrList.size", "20000"); - CONFIGS1.setProperty("attrList.code", "202005"); - CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter"); - - CONFIGS1.setProperty("max.qaaLevel.size", "1"); - CONFIGS1.setProperty("max.spUrl.size", "inv"); - CONFIGS1.setProperty("validation.active", "true"); - CONFIGS1.setProperty("hashDigest.className", - "org.bouncycastle.crypto.digests.SHA512Digest"); - CONFIGS1.setProperty("invalidAgeDateValue.code", "35"); - CONFIGS1.setProperty("invalidAttributeValue.code", "34"); - CONFIGS1.setProperty("invalidAttributeValue.message", - "Unexpected or invalid content was encountered within a " - + " or element."); - } - - /** - * Tests the {@link PEPSUtil#createInstance(Properties)} method for the given - * properties object. - */ - @Test - public void testCreateInstance() { - Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2)); - } - - /** - * Tests the {@link PEPSUtil#getConfigs()}. - */ - @Test - public void testGetConfigs() { - final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1); - assertEquals(pepsUtils.getConfigs(), CONFIGS1); - } - - /** - * Tests the {@link PEPSUtil#getConfigs()}. - */ - @Test - public void testGetConfigsDifferent() { - final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1); - assertNotSame(pepsUtils.getConfigs(), CONFIGS2); - } - - /** - * Tests the {@link PEPSUtil#getConfig(String)} method for the given existing - * config. - */ - @Test - public void testGetConfigExists() { - assertEquals(PEPSUtil.getConfig("hashDigest.className"), - "org.bouncycastle.crypto.digests.SHA512Digest"); - } - - /** - * Tests the {@link PEPSUtil#getConfig(String)} method for the given not - * existing config. - */ - @Test - public void testGetConfigNoExists() { - assertNull(PEPSUtil.getConfig("doesnt.exists")); - } - - /** - * Tests the {@link PEPSUtil#getConfig(String)} method for the given null - * value. - */ - @Test(expected = NullPointerException.class) - public void testGetConfigNull() { - assertNull(PEPSUtil.getConfig(null)); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterExists() { - assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterExistsGreat() { - assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterExistsIvalidConf() { - assertFalse(PEPSUtil - .isValidParameter("spUrl", "http://localhost:8080/SP/")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterNotExists() { - assertFalse(PEPSUtil.isValidParameter("doesntexists", - "http://localhost:8080/SP/")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterNullParamName() { - assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/")); - } - - /** - * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the - * given param values. - */ - @Test - public void testIsValidParameterNullParamValue() { - assertFalse(PEPSUtil.isValidParameter("spUrl", null)); - } - - /** - * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method - * for the given object values. - */ - @Test - public void testValidateParameterValid() { - final IPersonalAttributeList persAttrList = new PersonalAttributeList(); - persAttrList.populate("isAgeOver:true:[15,]:Available;"); - PEPSUtil.validateParameter("ServiceProviderAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList); - } - - /** - * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method - * for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterNull() { - PEPSUtil.validateParameter("ServiceProviderAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), null); - } - - /** - * Tests the {@link PEPSUtil#validateParameter(String, String, String)} method - * for the given string values. - * - * The tested class just invokes - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * so further tests will be later. - */ - @Test - public void testValidateParameter() { - PEPSUtil.validateParameter("ServiceProviderAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), - "isAgeOver:true:[15,]:Available;"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)} - * method for the given string value and {@link PEPSErrors} enum. - * - * The tested class just invokes - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * so further tests will be later. - */ - @Test - public void testValidateParameterPEPSErrors() { - PEPSUtil.validateParameter("CountrySelectorAction", - PEPSParameters.ATTRIBUTE_LIST.toString(), - "isAgeOver:true:[15,]:Available;", - PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test - public void testValidateParameterValidParams() { - PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterInvalidParamValue() { - PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterInvalidParamName() { - PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterNullParamName() { - PEPSUtil.validateParameter("ServiceProviderAction", null, "1", - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the - * {@link PEPSUtil#validateParameter(String, String, String, String, String)} - * method for the given string values. - */ - @Test(expected = InvalidParameterPEPSException.class) - public void testValidateParameterNullParamValue() { - PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null, - "qaaLevel.code", "qaaLevel.message"); - } - - /** - * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given - * string value. - */ - @Test - public void testEncodeSAMLToken() { - assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given - * null. - */ - @Test(expected = NullPointerException.class) - public void testEncodeSAMLTokenNull() { - assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given - * empty byte[] value. - */ - @Test - public void testEncodeSAMLTokenEmpty() { - assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING); - } - - /** - * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given - * byte[] value. - */ - @Test - public void testDecodeSAMLToken() { - assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE), - SAML_BYTE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given - * null value. - */ - @Test(expected = NullPointerException.class) - public void testDecodeSAMLTokenNull() { - assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given - * empty string value. - */ - @Test(expected = StringIndexOutOfBoundsException.class) - public void testDecodeSAMLTokenEmpty() { - assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE); - } - - /** - * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given - * byte[] value. - */ - @Test - public void testHashPersonalToken() { - assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE), - HASH_BYTE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given - * null value. - */ - @Test(expected = InternalErrorPEPSException.class) - public void testHashPersonalTokenNull() { - assertNull(PEPSUtil.hashPersonalToken(null)); - } - - /** - * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given - * empty value. - */ - @Test - public void testHashPersonalTokenEmpty() { - assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * correct message. - */ - @Test - public void testGetStorkErrorCodeExists() { - assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * invalid message. - */ - @Test - public void testGetStorkErrorCodeNoExists() { - assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * empty message. - */ - @Test - public void testGetStorkErrorCodeEmpty() { - assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * null message. - */ - @Test - public void testGetStorkErrorCodeNull() { - assertNull(PEPSUtil.getStorkErrorCode(null)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * invalid message. - */ - @Test - public void testGetStorkErrorCodeWithSepFake() { - assertNull(PEPSUtil.getStorkErrorCode("-")); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given - * invalid message. - */ - @Test - public void testGetStorkErrorCodeWithSepAndCodeFake() { - assertNull(PEPSUtil.getStorkErrorCode("000001 -")); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given correct message. - */ - @Test - public void testGetStorkErrorMessageExists() { - assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE), - ERROR_MESSAGE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given invalid message. - */ - @Test - public void testGetStorkErrorMessageNoExists() { - assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE), - ERROR_MESSAGE_SAMPLE); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given empty message. - */ - @Test - public void testGetStorkErrorMessageEmpty() { - assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING), - EMPTY_STRING); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given null message. - */ - @Test - public void testGetStorkErrorMessageNull() { - assertNull(PEPSUtil.getStorkErrorMessage(null)); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given invalid message. - */ - @Test - public void testGetStorkErrorMessageWithSepFake() { - assertEquals(PEPSUtil.getStorkErrorMessage("-"),"-"); - } - - /** - * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the - * given invalid message. - */ - @Test - public void testGetStorkErrorMessageWithSepAndCodeFake() { - assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"),"000001 -"); - } - -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base deleted file mode 100644 index 7052b320a..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeListTestCase.java.svn-base +++ /dev/null @@ -1,747 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.PersonalAttributeList; -import eu.stork.peps.auth.commons.STORKStatusCode; - -/** - * The PersonalAttributeList's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.5 $, $Date: 2010-11-17 05:17:02 $ - */ -public final class PersonalAttributeListTestCase { - - /** - * isAgeOver constant value. - */ - private static final String ISAGEOVER_CONS = "isAgeOver"; - - /** - * 1 constant value. - */ - private static final int ONE_CONS = 1; - - /** - * 2 constant value. - */ - private static final int TWO_CONS = 2; - - /** - * An empty attribute. - */ - @SuppressWarnings("unused") - private static final PersonalAttributeList EMPTY_ATTR_LIST = - new PersonalAttributeList(0); - - /** - * An attribute with a complex value (canonicalResidenceAddress). - */ - private static PersonalAttribute complexAttrValue = null; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST = - "isAgeOver:true:[15,]:Available;"; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST2 = - "isAgeOver:true:[18,]:Available;"; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST3 = - "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;"; - - /** - * Simple attribute value list string. - */ - private static final String SIMPLE_ATTRLIST3_REVERSE = - "isAgeOver:true:[18,]:Available;isAgeOver:true:[15,]:Available;"; - /** - * Simple attribute value list string. - */ - private static final String COMPLEX_ATTRLIST = - "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B," - + "state=Porto,countryCodeAddress=PT,streetNumber=379," - + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;"; - /** - * Mix attribute list string. - */ - private static final String STR_MIX_ATTR_LIST = - "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" - + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT," - + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:" - + "Available;"; - - /** - * Mix attribute list 2 string. - */ - private static final String STR_MIX_ATTR_LIST2 = - "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" - + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT," - + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:Available;" - + "mandateContent:true:[" - + "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:" - + "Available;"; - - /** - * Attribute List example. - */ - @SuppressWarnings({ "serial" }) - private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute( - "age", true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - /** - * Init PersonalAttributeListTestCase class. - */ - @SuppressWarnings("serial") - @BeforeClass - public static void runsBeforeTheTestSuite() { - final Map values = new HashMap() { - { - put("countryCodeAddress", "PT"); - put("state", "Porto"); - put("town", "Porto"); - put("postalCode", "4100"); - put("streetName", "Avenida Sidonio Pais"); - put("streetNumber", "379"); - put("apartmentNumber", "Ed. B"); - } - }; - - complexAttrValue = - new PersonalAttribute("canonicalResidenceAddress", true, values, - STORKStatusCode.STATUS_AVAILABLE.toString()); - - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 1 - Simple attribute. - */ - @Test - public void testAddSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(ATTR_VALUE); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 1 - Complex attribute. - */ - @Test - public void testAddCompleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(complexAttrValue); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 0 - no attribute. - */ - @Test - public void testAddNull() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(null); - Assert.assertTrue(attrList.size() == 0); - } - - /** - * Testing Personal Attribute List add method. Same attribute name added - * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added - * twice. - */ - @SuppressWarnings("serial") - @Test - public void testAddSameAttrName() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List add method. Same attribute name added - * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added - * twice. - */ - @SuppressWarnings("serial") - @Test - public void testAddSameAttrNameEmpty() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add(""); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 1 - Simple Value. - */ - @Test - public void testPutSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(ATTR_VALUE.getName(), ATTR_VALUE); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 1 - Complex Value. - */ - @Test - public void testPutComplexAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(ATTR_VALUE.getName(), complexAttrValue); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 0 - no attribute. - */ - @Test - public void testPutNull() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put("", null); - Assert.assertTrue(attrList.size() == 0); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 2 - IsAgeOver attribute added twice. - */ - @SuppressWarnings("serial") - @Test - public void testPutSameAttrName() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List put method. Personal Attribute list must be - * size 2 - IsAgeOver attribute added twice. - */ - @SuppressWarnings("serial") - @Test - public void testPutSameAttrNameEmpty() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add(""); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List get method. Personal Attribute list must be - * size 1 - Simple attribute. - */ - @Test - public void testGetSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(ATTR_VALUE); - Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName())); - } - - /** - * Testing Personal Attribute List add method. Personal Attribute list must be - * size 1 - Complex attribute. - */ - @Test - public void testGetCompleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(complexAttrValue); - Assert.assertEquals(complexAttrValue.toString(), - attrList.get(complexAttrValue.getName()).toString()); - } - - /** - * Testing Personal Attribute List get method. Personal Attribute list must be - * size 2 - IsAgeOver attribute. - */ - @SuppressWarnings("serial") - @Test - public void testGetIsAgeOverAttr() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertEquals(SIMPLE_ATTRLIST, - attrList.get(attrValueUnder.getName()).toString()); - Assert.assertEquals(SIMPLE_ATTRLIST2, - attrList.get(attrValueOver.getName()).toString()); - } - - /** - * Testing Personal Attribute List populate method. Personal Attribute list - * must be size 1 - Simple attribute. - */ - @Test - public void testPopulateSimpleAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(SIMPLE_ATTRLIST); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List populate method. Personal Attribute list - * must be size 1 - Complex attribute. - */ - @Test - public void testPopulateComplexAttr() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(COMPLEX_ATTRLIST); - Assert.assertTrue(attrList.size() == 1); - } - - /** - * Testing Personal Attribute List populate method. Personal Attribute list - * must be size 1 - Simple and Complex attribute. - */ - @Test - public void testPopulateMixAttrs() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(STR_MIX_ATTR_LIST); - Assert.assertTrue(attrList.size() == 2); - } - - /** - * Testing Personal Attribute List toString method using add. - */ - @SuppressWarnings("serial") - @Test - public void testToStringFromAdd() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString()); - } - - /** - * Testing Personal Attribute List toString method using put. - * - */ - @SuppressWarnings("serial") - @Test - public void testToStringFromPut() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString()); - } - - /** - * Testing Personal Attribute List toString method using populate. - */ - @Test - public void testToStringFromSimplePopulate() { - final String strAttrList = "isAgeOver:true"; - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(strAttrList); - Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString()); - } - - /** - * Testing Personal Attribute List toString method using populate. - */ - @Test - public void testToStringFromPopulate() { - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.populate(SIMPLE_ATTRLIST3); - Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString()); - } - - /** - * Testing Personal Attribute List populate method, with invalid values. - */ - @Test - public void testPopulateWithInvalidValuesFormat() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate("name:type:values:status;"); - Assert.assertEquals(pal, new PersonalAttributeList()); - } - - /** - * Testing Personal Attribute List populate method, with invalid format. - */ - @Test - public void testPopulateWithInvalidFormat() { - - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate("name:type::status;"); - Assert.assertEquals(pal, new PersonalAttributeList()); - } - - /** - * Testing Personal Attribute List clone method using add. - */ - @SuppressWarnings("serial") - @Test - public void testCloneFromAdd() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.add(attrValueUnder); - attrList.add(attrValueOver); - Assert.assertNotSame(attrList, attrList.clone()); - } - - /** - * Testing Personal Attribute List clone method using put. - */ - @SuppressWarnings("serial") - @Test - public void testCloneFromPut() { - final PersonalAttribute attrValueUnder = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - final PersonalAttribute attrValueOver = - new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() { - { - add("18"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - final PersonalAttributeList attrList = new PersonalAttributeList(1); - attrList.put(attrValueUnder.getName(), attrValueUnder); - attrList.put(attrValueOver.getName(), attrValueOver); - Assert.assertNotSame(attrList, attrList.clone()); - } - - /** - * Testing Personal Attribute List clone method using populate. - */ - @Test - public void testCloneFromPopulate() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(SIMPLE_ATTRLIST3); - Assert.assertNotSame(pal, pal.clone()); - } - - /** - * Testing Personal Attribute List iterator. - */ - @Test - public void testIterator() { - final String strAttrList = - "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - final Iterator itAttr = pal.iterator(); - while (itAttr.hasNext()) { - final PersonalAttribute attr = itAttr.next(); - Assert.assertEquals(ISAGEOVER_CONS, attr.getName()); - } - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method with empty attribute list. - */ - @Test - public void testGetOptionalAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getOptionalAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method without optional attributes. - */ - @Test - public void testGetOptionalAttributesWithoutOptional() { - final String strAttrList = - "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getOptionalAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method with one optional attribute. - */ - @Test - public void testGetOptionalAttributesWithOneOptional() { - final String strAttrList = - "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetOptionalAttributes method with two optional attribute. - */ - @Test - public void testGetOptionalAttributesWithOnlyOptional() { - final String strAttrList = - "age:false:[]:;isAgeOver:false:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS); - } - - /** - * Testing Personal Attribute List's getMandatoryAttributes method with empty attribute list. - */ - @Test - public void testGetMandatoryAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getMandatoryAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getMandatoryAttributes method without mandatory attributes. - */ - @Test - public void testGetMandatoryAttributesWithoutMandatory() { - final String strAttrList = - "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getMandatoryAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with one mandatory attribute. - */ - @Test - public void testGetMandatoryAttributesWithOneMandatory() { - final String strAttrList = - "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with two mandatory attribute. - */ - @Test - public void testGetMandatoryAttributesWithOnlyMandatory() { - final String strAttrList = - "age:true:[]:;isAgeOver:true:[18,]:;"; - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(strAttrList); - Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS); - } - - /** - * Testing Personal Attribute List's getSimpleValueAttributes method with empty attribute list. - */ - @Test - public void testGetSimpleValueAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getSimpleValueAttributes() method without simple attributes. - */ - @Test - public void testGetSimpleValueAttributesWithoutSimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(COMPLEX_ATTRLIST); - Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getSimpleValueAttributes() method with one simple attribute. - */ - @Test - public void testGetSimpleValueAttributesWithOneSimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(STR_MIX_ATTR_LIST); - Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with two simple attribute. - */ - @Test - public void testGetSimpleValueAttributesWithOnlySimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(SIMPLE_ATTRLIST3); - Assert.assertTrue(pal.getSimpleValueAttributes().size() == TWO_CONS); - } - - /** - * Testing Personal Attribute List's getComplexValueAttributes method with empty attribute list. - */ - @Test - public void testGetComplexAttributesWithEmptyList() { - final PersonalAttributeList pal = new PersonalAttributeList(); - Assert.assertTrue(pal.getComplexAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getComplexAttributes() method without complex attributes. - */ - @Test - public void testGetComplexAttributesWithoutSimple() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(SIMPLE_ATTRLIST2); - Assert.assertTrue(pal.getComplexAttributes().isEmpty()); - } - - /** - * Testing Personal Attribute List's getComplexAttributes() method with one complex attribute. - */ - @Test - public void testGetComplexAttributesWithOneComplex() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(STR_MIX_ATTR_LIST); - Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS); - } - - /** - * Testing Personal Attribute List's GetMandatoryAttributes method with only two Complex attribute. - */ - @Test - public void testGetComplexAttributesWithOnlyComplex() { - final PersonalAttributeList pal = new PersonalAttributeList(); - pal.populate(STR_MIX_ATTR_LIST2); - Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS); - } - -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base deleted file mode 100644 index 458d510e0..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/PersonalAttributeTestCase.java.svn-base +++ /dev/null @@ -1,182 +0,0 @@ -/* - * This work is Open Source and licensed by the European Commission under the - * conditions of the European Public License v1.1 - * - * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); - * - * any use of this file implies acceptance of the conditions of this license. - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - */ -package eu.stork.peps.tests; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import junit.framework.Assert; - -import org.junit.BeforeClass; -import org.junit.Test; - -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.STORKStatusCode; - -/** - * The PersonalAttribute's Test Case. - * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com - * @version $Revision: 1.4 $, $Date: 2010-11-17 05:17:03 $ - */ -public final class PersonalAttributeTestCase { - - /** - * An empty attribute. - */ - private static final PersonalAttribute EMPTYATTR = new PersonalAttribute(); - - /** - * An attribute with a complex value (canonicalResidenceAddress). - */ - private static PersonalAttribute complexAttrValue = null; - - /** - * An attribute with a simple value (age). - */ - @SuppressWarnings("serial") - private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute( - "age", true, new ArrayList() { - { - add("15"); - } - }, STORKStatusCode.STATUS_AVAILABLE.toString()); - - /** - * Init PersonalAttributeTestCase class. - */ - @SuppressWarnings("serial") - @BeforeClass - public static void runsBeforeTheTestSuite() { - final Map values = new HashMap() { - { - put("countryCodeAddress", "PT"); - put("state", "Porto"); - put("town", "Porto"); - put("postalCode", "4100"); - put("streetName", "Avenida Sidonio Pais"); - put("streetNumber", "379"); - put("apartmentNumber", "B"); - } - }; - - complexAttrValue = - new PersonalAttribute("canonicalResidenceAddress", true, values, - STORKStatusCode.STATUS_AVAILABLE.toString()); - - } - - /** - * Tests the {@link PersonalAttribute#toString()} method for the given simple - * attribute value. Values must match. - */ - @Test - public void testToStringValues() { - Assert.assertEquals("age:true:[15,]:Available;", ATTR_VALUE.toString()); - } - - /** - * Tests the {@link PersonalAttribute#toString()} method for the given complex - * attribute value. Values must match. - */ - @Test - public void testToStringComplexValues() { - Assert.assertEquals( - "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=B," - + "state=Porto,countryCodeAddress=PT,streetNumber=379," - + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;", - complexAttrValue.toString()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given - * empty attribute. Must return true. - */ - @Test - public void testToIsEmptyStatusWithNull() { - Assert.assertTrue(EMPTYATTR.isEmptyStatus()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given - * new attribute. Must return true. - */ - @Test - public void testToIsEmptyStatusWithEmptyString() { - final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone(); - attr.setStatus(""); - Assert.assertTrue(attr.isEmptyStatus()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given - * empty attribute. Must return true. - */ - @Test - public void testToIsEmptyValueWithNull() { - final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone(); - attr.setValue(null); - Assert.assertTrue(attr.isEmptyValue()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given - * empty attribute. Must return true. - */ - @Test - public void testToIsEmptyValue() { - Assert.assertTrue(EMPTYATTR.isEmptyValue()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the - * given empty attribute. Must return true. - */ - @Test - public void testToIsEmptyComplexValueWithNull() { - final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone(); - attr.setComplexValue(null); - Assert.assertTrue(attr.isEmptyComplexValue()); - } - - /** - * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the - * given empty attribute. Must return true. - */ - @Test - public void testToIsEmptyComplexValueWithEmptyComplexValue() { - Assert.assertTrue(EMPTYATTR.isEmptyComplexValue()); - } - - /** - * Tests the {@link PersonalAttribute#clone()} method for the given attribute. - * Must return true. - */ - @Test - public void testCloneToComplexValue() { - Assert.assertNotSame(complexAttrValue, complexAttrValue.clone()); - } - - /** - * Tests the {@link PersonalAttribute#clone()} method for the given attribute. - * Must return true. - */ - @Test - public void testCloneToValue() { - Assert.assertNotSame(ATTR_VALUE, ATTR_VALUE.clone()); - } -} diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base deleted file mode 100644 index 452602210..000000000 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/package-info.java.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package provides all JUnit test classes. - */ -package eu.stork.peps.tests; - diff --git a/id/server/stork2-commons/src/test/resources/.svn/all-wcprops b/id/server/stork2-commons/src/test/resources/.svn/all-wcprops deleted file mode 100644 index a3a21b424..000000000 --- a/id/server/stork2-commons/src/test/resources/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 63 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/resources -END -log4j.xml -K 25 -svn:wc:ra_dav:version-url -V 73 -/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/test/resources/log4j.xml -END diff --git a/id/server/stork2-commons/src/test/resources/.svn/entries b/id/server/stork2-commons/src/test/resources/.svn/entries deleted file mode 100644 index 9274deb98..000000000 --- a/id/server/stork2-commons/src/test/resources/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -776 -https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/test/resources -https://webgate.ec.europa.eu/CITnet/svn/STORK2 - - - -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - -aa842e49-f825-43fc-93ba-11ee9fd5a035 - -log4j.xml -file - - - - -2013-12-20T12:27:56.542475Z -4e990a84da0033594135b05cd01a9cdd -2013-07-25T08:54:09.995385Z -7 -emsomavmi - - - - - - - - - - - - - - - - - - - - - -645 - diff --git a/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base deleted file mode 100644 index 0ad2ea9a4..000000000 --- a/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 30f2bff7c..777c7393f 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -143,8 +143,8 @@ maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pom.xml b/pom.xml index 3407bfcd9..1b5319eca 100644 --- a/pom.xml +++ b/pom.xml @@ -80,8 +80,57 @@ org.apache.maven.plugins maven-surefire-plugin + 2.17 - true + + eu/stork/peps/test/simple/SimpleBaseTest.java + eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java + eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java + eu/stork/peps/test/simple/StorkAuthRequestTest.java + eu/stork/peps/test/simple/StorkLogoutRequestTest.java + eu/stork/peps/test/simple/StorkLogoutResponseTest.java + eu/stork/peps/test/simple/StorkNewResponseTest.java + eu/stork/peps/test/simple/StorkResponseTest.java + test/MOAIDTestCase.java + test/at/gv/egovernment/moa/MOATestCase.java + test/at/gv/egovernment/moa/id/UnitTestCase.java + test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java + test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java + test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java + test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java + test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java + test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java + test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java + test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java + test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java + test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java + test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java + test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java + test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java + test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java + test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java + test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java + test/at/gv/egovernment/moa/spss/SPSSTestCase.java + test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java + test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java + test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java + test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java + test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java + test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java + test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java + test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java + test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java + test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java + test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java + test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java + test/at/gv/egovernment/moa/util/DOMUtilsTest.java + test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java + test/at/gv/egovernment/moa/util/SSLUtilsTest.java + test/at/gv/egovernment/moa/util/URLDecoderTest.java + test/at/gv/egovernment/moa/util/URLEncoderTest.java + test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java + test/at/gv/egovernment/moa/util/XPathUtilsTest.java + @@ -92,8 +141,8 @@ true ${env.BUILD_EXECUTEABLE} ${env.BUILD_VERSION} - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.jar b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.jar new file mode 100644 index 000000000..530ea6fc5 Binary files /dev/null and b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.jar differ diff --git a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.pom b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.pom new file mode 100644 index 000000000..97e64f3aa --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis-2.11.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + xalan-bin-dist + xml-apis + 2.11.0 + Artifactory auto generated POM + \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar deleted file mode 100644 index 530ea6fc5..000000000 Binary files a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.jar and /dev/null differ diff --git a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom b/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom deleted file mode 100644 index 35b51d5fa..000000000 --- a/repository/xalan-bin-dist/xml-apis/2.11.0/xml-apis.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - xerces-J - xml-apis - 2.11.0 - Artifactory auto generated POM - \ No newline at end of file diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index da78d3dc1..e16d46d43 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -301,11 +301,10 @@ - http://java.sun.com/j2se/1.4/docs/api/ - http://java.sun.com/j2se/1.5.0/docs/api/ + http://docs.oracle.com/javase/7/docs/api/ http://logging.apache.org/log4j/docs/api/ - 1.5 + 1.7 diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index f139e962d..277ef8459 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -76,8 +76,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.7 + 1.7 -- cgit v1.2.3 From 69dfb60bcbe9c4f6835b93dc6ae7d71495dcba5b Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Tue, 25 Nov 2014 12:45:04 +0100 Subject: Fix local repository. - Add xerces/serializer, xerces/xercesImpl, xerces/xml-apis. --- .../xerces/serializer/2.10.0/serializer-2.10.0.jar | Bin 0 -> 278286 bytes .../xerces/serializer/2.10.0/serializer-2.10.0.pom | 9 +++++++++ .../xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar | Bin 0 -> 1363159 bytes .../xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.pom | 9 +++++++++ .../apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar | Bin 0 -> 220536 bytes .../apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.pom | 9 +++++++++ 6 files changed, 27 insertions(+) create mode 100644 repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar create mode 100644 repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.pom create mode 100644 repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar create mode 100644 repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.pom create mode 100644 repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar create mode 100644 repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.pom diff --git a/repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar b/repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar new file mode 100644 index 000000000..de9b007b4 Binary files /dev/null and b/repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar differ diff --git a/repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.pom b/repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.pom new file mode 100644 index 000000000..b27157fcd --- /dev/null +++ b/repository/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + org.apache.xerces + serializer + 2.10.0 + POM was created from install:install-file + diff --git a/repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar b/repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar new file mode 100644 index 000000000..9dcd8c381 Binary files /dev/null and b/repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar differ diff --git a/repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.pom b/repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.pom new file mode 100644 index 000000000..03b6c4fbc --- /dev/null +++ b/repository/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + org.apache.xerces + xercesImpl + 2.10.0 + POM was created from install:install-file + diff --git a/repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar b/repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar new file mode 100644 index 000000000..46733464f Binary files /dev/null and b/repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar differ diff --git a/repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.pom b/repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.pom new file mode 100644 index 000000000..e597b8283 --- /dev/null +++ b/repository/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + org.apache.xerces + xml-apis + 2.10.0 + POM was created from install:install-file + -- cgit v1.2.3 From d01c8e2a11d142f94c4834f2e2c61afd4b267c03 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Tue, 25 Nov 2014 12:54:04 +0100 Subject: Disable bogus test eu.stork.peps.tests.DateUtilTestCase.testCurrentTimeStampAfter(). --- .../src/test/java/eu/stork/peps/tests/DateUtilTestCase.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java index 5d2296997..f6cacd67b 100644 --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java @@ -19,6 +19,7 @@ import java.util.Properties; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import eu.stork.peps.auth.commons.DateUtil; @@ -286,6 +287,7 @@ public final class DateUtilTestCase { * TimeStamp (TS). Must return true. */ @Test + @Ignore public void testCurrentTimeStampAfter() { Timestamp ts = DateUtil.currentTimeStamp(); Assert.assertEquals(DateUtil.currentTimeStamp(), ts); -- cgit v1.2.3 From fb97db9b264b65bc87963eee719c2e433488853c Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Tue, 25 Nov 2014 13:01:35 +0100 Subject: Fix buggy test. --- .../test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java b/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java index 5b7a92004..e3468b89f 100644 --- a/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java +++ b/common/src/test/java/test/at/gv/egovernment/moa/util/DateTimeUtilsTest.java @@ -51,7 +51,8 @@ public class DateTimeUtilsTest extends TestCase { public void testParseDateTimeValid() throws Exception { Date date; - DateFormat format = SimpleDateFormat.getDateTimeInstance(); + DateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); + String dateStr; format.setTimeZone(TimeZone.getTimeZone("GMT")); -- cgit v1.2.3 From ba5b11188fc2bb3dfd322d8bd1d6e35038d27bec Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Tue, 25 Nov 2014 13:47:22 +0100 Subject: Remove eclipse project settings from scm. --- id/server/legacy-backup/mw-messages-api/.classpath | 27 -------------- id/server/legacy-backup/mw-messages-api/.project | 36 ------------------- .../.settings/org.eclipse.core.resources.prefs | 5 --- .../.settings/org.eclipse.jdt.core.prefs | 8 ----- .../.settings/org.eclipse.m2e.core.prefs | 4 --- .../.settings/org.eclipse.wst.common.component | 6 ---- .../org.eclipse.wst.common.project.facet.core.xml | 5 --- .../.settings/org.eclipse.wst.validation.prefs | 2 -- spss/server/serverws/.project | 42 ---------------------- 9 files changed, 135 deletions(-) delete mode 100644 id/server/legacy-backup/mw-messages-api/.classpath delete mode 100644 id/server/legacy-backup/mw-messages-api/.project delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs delete mode 100644 spss/server/serverws/.project diff --git a/id/server/legacy-backup/mw-messages-api/.classpath b/id/server/legacy-backup/mw-messages-api/.classpath deleted file mode 100644 index c15838fd0..000000000 --- a/id/server/legacy-backup/mw-messages-api/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/legacy-backup/mw-messages-api/.project b/id/server/legacy-backup/mw-messages-api/.project deleted file mode 100644 index cc4d05bc1..000000000 --- a/id/server/legacy-backup/mw-messages-api/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - mw-messages-api - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647ee..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 76393eede..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 \ No newline at end of file diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component deleted file mode 100644 index ec983b870..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index a1f6907b8..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project deleted file mode 100644 index 8150d984e..000000000 --- a/spss/server/serverws/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - moa-spss-ws - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.jsdt.core.jsNature - - -- cgit v1.2.3 From 6e32481ed5ac19a82165f229e690184e824a3008 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 27 Nov 2014 07:04:29 +0100 Subject: fix wrong error message if SSL server certificate is not trusted --- .../moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java index 40e243d0b..964a10a1b 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java @@ -126,6 +126,9 @@ public class OAPVP2ConfigValidation { } catch (ConfigurationException e) { log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e); + } catch (CertificateException e) { + log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e); + } httpProvider = @@ -157,6 +160,8 @@ public class OAPVP2ConfigValidation { } catch (MetadataProviderException e) { + + //TODO: check exception handling if (e.getCause() != null && e.getCause().getCause() instanceof SSLHandshakeException) { log.info("SSL Server certificate not trusted.", e); errors.add(LanguageHelper.getErrorString("validation.pvp2.metadata.ssl", request)); -- cgit v1.2.3 From 69cd6c71b77ef6fb454701cfa05b81b323744819 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 27 Nov 2014 07:05:51 +0100 Subject: change ISA 1.18 roles yet another time --- .../resources/resources/properties/pvp-stork_mapping.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties b/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties index b552118d4..ca12fada4 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/pvp-stork_mapping.properties @@ -1,9 +1,9 @@ ##PVP role mapping viewer=CIRCABC/viewer CIRCABC-viewer=CIRCABC/viewer -CIRCABC-IGLeader=CIRCABC/IGLeader -CIRCABC-Secretary=CIRCABC/Secretary -CIRCABC-Access=CIRCABC/Access +CIRCABC-DIRECTOR=CIRCABC/DIRECTOR +CIRCABC-SECRETARY=CIRCABC/SECRETARY +CIRCABC-MEMBER=CIRCABC/MEMBER ecas-demo-EUROPEAN_COMMISSION=ecas-demo/EUROPEAN_COMMISSION ecas-demo-EXTERNAL_INTRAMUROS=ecas-demo/EXTERNAL_INTRAMUROS @@ -16,6 +16,8 @@ DIGIT-INTERNET=DIGIT/INTERNET DIGIT-LIVENEWS=DIGIT/LIVENEWS + + ##PVP SecClass to STORK-QAA mapping secclass/0=http://www.stork.gov.eu/1.0/citizenQAALevel/1 secclass/0-1=http://www.stork.gov.eu/1.0/citizenQAALevel/2 -- cgit v1.2.3 From 309f381c1ef98a82a23da42cda99734032b73bf4 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 4 Dec 2014 09:56:03 +0100 Subject: change exception handling for TrustStore configuration --- .../moa/id/configuration/config/ConfigurationProvider.java | 8 ++++---- .../id/configuration/validation/oa/OAPVP2ConfigValidation.java | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java index 957479b29..e6000319e 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java @@ -437,23 +437,23 @@ public class ConfigurationProvider { return parseVersionFromManifest(); } - public String getCertStoreDirectory() throws CertificateException { + public String getCertStoreDirectory() throws ConfigurationException { String dir = props.getProperty("general.ssl.certstore"); if (MiscUtil.isNotEmpty(dir)) return FileUtils.makeAbsoluteURL(dir, configRootDir); else - throw new CertificateException("No SSLCertStore configured use default JAVA TrustStore."); + throw new ConfigurationException("No SSLCertStore configured use default JAVA TrustStore."); } - public String getTrustStoreDirectory() throws CertificateException { + public String getTrustStoreDirectory() throws ConfigurationException { String dir = props.getProperty("general.ssl.truststore"); if (MiscUtil.isNotEmpty(dir)) return FileUtils.makeAbsoluteURL(dir, configRootDir); else - throw new CertificateException("No SSLTrustStore configured use default JAVA TrustStore."); + throw new ConfigurationException("No SSLTrustStore configured use default JAVA TrustStore."); } diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java index 964a10a1b..d122b6bde 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java @@ -126,10 +126,7 @@ public class OAPVP2ConfigValidation { } catch (ConfigurationException e) { log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e); - } catch (CertificateException e) { - log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e); - - } + } httpProvider = new HTTPMetadataProvider(timer, httpClient, form.getMetaDataURL()); -- cgit v1.2.3 From d222f975e7ad212264dab7cb7a0c39ec40478222 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 4 Dec 2014 09:57:17 +0100 Subject: STORK<->PVP AttributeProvider : fix problem with more then one attribute in configuration --- .../protocols/stork2/attributeproviders/PVPAuthenticationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/PVPAuthenticationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/PVPAuthenticationProvider.java index a026bac81..7f06c604b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/PVPAuthenticationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/PVPAuthenticationProvider.java @@ -80,7 +80,7 @@ public class PVPAuthenticationProvider extends AttributeProvider { this.moastorkRequest = moastorkRequest; // break if we cannot handle the requested attribute - if (!attributes.contains(attribute.getName())) { + if (!getSupportedAttributeNames().contains(attribute.getName())) { Logger.info("Attribute " + attribute.getName() + " not supported by the provider: " + getAttrProviderName()); throw new UnsupportedAttributeException(); -- cgit v1.2.3 From c0ce67ebe2c4882b71ef04d64a6db7e3db416ce4 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 4 Dec 2014 09:58:08 +0100 Subject: do not use deprecated Methode in MOAHttpClient --- .../src/main/java/org/apache/commons/httpclient/MOAHttpClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java index e4aa6a284..d708c2603 100644 --- a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java +++ b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java @@ -34,6 +34,7 @@ import org.apache.commons.httpclient.HttpMethodDirector; import org.apache.commons.httpclient.HttpState; import org.apache.commons.httpclient.URI; import org.apache.commons.httpclient.protocol.Protocol; +import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; import at.gv.egovernment.moa.id.commons.ex.MOAHttpProtocolSocketFactoryException; @@ -47,7 +48,7 @@ import at.gv.egovernment.moa.id.commons.ex.MOAHttpProtocolSocketFactoryException public class MOAHttpClient extends HttpClient { - public void setCustomSSLTrustStore(String metadataURL, SecureProtocolSocketFactory protoSocketFactory) throws MOAHttpProtocolSocketFactoryException, MalformedURLException { + public void setCustomSSLTrustStore(String metadataURL, ProtocolSocketFactory protoSocketFactory) throws MOAHttpProtocolSocketFactoryException, MalformedURLException { ; URL url = new URL(metadataURL); -- cgit v1.2.3 From b0bc9154341c873038f701033ceafb326f7ecbc5 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Wed, 17 Dec 2014 11:02:35 +0100 Subject: configuration --- .../id/config/auth/AuthConfigurationProvider.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java index 23369fecc..6e85a8847 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java @@ -53,6 +53,7 @@ import java.io.IOException; import java.math.BigInteger; import java.net.MalformedURLException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -1007,6 +1008,39 @@ public class AuthConfigurationProvider extends ConfigurationProvider { return null; } + /** + * Checks if is fakeIdL is activated. + * + * @return true, if fake IdLs are available for stork + */ + public boolean isStorkFakeIdLActive() { + String prop = props.getProperty("stork.fakeIdL.active", "false"); + return Boolean.valueOf(prop); + } + + /** + * Gets the countries which will receive a fake IdL + * + * @return the countries + */ + public List getStorkFakeIdLCountries() { + String prop = props.getProperty("stork.fakeIdL.countries", ""); + return Arrays.asList(prop.replaceAll(" ", "").split(",")); + } + + /** + * Gets the resigning key (group) for the stork fake IdL. + * + * @return the resigning key + */ + public String getStorkFakeIdLResigningKey() { + String prop = props.getProperty("stork.fakeIdL.keygroup"); + if (MiscUtil.isNotEmpty(prop)) + return prop; + else + return null; + } + public boolean isMonitoringActive() { String prop = props.getProperty("configuration.monitoring.active", "false"); return Boolean.valueOf(prop); -- cgit v1.2.3 From beb1673375bda5c9d768b7140439cbd0f05f7ed0 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Wed, 17 Dec 2014 11:12:11 +0100 Subject: use config to decide whether to do fakeIdL or SZRGW --- .../egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 4cd192070..4d6d3e538 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -360,14 +360,19 @@ public class PEPSConnectorServlet extends AuthServlet { targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); } - Logger.debug("Starting connecting SZR Gateway"); - //contact SZR Gateway IdentityLink identityLink = null; try { - identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(), + AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); + if(config.isStorkFakeIdLActive() && config.getStorkFakeIdLCountries().contains(storkAuthnRequest.getCitizenCountryCode())) { + // create fake IdL + } else { + //contact SZR Gateway + Logger.debug("Starting connecting SZR Gateway"); + identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(), oaParam.getFriendlyName(), targetType, null, oaParam.getMandateProfiles(), citizenSignature); + } } catch (STORKException e) { // this is really nasty but we work against the system here. We are supposed to get the gender attribute from // stork. If we do not, we cannot register the person in the ERnP - we have to have the -- cgit v1.2.3 From 939821e31d2ad1dff38b87a56582bfeb9f1a5c93 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Thu, 18 Dec 2014 11:14:19 +0100 Subject: loaded fakeIdL template --- .../moa/id/auth/servlet/PEPSConnectorServlet.java | 5 +++ .../resources/xmldata/fakeIdL_IdL_template.xml | 51 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 id/server/idserverlib/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 4d6d3e538..3b086a991 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -48,6 +48,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.opensaml.saml2.core.StatusCode; +import org.w3c.dom.Element; import at.gv.egovernment.moa.id.auth.AuthenticationServer; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; @@ -66,6 +67,7 @@ import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.HTTPUtils; import at.gv.egovernment.moa.id.util.VelocityProvider; import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils; import at.gv.egovernment.moa.util.StringUtils; import at.gv.util.xsd.xmldsig.SignatureType; import at.gv.util.xsd.xmldsig.X509DataType; @@ -365,6 +367,9 @@ public class PEPSConnectorServlet extends AuthServlet { AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); if(config.isStorkFakeIdLActive() && config.getStorkFakeIdLCountries().contains(storkAuthnRequest.getCitizenCountryCode())) { // create fake IdL + // - fetch IdL template from resources + InputStream s = PEPSConnectorServlet.class.getResourceAsStream("/resources/xmldata/fakeIdL_IdL_template.xml"); + Element idlTemplate = DOMUtils.parseXmlValidating(s); } else { //contact SZR Gateway Logger.debug("Starting connecting SZR Gateway"); diff --git a/id/server/idserverlib/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml b/id/server/idserverlib/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml new file mode 100644 index 000000000..09084a34f --- /dev/null +++ b/id/server/idserverlib/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml @@ -0,0 +1,51 @@ + + + + + urn:oasis:names:tc:SAML:1.0:cm:sender-vouches + + wJO/bvDJjUysG0yARn7I6w==urn:publicid:gv.at:baseidXXXRúùdXXXVàn Nisteĺrooy1969-02-13 + + + + 4Y4FL09VhczsfYQgFPuycP8quJNZBAAu1R1rFXNodI2711B6BTMjAGQn6xuFWfd3/nyFav/MLTr/ +t2VazvANS4TRFxJAcWyIx7xbxCdzZr6gJ+FCmq4g5JPrQvt50v3JX+wKSYft1gHBOWlDn90Ia4Gm +P8MVuze21T+VVKM6ZklmS6d5PT1er/uYQFydGErmJ17xlSQG6Fi5xuftopBDyJxG1tL1KIebpLFg +gaM2EyuB1HxH8/+Mfqa4UgeqIH65AQAB + + + + + + + + not(ancestor-or-self::pr:Identification) + + + + + KEQEPY2O3Z3IRaISSSoRZVPzsHE= + + + + gzGhjH1kdmPcPbgen0xojNIoJLk= + + + + 06wqWHgplwpu3N5HMhzb6QC5NkXMO1z4N4oc1L6eDqwZlvFJ9X1XGW//QqviKO9oog3il7IzdfJwnjygR4trgGCIqx+JYCDHJCrG9l8zlxlSW0ZqfsygGXthutcQ1aeUpfO6jYuhnWOUywa8BgzukRtWT+AOJBQZPRYTb8IBmey+uAwlhFLni94eMOd81l+efCvkWi3jRajwsG8ZOaNxSZT3aEV5vj+32Aqtx2MPEVzQWtIA7GqZi+EzcdSdHQvHhg7UB+8kqbU70ENAJbEMTANFZYvLOJ0Om9KfDtPf/+R2TvTc360fNo9RnPl04pHPhCIjcGZhFZorBpUhXFwd2Q== + MIIF3TCCBMWgAwIBAgIDByniMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMB4XDTEwMDcyODExMzY0M1oXDTE1MDcyODExMzY0M1owgbYxCzAJBgNVBAYTAkFUMR4wHAYDVQQKDBVEYXRlbnNjaHV0emtvbW1pc3Npb24xIjAgBgNVBAsMGVN0YW1temFobHJlZ2lzdGVyYmVob2VyZGUxLjAsBgNVBAMMJVNpZ25hdHVyc2VydmljZSBEYXRlbnNjaHV0emtvbW1pc3Npb24xFTATBgNVBAUTDDMyNTkyODMyMzk5ODEcMBoGCSqGSIb3DQEJARYNZHNrQGRzay5ndi5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+dBSEBGj2jUXIK1Mp3lVxc/Za+pJMiyKrX3G1ZxgX/ikx7D9scsPYMt473LlAWl9cmCbHbJK+PV2XNNdURLMUCIX+4vUNs2MHeDTQtX8BXjJFpwJYSoaRJQ39FVS/1r5sWcra9Hhdm7w5Gtx/2ukyDX0kdkxawkhP4EQEzi/SI+Fugn+WqgQ1nAdlbxb/dcBw5w1h9b3lmuwUf4z3ooQWUD2DgA/kKd1KejNR43mLUsmvSzevPxT9zs78pOR1OacB7IszTVJPXeOEaaNZHnnB/UeO3g8LEV/3OkXcUgcMkbIIiaBHlll71Pq0COj9kqjXoe7OrRjLY5i3KwOpa6TMCAwEAAaOCAgcwggIDMBMGA1UdIwQMMAqACEkcWDpP6A0DMH8GCCsGAQUFBwEBBHMwcTAnBggrBgEFBQcwAYYbaHR0cDovL29jc3AuYS10cnVzdC5hdC9vY3NwMEYGCCsGAQUFBzAChjpodHRwOi8vd3d3LmEtdHJ1c3QuYXQvY2VydHMvYS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMmEuY3J0MFQGA1UdIARNMEswSQYGKigAEQESMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2NwL2Etc2lnbi1BbXRzc2lnbmF0dXIwgZ4GA1UdHwSBljCBkzCBkKCBjaCBioaBh2xkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMixvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQITAgOnhr0tbowDgYDVR0PAQH/BAQDAgSwMCAGA1UdEQQZMBeBFW1hcmN1cy5oaWxkQGRzay5ndi5hdDAJBgNVHRMEAjAAMA4GByooAAoBBwEEAwEB/zAUBgcqKAAKAQEBBAkMB0JTQi1EU0swDQYJKoZIhvcNAQEFBQADggEBAHTklnvPCH/bJSOlIPbLUEkSGuFHsektSZ8Vr22x/Yv7EzsxoQrJIiz2mQ2gQqFuExdWYxvsowjiSbiis9iUf1c0zscvDS3mIZxGs4M89XHsjHnIyb+Fuwnamw65QrFvM1tNB1ZMjxJ3x+YmHLHdtT3BEBcr3/NCRHd2S0HoBspNz9HVgJaZY1llR7poKBvnAc4g1i+QTvyVb00PtKxR9Lw/9ABInX/1pzpxqrPy7Ib2OP8z6dd3WHmIsCiSHUaj0Dxwwln6fYJjhxZ141SnbovlCLYtrsZLXoi9ljIqX4xO0PwMI2RfNc9cXxTRrRS6rEOvX7PpvgXiDXhp592Yyp4= + + + + + + not(ancestor-or-self::dsig:Signature) + + + + 8e7RjLnA4Mgltq5ruIJzheKGxu0= + + + + + \ No newline at end of file -- cgit v1.2.3 From 3afb02f1dddd13244e1a9a456f129d6c759faf80 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Thu, 18 Dec 2014 14:00:42 +0100 Subject: filled the template idl with data --- .../auth/parser/IdentityLinkAssertionParser.java | 6 ++-- .../moa/id/auth/servlet/PEPSConnectorServlet.java | 40 +++++++++++++++++++++- .../moa/id/auth/stork/STORKResponseProcessor.java | 2 +- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java index e2802c1d2..a5783bfb7 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParser.java @@ -106,7 +106,7 @@ public class IdentityLinkAssertionParser { + PDATA + "Person"; /** Xpath expression to the PersonData GivenName element */ - private static final String PERSON_GIVEN_NAME_XPATH = + public static final String PERSON_GIVEN_NAME_XPATH = PERSON_XPATH + "/" + PDATA @@ -114,7 +114,7 @@ public class IdentityLinkAssertionParser { + PDATA + "GivenName"; /** Xpath expression to the PersonData FamilyName element */ - private static final String PERSON_FAMILY_NAME_XPATH = + public static final String PERSON_FAMILY_NAME_XPATH = PERSON_XPATH + "/" + PDATA @@ -122,7 +122,7 @@ public class IdentityLinkAssertionParser { + PDATA + "FamilyName"; /** Xpath expression to the PersonData DateOfBirth element */ - private static final String PERSON_DATE_OF_BIRTH_XPATH = + public static final String PERSON_DATE_OF_BIRTH_XPATH = PERSON_XPATH + "/" + PDATA diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 3b086a991..0a8f0db6f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -49,6 +49,7 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.opensaml.saml2.core.StatusCode; import org.w3c.dom.Element; +import org.w3c.dom.Node; import at.gv.egovernment.moa.id.auth.AuthenticationServer; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; @@ -56,6 +57,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.data.IdentityLink; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; import at.gv.egovernment.moa.id.auth.stork.STORKException; import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; @@ -65,10 +67,12 @@ import at.gv.egovernment.moa.id.moduls.ModulUtils; import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.IdentityLinkReSigner; import at.gv.egovernment.moa.id.util.VelocityProvider; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.DOMUtils; import at.gv.egovernment.moa.util.StringUtils; +import at.gv.egovernment.moa.util.XPathUtils; import at.gv.util.xsd.xmldsig.SignatureType; import at.gv.util.xsd.xmldsig.X509DataType; import eu.stork.oasisdss.api.ApiUtils; @@ -369,7 +373,41 @@ public class PEPSConnectorServlet extends AuthServlet { // create fake IdL // - fetch IdL template from resources InputStream s = PEPSConnectorServlet.class.getResourceAsStream("/resources/xmldata/fakeIdL_IdL_template.xml"); - Element idlTemplate = DOMUtils.parseXmlValidating(s); + Element idlTemplate = DOMUtils.parseXmlValidating(s); + + identityLink = new IdentityLinkAssertionParser(idlTemplate).parseIdentityLink(); + + // replace data + Element idlassertion = identityLink.getSamlAssertion(); + // - set bpk/wpbk; + Node prIdentification = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_IDENT_VALUE_XPATH); + if(!STORKResponseProcessor.hasAttribute("eIdentifier", attributeList)) + throw new STORKException("eIdentifier is missing"); + String eIdentifier = STORKResponseProcessor.getAttributeValue("eIdentifier", attributeList, false); + prIdentification.getFirstChild().setNodeValue(eIdentifier); + + // - set last name + Node prFamilyName = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_FAMILY_NAME_XPATH); + if(!STORKResponseProcessor.hasAttribute("surname", attributeList)) + throw new STORKException("surname is missing"); + String familyName = STORKResponseProcessor.getAttributeValue("surname", attributeList, false); + prFamilyName.getFirstChild().setNodeValue(familyName); + + // - set first name + Node prGivenName = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_GIVEN_NAME_XPATH); + if(!STORKResponseProcessor.hasAttribute("givenName", attributeList)) + throw new STORKException("givenName is missing"); + String givenName = STORKResponseProcessor.getAttributeValue("givenName", attributeList, false); + prGivenName.getFirstChild().setNodeValue(givenName); + + // - set date of birth + Node prDateOfBirth = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_DATE_OF_BIRTH_XPATH); + if(!STORKResponseProcessor.hasAttribute("dateOfBirth", attributeList)) + throw new STORKException("dateOfBirth is missing"); + String dateOfBirth = STORKResponseProcessor.getAttributeValue("dateOfBirth", attributeList, false); + prDateOfBirth.getFirstChild().setNodeValue(dateOfBirth); + + identityLink = new IdentityLinkAssertionParser(idlassertion).parseIdentityLink(); } else { //contact SZR Gateway Logger.debug("Starting connecting SZR Gateway"); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java index 7113dcf70..ea1526ff0 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java @@ -102,7 +102,7 @@ public class STORKResponseProcessor { private static String getAttributeValue(String attributeName, IPersonalAttributeList attributeList) throws STORKException { return getAttributeValue(attributeName, attributeList, true); } - private static String getAttributeValue(String attributeName, IPersonalAttributeList attributeList, boolean throwException) throws STORKException { + public static String getAttributeValue(String attributeName, IPersonalAttributeList attributeList, boolean throwException) throws STORKException { try { String result = attributeList.get(attributeName).getValue().get(0); Logger.trace(attributeName + " : " + result); -- cgit v1.2.3 From 81f8e1dc93570ff15f122f1c30fe6cb90e3158f0 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Thu, 18 Dec 2014 17:10:45 +0100 Subject: signed the new fake idl --- .../moa/id/auth/builder/AuthenticationDataBuilder.java | 8 +++++++- .../egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java | 5 +++++ .../at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java | 10 +--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java index 52488c3cb..4d84ce0a5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java @@ -951,7 +951,13 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants { //resign IDL IdentityLinkReSigner identitylinkresigner = IdentityLinkReSigner.getInstance(); Element resignedilAssertion; - resignedilAssertion = identitylinkresigner.resignIdentityLink(businessServiceIdl.getSamlAssertion()); + + AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); + if (config.isIdentityLinkResigning()) { + resignedilAssertion = identitylinkresigner.resignIdentityLink(businessServiceIdl.getSamlAssertion(), config.getIdentityLinkResigningKey()); + } else { + resignedilAssertion = businessServiceIdl.getSamlAssertion(); + } IdentityLinkAssertionParser resignedIDLParser = new IdentityLinkAssertionParser(resignedilAssertion); IdentityLink resignedIDL = resignedIDLParser.parseIdentityLink(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 0a8f0db6f..10d0ddbc4 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -408,6 +408,11 @@ public class PEPSConnectorServlet extends AuthServlet { prDateOfBirth.getFirstChild().setNodeValue(dateOfBirth); identityLink = new IdentityLinkAssertionParser(idlassertion).parseIdentityLink(); + + //resign IDL + IdentityLinkReSigner identitylinkresigner = IdentityLinkReSigner.getInstance(); + Element resignedilAssertion = identitylinkresigner.resignIdentityLink(identityLink.getSamlAssertion(), config.getStorkFakeIdLResigningKey()); + identityLink = new IdentityLinkAssertionParser(resignedilAssertion).parseIdentityLink(); } else { //contact SZR Gateway Logger.debug("Starting connecting SZR Gateway"); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java index 090bea486..520b81b17 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/IdentityLinkReSigner.java @@ -71,13 +71,9 @@ public class IdentityLinkReSigner { return instance; } - public Element resignIdentityLink(Element idl) throws MOAIDException { + public Element resignIdentityLink(Element idl, String keyGroupId) throws MOAIDException { try { - AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); - - if (config.isIdentityLinkResigning()) { - if (idl == null) { Logger.warn("IdentityLink is empty"); return null; @@ -91,7 +87,6 @@ public class IdentityLinkReSigner { SPSSFactory spssFac = SPSSFactory.getInstance(); - String keyGroupId = config.getIdentityLinkResigningKey(); if (MiscUtil.isEmpty(keyGroupId)) { Logger.warn("No IdentityLink reSigning-Key definded"); throw new MOAIDException("config.19", new Object[]{}); @@ -166,9 +161,6 @@ public class IdentityLinkReSigner { Logger.warn("Allgemeiner Fehler beim Aufruf von MOA-SS: Unbekannter ResponseType von MOA-SS"); throw new MOAIDException("builder.05", new Object[]{}); } - - } else - return idl; } catch (ConfigurationException e) { Logger.warn("Configuration can not be loaded", e); -- cgit v1.2.3 From 85984d9432521ea4e14039d37d434f863c492cf1 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Dec 2014 10:31:04 +0100 Subject: fix TestOID configuration problem --- .../data/oa/OAAuthenticationData.java | 48 ++++++++++++++-------- .../oa/OAAuthenticationDataValidation.java | 6 ++- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java index 0e65b7dca..a9c914f74 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java @@ -30,6 +30,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA; import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS; import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs; @@ -40,6 +41,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication; import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType; import at.gv.egovernment.moa.id.commons.db.dao.config.TemplatesType; import at.gv.egovernment.moa.id.commons.db.dao.config.TestCredentials; +import at.gv.egovernment.moa.id.commons.db.dao.config.TestCredentialsCredentialOIDItem; import at.gv.egovernment.moa.id.commons.db.dao.config.TransformsInfoType; import at.gv.egovernment.moa.id.configuration.Constants; import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser; @@ -207,8 +209,9 @@ public class OAAuthenticationData implements IOnlineApplicationData { } if (oaauth.getTestCredentials() != null) { - enableTestCredentials = oaauth.getTestCredentials().isEnableTestCredentials(); - testCredentialOIDs = oaauth.getTestCredentials().getCredentialOID(); + enableTestCredentials = oaauth.getTestCredentials().isEnableTestCredentials(); + testCredentialOIDs = new ArrayList(); + testCredentialOIDs.addAll(oaauth.getTestCredentials().getCredentialOID()); } @@ -315,12 +318,20 @@ public class OAAuthenticationData implements IOnlineApplicationData { if (enableTestCredentials) { TestCredentials testing = authoa.getTestCredentials(); - if (testing == null) - testing = new TestCredentials(); - - testing.setEnableTestCredentials(enableTestCredentials); + if (testing != null) + ConfigurationDBUtils.delete(testing); + + testing = new TestCredentials(); + authoa.setTestCredentials(testing); + testing.setEnableTestCredentials(enableTestCredentials); testing.setCredentialOID(testCredentialOIDs); + } else { + TestCredentials testing = authoa.getTestCredentials(); + if (testing != null) { + testing.setEnableTestCredentials(false); + } + } return null; @@ -576,12 +587,14 @@ public class OAAuthenticationData implements IOnlineApplicationData { */ public String getTestCredentialOIDs() { String value = null; - for (String el : testCredentialOIDs) { - if (value == null) - value = el; - else - value += "," + el; + if (testCredentialOIDs != null) { + for (String el : testCredentialOIDs) { + if (value == null) + value = el; + else + value += "," + el; + } } return value; @@ -595,12 +608,13 @@ public class OAAuthenticationData implements IOnlineApplicationData { * @param testCredentialOIDs the testCredentialOIDs to set */ public void setTestCredentialOIDs(String testCredentialOIDs) { - String[] oidList = testCredentialOIDs.split(","); + if (MiscUtil.isNotEmpty(testCredentialOIDs)) { + String[] oidList = testCredentialOIDs.split(","); - this.testCredentialOIDs = new ArrayList(); - for (int i=0; i(); + for (int i=0; i Date: Fri, 19 Dec 2014 10:31:45 +0100 Subject: fix problem with empty database --- .../moa/id/configuration/struts/action/EditGeneralConfigAction.java | 3 +++ .../java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java index 31c29aef0..4236c0d13 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java @@ -241,6 +241,9 @@ public class EditGeneralConfigAction extends BasicAction { } MOAIDConfiguration dbconfig = ConfigurationDBRead.getMOAIDConfiguration(); + if (dbconfig == null) + dbconfig = new MOAIDConfiguration(); + AuthComponentGeneral dbauth = dbconfig.getAuthComponentGeneral(); if (dbauth == null) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java index a3f445fcf..6efdd6223 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/ConfigurationDBRead.java @@ -152,7 +152,7 @@ public class ConfigurationDBRead { if (result.size() == 0) { Logger.trace("No entries found. Create fresh instance."); - return new MOAIDConfiguration(); + return null; } return (MOAIDConfiguration) result.get(0); -- cgit v1.2.3 From 7a829a509f470bddc73ac55584db9c29a9312784 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Dec 2014 10:32:09 +0100 Subject: fix errormessage --- .../egovernment/moa/id/configuration/struts/action/ListOAsAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java index 7f7f083c9..335dbc91e 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java @@ -133,7 +133,7 @@ public class ListOAsAction extends BasicAction { } else { if (ValidationHelper.containsPotentialCSSCharacter(friendlyname, false)) { log.warn("SearchOA textfield contains potential XSS characters"); - addActionError(LanguageHelper.getErrorString("validation.general.oafriendlyname", + addActionError(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid", new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request)); return Constants.STRUTS_SUCCESS; } -- cgit v1.2.3 From 9e3e7423eb938082ce60af97ecb359b166715bd3 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Dec 2014 10:32:34 +0100 Subject: fix OA PublicPrefix validation --- .../configuration/struts/action/BasicOAAction.java | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java index 5a9787069..26d97484b 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java @@ -291,8 +291,17 @@ public class BasicOAAction extends BasicAction { } else { - if (oaid == -1) { - onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier); + if (oaid == -1) { + List oaList = ConfigurationDBRead.getAllOnlineApplications(); + for (OnlineApplication el : oaList) { + if (el.getPublicURLPrefix().startsWith(oaidentifier) ) + onlineapplication = el; + + } + if (onlineapplication == null) { + onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier); + + } setNewOA(true); if (onlineapplication != null) { log.info("The OAIdentifier is not unique"); @@ -306,7 +315,17 @@ public class BasicOAAction extends BasicAction { onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid); if (!oaidentifier.equals(onlineapplication.getPublicURLPrefix())) { - if (ConfigurationDBRead.getOnlineApplication(oaidentifier) != null) { + OnlineApplication dbOA = null; + List oaList = ConfigurationDBRead.getAllOnlineApplications(); + for (OnlineApplication el : oaList) { + if (el.getPublicURLPrefix().startsWith(oaidentifier) ) + dbOA = el; + + } + if (dbOA == null) + dbOA = ConfigurationDBRead.getOnlineApplication(oaidentifier); + + if ( (dbOA != null && !dbOA.getHjid().equals(oaid))) { log.info("The OAIdentifier is not unique"); throw new BasicOAActionException( LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request), -- cgit v1.2.3 From 5921722030f4d2f6b8f2e20327d376d6b553ab8a Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Dec 2014 10:33:05 +0100 Subject: change MOA-ID version to 2.1.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71cc5785f..d783ebc95 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ UTF-8 2.0.1 - 2.1.3 + 2.1.2.2 2.0.0 2.0.3 1.1.5 -- cgit v1.2.3 From 6d242194721574b6f7284f8b705a518d2f39b36f Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 19 Dec 2014 10:33:36 +0100 Subject: add new certificates to trustProfiles and certstore --- ...Test-Sig-02.20141124-20241118.SerNo3969edc1.cer | Bin 0 -> 1029 bytes ...remium-enc-02.20140701-20240701.SerNo144dfd.cer | Bin 0 -> 1159 bytes ...-Test-Qual-01.20141117-20241111.SerNo16120f.cer | 23 +++++++++++++++++++++ ...rate-light-02.20140905-20240905.SerNo153B49.cer | Bin 0 -> 1167 bytes ...remium-sig-02.20140701-20240701.SerNo144e10.cer | Bin 0 -> 1159 bytes ...remium-sig-03.20140701-20240701.SerNo144e13.cer | Bin 0 -> 1159 bytes ...Test-Sig-02.20141124-20241118.SerNo3969edc1.cer | Bin 0 -> 1029 bytes ...rate-light-02.20140905-20240905.SerNo153B49.cer | Bin 0 -> 1167 bytes ...rate-light-02.20140905-20240905.SerNo153B49.cer | Bin 0 -> 1167 bytes ...Test-Sig-02.20141124-20241118.SerNo3969edc1.cer | Bin 0 -> 1029 bytes ...remium-enc-02.20140701-20240701.SerNo144dfd.cer | Bin 0 -> 1159 bytes ...-Test-Qual-01.20141117-20241111.SerNo16120f.cer | 23 +++++++++++++++++++++ ...rate-light-02.20140905-20240905.SerNo153B49.cer | Bin 0 -> 1167 bytes ...remium-sig-02.20140701-20240701.SerNo144e10.cer | Bin 0 -> 1159 bytes ...remium-sig-03.20140701-20240701.SerNo144e13.cer | Bin 0 -> 1159 bytes .../toBeAdded/atrust_OCSP_Responder_03-1.crt | Bin 0 -> 1185 bytes ...porate-light-02.20140905-20240905.SrN153B49.crt | Bin 0 -> 1167 bytes ...porate-light-02.20140905-20240905.SrN153B49.crt | Bin 0 -> 1167 bytes ...remium-enc-02.20140701-20240701.SerNo144dfd.cer | Bin 0 -> 1159 bytes ...porate-light-02.20140905-20240905.SrN153B49.crt | Bin 0 -> 1167 bytes ...remium-sig-02.20140701-20240701.SerNo144e10.cer | Bin 0 -> 1159 bytes ...remium-sig-03.20140701-20240701.SerNo144e13.cer | Bin 0 -> 1159 bytes ...Test-Sig-02.20141124-20141118.SerNo3969edc1.cer | Bin 0 -> 1029 bytes 23 files changed, 46 insertions(+) create mode 100644 id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer create mode 100644 id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer create mode 100644 id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer create mode 100644 id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer create mode 100644 id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer create mode 100644 id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer create mode 100644 id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer create mode 100644 id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer create mode 100644 id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer create mode 100644 spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer create mode 100644 spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer create mode 100644 spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer create mode 100644 spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer create mode 100644 spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer create mode 100644 spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer create mode 100644 spss/handbook/conf/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer diff --git a/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer new file mode 100644 index 000000000..1bb449441 Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer new file mode 100644 index 000000000..6c0c042b4 Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer new file mode 100644 index 000000000..60bc9a557 --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2zCCAsOgAwIBAgIDFhIPMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRwwGgYDVQQLDBNhLXNpZ24tVEVT +VC1RdWFsLTAxMRwwGgYDVQQDDBNhLXNpZ24tVEVTVC1RdWFsLTAxMB4XDTE0MTEx +NzA3NDAzNloXDTI0MTExMTA2NDAzNlowgZMxCzAJBgNVBAYTAkFUMUgwRgYDVQQK +DD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4g +RGF0ZW52ZXJrZWhyIEdtYkgxHDAaBgNVBAsME2Etc2lnbi1URVNULVF1YWwtMDEx +HDAaBgNVBAMME2Etc2lnbi1URVNULVF1YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQD4TRgyXzhxJ2AkndX0RPY771f64dsJrReEeuShLRK5io0B +kJWc4t7wuD1B98cJ0MUPlMmOJ2Ckc/vuLhQUyY3qEUmhMhixCUIcdHQ5yH3H0yMV +HxyJxAG83fE8M25kpKA4TzzMW8KPd2S63wbpPElyEy7vrllrLxvdQRSDpMZMvRg8 +fvoDGAehxsnKKwlXZuMq1aSBzfMz3cMBDKxvqzDIz7yC1iWNkdiwog3a5a5PbViK +shhZ0h+bx9WFDpiN6ooPQgcGhjD+NqIDoiOr7CUFHp+HiC6xIsEFJaBHTf3dRZ61 +0r1FDABx0Yj8+wlXSQLYq/1nR/QMwsvH0Cz1qYTPAgMBAAGjNjA0MA8GA1UdEwEB +/wQFMAMBAf8wEQYDVR0OBAoECE8h1CulBqTdMA4GA1UdDwEB/wQEAwIBBjANBgkq +hkiG9w0BAQUFAAOCAQEAimFu+xTm3UdyU+fO+2hz4DS20OGSC9NBDkorjzhRPWoZ +IVhUi6yH5drqSBm4/2ZYS1Ba5npzfyJwm+cLO28ljxAApfRHlbN0y83hKv7c0I7g +zWTMRs8X8ar5Gd7d4O5jpC4PAaZ1ozSDoE06U5im6YMLaJy/0QYvf5EQBMvLdeoc +d1vl17JYKYqYzcX2dvayikrfiglFqDaZZ66yJPBSuiyNhXpPkbXsOoyyTPtV/0Bh +eKIQiQyJID5aZtR7D4fBAzKdp5wB9KLQXBZ80hrwqrIuy+ME0tFaBWYBi8dzQ1iq +/E3Qz0USfGmxPMm8y/zRqsDvxZCRiSuvzBkOXbGMdA== +-----END CERTIFICATE----- diff --git a/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer new file mode 100644 index 000000000..e4bd48dac Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer new file mode 100644 index 000000000..74c4ce3b8 Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer new file mode 100644 index 000000000..6c50ec079 Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer new file mode 100644 index 000000000..1bb449441 Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer new file mode 100644 index 000000000..e4bd48dac Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungMitTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer differ diff --git a/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer new file mode 100644 index 000000000..e4bd48dac Binary files /dev/null and b/id/server/data/deploy/conf/moa-spss/trustProfiles/MOAIDBuergerkartePersonenbindungOhneTestkarten/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer differ diff --git a/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer new file mode 100644 index 000000000..1bb449441 Binary files /dev/null and b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer differ diff --git a/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer new file mode 100644 index 000000000..6c0c042b4 Binary files /dev/null and b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer differ diff --git a/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer new file mode 100644 index 000000000..60bc9a557 --- /dev/null +++ b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2zCCAsOgAwIBAgIDFhIPMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRwwGgYDVQQLDBNhLXNpZ24tVEVT +VC1RdWFsLTAxMRwwGgYDVQQDDBNhLXNpZ24tVEVTVC1RdWFsLTAxMB4XDTE0MTEx +NzA3NDAzNloXDTI0MTExMTA2NDAzNlowgZMxCzAJBgNVBAYTAkFUMUgwRgYDVQQK +DD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4g +RGF0ZW52ZXJrZWhyIEdtYkgxHDAaBgNVBAsME2Etc2lnbi1URVNULVF1YWwtMDEx +HDAaBgNVBAMME2Etc2lnbi1URVNULVF1YWwtMDEwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQD4TRgyXzhxJ2AkndX0RPY771f64dsJrReEeuShLRK5io0B +kJWc4t7wuD1B98cJ0MUPlMmOJ2Ckc/vuLhQUyY3qEUmhMhixCUIcdHQ5yH3H0yMV +HxyJxAG83fE8M25kpKA4TzzMW8KPd2S63wbpPElyEy7vrllrLxvdQRSDpMZMvRg8 +fvoDGAehxsnKKwlXZuMq1aSBzfMz3cMBDKxvqzDIz7yC1iWNkdiwog3a5a5PbViK +shhZ0h+bx9WFDpiN6ooPQgcGhjD+NqIDoiOr7CUFHp+HiC6xIsEFJaBHTf3dRZ61 +0r1FDABx0Yj8+wlXSQLYq/1nR/QMwsvH0Cz1qYTPAgMBAAGjNjA0MA8GA1UdEwEB +/wQFMAMBAf8wEQYDVR0OBAoECE8h1CulBqTdMA4GA1UdDwEB/wQEAwIBBjANBgkq +hkiG9w0BAQUFAAOCAQEAimFu+xTm3UdyU+fO+2hz4DS20OGSC9NBDkorjzhRPWoZ +IVhUi6yH5drqSBm4/2ZYS1Ba5npzfyJwm+cLO28ljxAApfRHlbN0y83hKv7c0I7g +zWTMRs8X8ar5Gd7d4O5jpC4PAaZ1ozSDoE06U5im6YMLaJy/0QYvf5EQBMvLdeoc +d1vl17JYKYqYzcX2dvayikrfiglFqDaZZ66yJPBSuiyNhXpPkbXsOoyyTPtV/0Bh +eKIQiQyJID5aZtR7D4fBAzKdp5wB9KLQXBZ80hrwqrIuy+ME0tFaBWYBi8dzQ1iq +/E3Qz0USfGmxPMm8y/zRqsDvxZCRiSuvzBkOXbGMdA== +-----END CERTIFICATE----- diff --git a/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer new file mode 100644 index 000000000..e4bd48dac Binary files /dev/null and b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer differ diff --git a/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer new file mode 100644 index 000000000..74c4ce3b8 Binary files /dev/null and b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer differ diff --git a/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer new file mode 100644 index 000000000..6c50ec079 Binary files /dev/null and b/spss/handbook/conf/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer differ diff --git a/spss/handbook/conf/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt b/spss/handbook/conf/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt new file mode 100644 index 000000000..ebfbce9a0 Binary files /dev/null and b/spss/handbook/conf/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt new file mode 100644 index 000000000..e4bd48dac Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/identityLink+Test/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt b/spss/handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt new file mode 100644 index 000000000..e4bd48dac Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/identityLink/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer new file mode 100644 index 000000000..6c0c042b4 Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt new file mode 100644 index 000000000..e4bd48dac Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-corporate-light-02.20140905-20240905.SrN153B49.crt differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer new file mode 100644 index 000000000..74c4ce3b8 Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer new file mode 100644 index 000000000..6c50ec079 Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/officialSignature/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer differ diff --git a/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer new file mode 100644 index 000000000..1bb449441 Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/a-sign-Premium-Test-Sig-02.20141124-20141118.SerNo3969edc1.cer differ -- cgit v1.2.3 From 4be68fb9fecc579e2dae08be0af0b527d69387d8 Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Wed, 7 Jan 2015 13:43:17 +0100 Subject: new format(css) for the handbook --- id/server/doc/handbook/additional/additional.html | 260 ++++--- .../doc/handbook/application/application.html | 73 +- id/server/doc/handbook/common/MOA.css | 564 ++++++--------- id/server/doc/handbook/common/logo_digAT.png | Bin 0 -> 22964 bytes id/server/doc/handbook/config/config.html | 763 +++++++++++---------- id/server/doc/handbook/index.html | 28 +- id/server/doc/handbook/install/install.html | 93 ++- .../handbook/interfederation/interfederation.html | 135 ++-- id/server/doc/handbook/intro/intro.html | 91 +-- id/server/doc/handbook/protocol/protocol.html | 329 ++++----- 10 files changed, 1098 insertions(+), 1238 deletions(-) create mode 100644 id/server/doc/handbook/common/logo_digAT.png diff --git a/id/server/doc/handbook/additional/additional.html b/id/server/doc/handbook/additional/additional.html index fb4e76733..a4f7739fd 100644 --- a/id/server/doc/handbook/additional/additional.html +++ b/id/server/doc/handbook/additional/additional.html @@ -2,23 +2,23 @@ + MOA-ID - Zusatzinformationen - - - - - - -
Logo BKADokumentationLogo EGIZ
-


-

MOA-ID (Identifikation)

-

Zusatzinformationen

-
-

Inhalt

-
    +
    +
    + +

    MOA-ID-AUTH

    +
    +
    +
    +
    +

    Zusatzinformationen

    + +

    Inhalt

    +
    1. Datenmanagement
      1. Sessiondaten @@ -32,149 +32,148 @@
      2. Benötigte Netzwerkverbindungen (incoming / outgoing)
      -
      -

      1 Datenmanagement

      +

      1 Datenmanagement

      Dieser Abschnitt spezifiziert jene Datensätze die während eines Anmeldevorgangs durch das Modul MOA-ID-Auth temporär oder permanent gespeichert werden. Hierbei handelt es sich sowohl um temporäre Sessiondaten als auch um dauerhaft gespeicherte Statistikdaten.

      -

      1.1 Sessiondaten

      +

      1.1 Sessiondaten

      Dieser Abschnitt behandelt jene Informationen die das Modul MOA-ID-Auth während eines Authentifizierungsvorgangs oder während einer aktiven Single Sign-On Session im Speicher hält. Diese Datensätze werden nach Beendigung des Anmeldevorgangs, bei einfacher Anmeldung, oder nach Beendigung der Single Sign-On Session gelöscht. Die nachfolgenden Unterkapitel geben eine Aufstellung jener Daten die von MOA-ID im jeweiligen Falle gespeichert werden.

      -

      1.1.1 Allgemein

      +

      1.1.1 Allgemein

      Folgende Daten müssen mindestens von MOA-ID gecached werden um einen korrekten Anmeldevorgang zu ermöglichen.

      - +
      - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +

      Element

      Beschreibung

      Element

      Beschreibung

      Authentication Request

      Dieser wird von der Online-Applikation als Start des Anmeldevorgangs übertragen.

      Authentication Request

      Dieser wird von der Online-Applikation als Start des Anmeldevorgangs übertragen.

      Session ID

      Wird von MOA-ID generiert und dient zur Identifikation von Datensätzen.

      Session ID

      Wird von MOA-ID generiert und dient zur Identifikation von Datensätzen.

      Personenbindung

      Die Personenbindung der Benutzerin oder des Benutzers.

      Personenbindung

      Die Personenbindung der Benutzerin oder des Benutzers.

      AuthBlock

      Der Authentifizierungsblock, welcher im Rahmen des Anmeldevorgangs vom der Benutzerin oder dem Benutzer signiert wird.

      AuthBlock

      Der Authentifizierungsblock, welcher im Rahmen des Anmeldevorgangs vom der Benutzerin oder dem Benutzer signiert wird.

      Signaturzertifikat

      Das Signaturzertifikat, welches zur Signierung des Authentifizierungsblocks verwendet wurde.

      Signaturzertifikat

      Das Signaturzertifikat, welches zur Signierung des Authentifizierungsblocks verwendet wurde.

      Vollmacht

      Die Online-Vollmacht, welche bei einer Anmeldung in Vertretung ausgewählt wurde.

      Vollmacht

      Die Online-Vollmacht, welche bei einer Anmeldung in Vertretung ausgewählt wurde.

      STORK

      Alle Attribute, welche bei einer Anmeldung mittels STORK übertragen werden.

      STORK

      Alle Attribute, welche bei einer Anmeldung mittels STORK übertragen werden.

      AuthTimeStampZeitpunkt an dem sich die Benutzerin oder der Benutzer an MOA-ID-Auth authentifiziert hat.AuthTimeStampZeitpunkt an dem sich die Benutzerin oder der Benutzer an MOA-ID-Auth authentifiziert hat.
      -

      1.1.2 Single Sign-On

      +

      1.1.2 Single Sign-On

      Im Falle einer Anmeldung mit Single Sign-In werden zusätzlich zu den oben genannten Elementen noch weitere Datensätze gecached.

      - +
      - - + + - - + + - - + + - - + + - - + +

      Element

      Beschreibung

      Element

      Beschreibung

      SSO Session Token

      Das SSO Session Token dient zur Identifizierung einer aktuell bestehenden Single Sign-On Session.

      SSO Session Token

      Das SSO Session Token dient zur Identifizierung einer aktuell bestehenden Single Sign-On Session.

      UpdateTimeStampZeitpunkt des letzten Zugriffs der Benutzerin oder des Benutzers mittels SSO.UpdateTimeStampZeitpunkt des letzten Zugriffs der Benutzerin oder des Benutzers mittels SSO.

      Liste: ungültige SSO Token

      Eine Liste aller in dieser Single Sign-On Session bereits vergebenen und verwendeten SSO Session Token.

      Liste: ungültige SSO Token

      Eine Liste aller in dieser Single Sign-On Session bereits vergebenen und verwendeten SSO Session Token.

      Liste:  Online-Applikationen

      Eine Liste aller Onlineapplikationen an denen im Rahmen dieser SSO Session eine Anmeldung stattgefunden hat.

      Liste:  Online-Applikationen

      Eine Liste aller Onlineapplikationen an denen im Rahmen dieser SSO Session eine Anmeldung stattgefunden hat.

      -

      1.2 Logging von Statistikdaten

      +

      1.2 Logging von Statistikdaten

      Zusätzlich zu den Daten aus den temporären Sessiondaten werden vom Modul MOA-ID-Auth auch Logging- und Statistikdaten generiert, welche nicht automatisiert gelöscht werden. Diese Daten dienen der Statuskontrolle und zur Protokollierung von Anmeldevorgängen an MOA-ID-Auth. Von MOA-ID-Auth werden folgende Statistikdaten je Anmeldevorgang gespeichert, wobei je nach Art der Anmeldung nicht alle Datenelemente gefüllt werden. Die nachstehende Tabelle beschreibt den maximalen Umfang der Loggingdaten, wobei keine Informationen zur anmeldenden Person gespeichert werden.

      - +
      - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + - - + + - - + +

      Element

      Beschreibung

      Element

      Beschreibung

      timestamp

      Datum und Uhrzeit des Eintrags.

      timestamp

      Datum und Uhrzeit des Eintrags.

      OAID

      Eindeutige Datenbank ID der Online-Applikation.

      OAID

      Eindeutige Datenbank ID der Online-Applikation.

      OAURLPrefix

      Publik URL Prefix der Online-Applikation

      OAURLPrefix

      Publik URL Prefix der Online-Applikation

      OAFriendlyName

      Bezeichnung der Online-Applikation

      OAFriendlyName

      Bezeichnung der Online-Applikation

      isBusinessService

      „True“ wenn die Online-Applikation aus dem privatwirtschaftlichen Bereich stammt.

      isBusinessService

      „True“ wenn die Online-Applikation aus dem privatwirtschaftlichen Bereich stammt.

      OATarget

      Bereichskennzeichen der Online-Applikation (Target oder privatwirtschaftlicher Bereich)

      OATarget

      Bereichskennzeichen der Online-Applikation (Target oder privatwirtschaftlicher Bereich)

      BKUType

      Art der Bürgerkartenumgebung die für den Anmeldevorgang verwendet wurde. (online, local, handy)

      BKUType

      Art der Bürgerkartenumgebung die für den Anmeldevorgang verwendet wurde. (online, local, handy)

      BKUURL

      URL der verwendeten Bürgerkartenumgebung

      BKUURL

      URL der verwendeten Bürgerkartenumgebung

      isSSOLogin

      „True“ wenn die die Anmeldung als Teil einer SSO Anmeldung erfolgt ist.

      isSSOLogin

      „True“ wenn die die Anmeldung als Teil einer SSO Anmeldung erfolgt ist.

      isMandateLogin

      „True“ wenn die Anmeldung in Vertretung erfolgt ist.

      isMandateLogin

      „True“ wenn die Anmeldung in Vertretung erfolgt ist.

      MandateType

      Art der verwendeten Vollmacht (Einzelprofile des Vollmachtenservice oder OID des Organwalters / berufsmäßigen Parteienvertreters)

      MandateType

      Art der verwendeten Vollmacht (Einzelprofile des Vollmachtenservice oder OID des Organwalters / berufsmäßigen Parteienvertreters)

      MandatorType

      „jur“ / „nat“ je nach Art der vertretenen juristischen oder natürlichen Person

      MandatorType

      „jur“ / „nat“ je nach Art der vertretenen juristischen oder natürlichen Person

      isPV

      „True“ wenn die Anmeldung in Vertretung durch einen Organwalter oder berufsmäßigen Parteienvertreter erfolgt ist.

      isPV

      „True“ wenn die Anmeldung in Vertretung durch einen Organwalter oder berufsmäßigen Parteienvertreter erfolgt ist.

      PVOID

      OID des Organwalter oder berufsmäßigen Parteienvertreter

      PVOID

      OID des Organwalter oder berufsmäßigen Parteienvertreter

      ProtocolType

      Type des für die Anmeldung verwendeten Authentifizierungsprotokolls. (PVP21, OpenID, SAML1)

      ProtocolType

      Type des für die Anmeldung verwendeten Authentifizierungsprotokolls. (PVP21, OpenID, SAML1)

      ProtocolSubType

      Nähere Spezifizierung des Protokolltyps. (Im Falle von PVP 2.1: POST oder Redirect)

      ProtocolSubType

      Nähere Spezifizierung des Protokolltyps. (Im Falle von PVP 2.1: POST oder Redirect)

      ExceptionType

      Typ des Fehlers der während des Anmeldevorgangs aufgetreten ist. Aktuell werden folgende Typen unterschieden:

      +

      ExceptionType

      Typ des Fehlers der während des Anmeldevorgangs aufgetreten ist. Aktuell werden folgende Typen unterschieden:

      • bku: Fehler während der Kommunikation mit der Bürgerkartenumgebung.
      • moa-sp: Fehler bei der Kommunikation mit MOA-SP oder der Signaturprüfung.
      • @@ -184,74 +183,71 @@

      ExceptionCode

      Fehlercode des aufgetretenen Fehlers falls vorhanden.

      ExceptionCode

      Fehlercode des aufgetretenen Fehlers falls vorhanden.

      ExceptionMessage

      Fehlermeldung in textueller Form (max. 255 Zeichen lang)

      ExceptionMessage

      Fehlermeldung in textueller Form (max. 255 Zeichen lang)

       

      -

      2 Benötigte Netzwerkverbindungen (incoming / outgoing)

      +

      2 Benötigte Netzwerkverbindungen (incoming / outgoing)

      Für die Betrieb des Modules MOA-ID-Auth werden Netzwerkverbindungen zu externen Service benötigt. Die nachfolgende Tabelle gibt eine Aufstellung der benötigten Verbindungen und eine kurze Beschreibung über deren Funktion.

      - +
      - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - + - - - + + + - - + - - - + + +
      ServiceURLPortRichtungBeschreibungServiceURLPortRichtungBeschreibung

      MOA-ID-Auth

      *80, 443eingehend

      Front-Channel und Back-Channel Verbinding zum IDP

      MOA-ID-Auth

      *80, 443eingehend

      Front-Channel und Back-Channel Verbinding zum IDP

      MOA-ID-Auth

      *80, 443ausgehendAbholen von Template oder PVP 2.1 Metadaten

      MOA-ID-Auth

      *80, 443ausgehendAbholen von Template oder PVP 2.1 Metadaten
      LDAP*389, 636ausgehendZertifikatsprüfungLDAP*389, 636ausgehendZertifikatsprüfung

      OSCP / CRL

      *80, 443ausgehend

      Zertifikatsprüfung

      OSCP / CRL

      *80, 443ausgehend

      Zertifikatsprüfung

      OVS

      Prod: vollmachten.stammzahlenregister.gv.at
      +

      OVSvollmachten.stammzahlenregister.gv.at
      Test: vollmachten.egiz.gv.at

      443ausgehendOnline-Vollmachten Service (MIS) via SOAP Service443ausgehendOnline-Vollmachten Service (MIS) via SOAP Service
      SZR-GatewayProd: gateway.stammzahlenregister.gv.at
      +
      SZR-Gatewaygateway.stammzahlenregister.gv.at
      Test: szrgw.egiz.gv.at
      443ausgehendStammzahlenregister Gateway via SOAP Service443ausgehendStammzahlenregister Gateway via SOAP Service
      -

       

      -

       

      -

       

      -

       

      -

       

      + +
    diff --git a/id/server/doc/handbook/application/application.html b/id/server/doc/handbook/application/application.html index 8dbae87ed..3558a6e09 100644 --- a/id/server/doc/handbook/application/application.html +++ b/id/server/doc/handbook/application/application.html @@ -2,23 +2,23 @@ + MOA-ID - Anwendungen - - - - - - -
    Logo BKADokumentationLogo EGIZ
    -
    -

    MOA-ID (Identifikation)

    -

    Anwendungen

    -
    -

    Inhalt

    -
      +
      +
      + +

      MOA-ID-AUTH

      +
      +
      +
      +
      +

      Anwendungen

      + +

      Inhalt

      +
      1. Allgemeines
      2. Integration in bestehende Online-Applikationen
          @@ -44,36 +44,36 @@
      -
      -

      1 Allgemeines

      + +

      1 Allgemeines

      Das erste Kapitel behandelt die Integration der von MOA-ID-Auth generierten Bürgerkartenauswahl in bestehende Online-Applikationen. Zusätzlich zur Beschreibung ist MOA-ID auch eine PVP 2.1 Demo Applikation beigelegt. Die Konfiguration und Verwendung dieser Demo Applikation ist Inhalt des letzten Kapitels.

      -

      2 Integration in bestehende Online-Applikationen

      +

      2 Integration in bestehende Online-Applikationen

      Ab MOA-ID 2.0 wird die Bürgerkartenauswahl und die Single Sign-On Anmeldeabfrage standardmäßig vom Modul MOA-ID-Auth bereitgestellt und muss nicht mehr durch den Service Provider implementiert werden.

      Die im Modul MOA-ID-Auth hinterlegten Standard Templates (Bürgerkartenauswahl, Single Sign-On Anmeldeabfrage) unterstützt Responsive Design und passt sich somit in einem weiten Bereich an die aktuelle Fenstergröße an, wodurch eine individuelle Integration der von MOA-ID-Auth erzeugten Formulare möglich ist. Zusätzlich bietet das Konfigurationstool die Möglichkeit der online-applikationsspezifischen Anpassung der Standard Templates. Mit dieser Funktion können einzelne Parameter der Standard Templates an die Online-Applikation individualisiert werden um die Integration weiter zu verfeinern.

      Hinweis: Es besteht jedoch auch die Möglichkeit der Hinterlegung von vollständig benutzerdefinierten online-applikationsspezifischen Templates für die Bürgerkartenauswahl und die Single Sign-On Anmeldeabfrage (siehe hier).

      -

      2.1 Bürgerkartenauswahl

      +

      2.1 Bürgerkartenauswahl

      Die Bürgerkartenauswahl wird ab MOA-ID 2.0 standardmäßig von MOA-ID-Auth, als Antwort auf einen eingehenden Authentifizierungsrequest, bereitgestellt. Dem zu Folge müssen die aus MOA-ID 1.5.1 bekannten Parameter (target, bkuURL, template, usemandate) nicht mehr im Authentifizierungsrequest an MOA-ID-Auth übergeben werden und es kann ein standardkonformer Protokollrequest verwendet werden. Die aus MOA-ID 1.5.1 bekannte Variante der Bürgerkartenauswahl in der Online-Applikation des Service Providers steht jedoch weiterhin als Legacy Variante zur Verfügung.

      Die Integration der von MOA-ID-Auth bereitgestellten Bürgerkartenauswahl in eine bestehende Online-Applikation kann auf zwei Arten erfolgen. Bei beiden Varianten erfolgt der Login Vorgang (senden des Authentifizierungsrequests an MOA-ID-Auth) durch den Klick auf einen Login Button. Die Auswahl der Bürgerkartenumgebung erfolgt somit erst im zweiten Schritt. Das Sequenzdiagramm eines solchen Anmeldevorgangs finden Sie hier und die nachfolgende Grafik zeigt ein Beispiel zur Integration eines Login Buttons.

      -

      Integration Login Button

      -

      2.1.1 Request aus einem iFrame

      +
      Integration Login Button
      +

      2.1.1 Request aus einem iFrame

      Bei dieser Variante wird der Authentifizierungsrequests aus einem iFrame, welcher in die Online-Applikation eingebunden ist, abgesetzt. MOA-ID-Auth antwortet auf diesen Request mit der konfigurierten Bürgerkartenauswahl welche durch Verwendung des iFrame in die Online-Applikation eingebunden werden kann. Die nachfolgende Grafik zeigt ein Beispiel für die von MOA-ID-Auth bereitgestellte Bürgerkartenauswahl, welche nach Betätigung des Login Buttons im iFrame dargestellt wird.

      -

      Bürgerkartenauswahl im iFrame

      +
      Bürgerkartenauswahl im iFrame

      Hinweis: Bei dieser Variante wird die Assertion ebenfalls an den iFrame ausgeliefert wodurch der authentifizierte Bereich der Online-Applikation im iFrame dargestellt wird. Dieses Verhalten kann durch eine online-applikationsspezifischen Anpassung der Standard Templates und dem Parameter Targetparameter unterbunden werden.

      -

      2.1.2 Request aus dem Hauptframe

      +

      2.1.2 Request aus dem Hauptframe

      Bei dieser Variante wird der Authentifizierungsrequests direkt aus dem aktuell offenen Browserfenster an MOA-ID-Auth gesendet. In diesem Fall wird die Bürgerkartenauswahl fensterfüllend im Browser dargestellt und die Benutzerin oder der Benutzer befindet sich nicht mehr in der Domain der Online-Applikation (Service Provider). Nach erfolgreicher Authentifizierung wird die Benutzerin oder der Benutzer an die Online-Applikation zurückgeleitet. Die nachfolgende Grafik zeigt die Bürgerkartenauswahl im seitenfüllenden Layout.

      -

      Bürgerkartenauswahl im seitenfüllenden Layout

      -

      2.2 Single Sign-On Anmeldeabfrage

      +
      Bürgerkartenauswahl im seitenfüllenden Layout
      +

      2.2 Single Sign-On Anmeldeabfrage

      Wird für die Integration in die Online-Applikation die Variante mit dem Login Button und der von MOA-ID-Auth bereitgestellten Bürgerkartenauswahl verwendet (iFrame oder Hauptframe), ergeben sich für die Single Sign-On Anmeldeabfrage keine zusätzlichen Anforderungen. Im Falle einer aktiven Single Sign-On Session, würde MOA-ID-Auth mit der Single Sign-On Anmeldeabfrage anstatt der Bürgerkartenauswahl antworten. Auch in diesem Fall stehen beide Möglichkeiten der Integration, identisch zum Kapitel Bürgerkartenauswahl, zur Verfügung. Die nachfolgende Grafik zeigt eine Single Sign-On Abfrage welche je nach verwendeter Variante die Bürgerkartenauswahl, in den zuvor gezeigten Beispielen, ersetzen würde.

      -

      Single Sign-On Anmeldeabfrage

      +
      Single Sign-On Anmeldeabfrage

      Hinweis: Wird für die Integration der Bürgerkartenauswahl jedoch die Legacy Variante verwendet (direkte Integration der Bürgerkartenauswahl in die Online-Applikation) kann es zu Inkompatibilitäten mit der Single Sign-On Anmeldeabfrage kommen, da diese Abfrage von MOA-ID-Auth generiert werden muss und eine direkte Integration in eine Online-Applikation nicht möglich ist.

      -

      3 Demo Applikationen

      +

      3 Demo Applikationen

      Dieser Abschnitt behandelt die Konfiguration und Verwendung der bei MOA-ID beigelegten Demo Applikationen.

      -

      3.1 PVP 2.1 Demo

      +

      3.1 PVP 2.1 Demo

      Die PVP 2.1 Demo stellt das Minimalbeispiel einer Online-Applikation dar, welche zur Authentifizierung das Protokoll PVP 2.1 verwendet. Die nachfolgenden Abschnitte beschreiben die Installation, Konfiguration und Verwendung der PVP 2.1 Demo Applikation.

      Hinweis: Der Source Code der PVP 2.1 Demo Applikation ist im Order $MOA_ID_AUTH_INST/source/moa-id-oa verfügbar. Jedoch ist die Validierung der PVP 2.1 Assertion in dieser Version nicht vollständig implementiert und müsste bei Verwendung in einem Produktivsystem noch erweitert werden.

      -

      3.1.1 Installation

      +

      3.1.1 Installation

      Für die Installation der Demo Applikation wird ein Apache Tomcat benötigt. Die Konfiguration dieser Tomcat Instanz ist identisch zur Konfiguration der Tomcat Instanz der Module MOA-ID-Auth und MOA-ID-Configuration.

      -
      3.1.1.1 Einsatz der Demo Applikation in Tomcat
      +
      3.1.1.1 Einsatz der Demo Applikation in Tomcat
      • Die Datei $MOA_ID_AUTH_INST/moa-id_oa.war enthält das einsatzfertige Webarchiv der Demo Applikation und muss ins Verzeichnis $CATALINA_HOME/webapps kopiert werden. Dort wird sie beim ersten Start von Tomcat automatisch ins Verzeichnis $CATALINA_HOME/webapps/moa-id-oa entpackt.
      • Die Konfigurationsdatei mit der Basiskonfiguration für die Demo Applikation und die zugehörigen Verzeichnisse müssen in ein beliebiges Verzeichnis im Dateisystem kopiert werden (z.B. $CATALINA_HOME/conf/moa-id-oa). Eine funktionsfähige Konfiguration, die als Ausgangspunkt für die Basiskonfiguration der Demo Applikation dienen kann, finden Sie hier.
        @@ -89,7 +89,7 @@
      -

      3.1.1.2 Einsatz der Demo Applikation in Tomcat

      +
      3.1.1.2 Einsatz der Demo Applikation in Tomcat

      Das starten und stoppen der Demo Applikation erfolgt identisch zur Beschreibung für die Module MOA-ID-Auth und MOA-ID-Configuration.

      Ein erfolgreicher Start der Demo Applikation ist an folgender Log-Meldung ersichtlich:

      INFO at.gv.egovernment.moa.id.demoOA.Configuration  - Demo Application initializaten finished.
      @@ -99,15 +99,15 @@
       https://<host>:<port>/moa-id-oa/
       
      -

      3.1.2 Konfiguration Demo Applikation

      +

      3.1.2 Konfiguration Demo Applikation

      Die zentrale Konfigurationsdatei für die Demo Applikation wird der Java Virtual Machine, in der die Demo Applikation läuft, durch eine System Property mitgeteilt (wird beim Starten der Java Virtual Machine in der Form -D<name>=<wert> gemacht). Der Name der System Property lautet moa.id.demoOA als Wert der System Property ist der Pfad sowie der Name der Konfigurationsdatei im Dateisystem anzugeben, z.B.

      moa.id.demoOA=C:/Programme/apache/tomcat-4.1.30/conf/moa-id-oa/oa.properties

      Diese Konfigurationsdatei beinhaltet folgende Parameter.

      - +
      - - - + + + @@ -200,9 +200,9 @@ http://<host>:<port>/moa-id-oa/servlet/metadata
       https://<host>:<port>/moa-id-oa/servlet/metadata

      Nach erfolgreicher Konfiguration muss die Tomcat Instanz neu gestartet werden.

      -

      3.1.3 Konfiguration von MOA-ID-Auth

      +

      3.1.3 Konfiguration von MOA-ID-Auth

      Bevor ein Anmeldevorgang gestartet werden kann muss die Demo Applikation auch als Online-Applikation für das Modul MOA-ID-Auth konfiguriert werden. Hierfür kann das Konfigurationstool (Modul MOA-ID-Configuration) verwendet werden. Tragen Sie die Demo Applikation als Online-Applikation bei Ihrer MOA-ID-Auth Instanz ein. Eine Beschreibung der einzelnen Konfigurationsparameter finden Sie hier.

      -

      3.1.4 Anwendung

      +

      3.1.4 Anwendung

      Nach dem Starten von Tomcat steht die Demo Applikation zur Verfügung.

      http://<host>:<port>/moa-id-oa/

      bzw.

      @@ -214,5 +214,6 @@ https://<host>:<port>/moa-id-oa/

      Nach erfolgreicher Authentifizierung werden Sie an die Demo Applikation zurückgeleite. Diese extrahiert einige Basisdaten aus der PVP 2.1 Assertion und stellt diese im Browser dar. Zusätzlich kann die gesamte übertragene PVP 2.1 Assertion angezeigt werden.

      Wurde der Anmeldevorgang durch einen Fehler abgebrochen werden Sie ebenfalls an die Demo Applikation zurückgeleitet. In diesem Fall wird eine kurze Fehlerbeschreibung dargestellt. Eine ausführliche Fehlerbeschreibung kann der PVP 2.1 Assertion entnommen werden.

       

      + diff --git a/id/server/doc/handbook/common/MOA.css b/id/server/doc/handbook/common/MOA.css index f76ea53d4..03390e729 100644 --- a/id/server/doc/handbook/common/MOA.css +++ b/id/server/doc/handbook/common/MOA.css @@ -1,15 +1,21 @@ +.container { + margin: auto; + max-width: 1000px; + padding-left: 20px; + padding-right: 20px; +} + body { - font-family: "Times New Roman", Times, serif; + font-family: sans-serif; + color: #000; font-size: medium; font-weight: normal; - margin-left: 2.5em; - margin-right: 2.5em; + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; background-color: white; - text: #000000; - link: #990000; - vlink: #666666; - alink: #cc9966; + } @@ -21,17 +27,40 @@ p text-align: justify } +.centeredimage{ + text-align: center; + width:100%; +} + +.index{ + padding-left: 0; +} +.index a{ + color: #666; +} +.index a:hover +{ + color:#E10319; +} +.index ul{ + list-style-type: none; +} +.index li{ + list-style-type: none; +} + pre { font-family: "Courier New", monospace; font-size: 90%; - background-color: #cccccc; + background-color: #DDD; color: #000000; margin-left:1.5%; margin-right:1.5%; margin-top: 1em; margin-bottom: 1em; border: #008000 none; + white-space: pre-wrap; } hr @@ -49,9 +78,8 @@ table.fixedWidth margin-right:1.5%; margin-top: 1em; margin-bottom: 1em; + color:#404040; } - - table.varWidth { margin-left:1.5%; @@ -59,86 +87,90 @@ table.varWidth margin-bottom: 1em; } -th -{ - text-align: left; +table.configtable{ + width:100%; + border-collapse: collapse; + border-style:solid; + border-color: #404040; + border-width: 2px; +} +table.configtable th{ + border-style:solid; + border-color: #404040; + border-width: 2px; + padding:3px; +} +table.configtable td{ + border-style:solid; + border-color: #404040; + border-width: 1px; + border-left-width: 2px; + border-right-width: 2px; + padding:3px; } -h1 -{ - color: #000000; + +th +{ text-align: left; - font-size: 167%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; } h2 { - color: #000000; + font-size: 150%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; + font-weight: bold; + } h3 { - color: #000000; - font-size: 133%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; + + font-size: 133%; + font-weight: bolder; } h4 { - color: #000000; - font-size: 116%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; + font-size: 110%; + font-weight: bolder; + } h5 { - color: #000000; font-size: 100%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; + font-weight: bolder; } h6 { - color: #000000; - font-size: 83%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; + font-size: 90%; + font-weight: bold; } code { font-family: "Courier New", Courier, monospace; font-size: 90%; - color: #000000 + color: #000000; } dd { margin-top: 0.8em; margin-bottom: 0.8em; - text-align: justify + text-align: justify; } dt { margin-top: 0.8em; - font-family: Arial, Helvetica, sans-serif; - color: #000080 + color: #E10319; +} +dt a{ + text-decoration:none; } ol @@ -156,12 +188,16 @@ li { margin-top: 0.25em; margin-bottom: 0.25em; - text-align: justify + text-align: justify; } a:hover { - color: #990000 + color: #E10319; +} +a{ + color: #666; + text-decoration: none; } @@ -170,10 +206,9 @@ a:hover text-align: left; font-size: 200%; color: #000000; - font-family: Arial, Helvetica, sans-serif; + font-family: sans-serif; margin-top: 0.4em; margin-bottom: 0.4em; - background-color:#999; } .subtitle @@ -181,7 +216,7 @@ a:hover text-align: left; font-size: 133%; color: #000000; - font-family: Arial, Helvetica, sans-serif; + font-family: sans-serif; margin-top: 0.4em; margin-bottom: 0.4em } @@ -212,7 +247,7 @@ a:hover .documentinfo { - font-family: Arial, Helvetica, sans-serif; + font-family: sans-serif; font-size: 100%; } @@ -234,18 +269,20 @@ a:hover { text-align: center; font-size: 200%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; } .logoTable { margin-bottom: 0px; - margin-left: 0px + margin-left: 0px; + background: linear-gradient(#FAFAFA, #F5F5F5); + border-bottom: 1px solid #EEE; + border-color: #818286; + } .superscript -{ +{ vertical-align: super; font-size: 66%; } @@ -315,310 +352,121 @@ li.faq { color: #000080; font-size: 100%; - font-family: Arial, Helvetica, sans-serif; + font-family: sans-serif; font-weight: normal; margin-bottom: 0.4em; } - - -/*body -{ - font-family: "Times New Roman", Times, serif; - font-size: medium; - font-weight: normal; - margin-left: 2.5em; - margin-right: 2.5em; -} - -p -{ - margin-top: 0pt; - margin-bottom: 0.5em; - text-align: justify +/*********************************/ +@media ( min-width :600px) { + #headline { + /*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/ + background: linear-gradient(#FAFAFA, #F5F5F5); + border-bottom: 1px solid #EEE; + + } + #headline br { + clear: both; + } + + #headline h1 { + color: #404040; + padding-right: 1em; + padding-top: 0.3em; + margin-bottom: 0; + float: right; + } + #headline img { + width: 300px; + padding-left: 0; + padding-top: 35px; + padding-bottom:20px; + } + + .smallImgDiv{ + width:50%; + margin:auto; + margin-bottom:40px; + margin-top:20px; + } + .smallImgDiv img{ + max-width: 100%; + max-height: 100%; + margin:auto; + display: block; + } + .largeImgDiv{ + width:100%; + margin: auto; + margin-bottom:40px; + margin-top:20px; + } + .largeImgDiv img{ + max-width: 100%; + max-height: 100%; + margin:auto; + display: block; + } +} +/*****************************/ +@media ( max-width :599px) { + #headline { + /*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/ + background: linear-gradient(#FAFAFA, #F5F5F5); + border-bottom: 1px solid #EEE; + } + + #headline img { + width: 150px; + padding-left: 0; + padding-top: 0.5em; + padding-bottom:0.5em; + } + #headline br { + clear: both; + } + #demologin { + width: 100%; + box-sizing: border-box; + border: 1px solid; + border-radius: 1px; + border-color: #818286; + background: #F5F5F5; + height: 182px; + width: 242px; + margin-top: 18px; + padding-left:0; + } + #headline h1 { + color: #404040; + padding: 0; + margin-bottom: 0; + margin-top: 0; + text-align: center; + } + .smallImgDiv{ + width:100%; + margin:auto; + margin-bottom:40px; + margin-top:20px; + } + .smallImgDiv img{ + max-width: 100%; + max-height: 100%; + margin:auto; + display: block; + } + .largeImgDiv{ + width:100%; + margin: auto; + margin-bottom:40px; + margin-top:20px; + } + .largeImgDiv img{ + max-width: 100%; + max-height: 100%; + margin:auto; + display: block; + } } -pre -{ - font-family: "Courier New", monospace; - font-size: 90%; - background-color: #cccccc; - color: #000000; - margin-left:1.5%; - margin-right:1.5%; - margin-top: 1em; - margin-bottom: 1em; - border: #008000 none; -} - -hr -{ - color: #000080; - background-color: #000080; - margin-top: 0.5em; - margin-bottom: 0.5em; -} - -table.fixedWidth -{ - width: 97%; - margin-left:1.5%; - margin-right:1.5%; - margin-top: 1em; - margin-bottom: 1em; -} - - -table.varWidth -{ - margin-left:1.5%; - margin-top: 1em; - margin-bottom: 1em; -} - -th -{ - text-align: left; -} - -h1 -{ - color: #000080; - text-align: left; - font-size: 167%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h2 -{ - color: #000080; - font-size: 150%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h3 -{ - color: #000080; - font-size: 133%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h4 -{ - color: #000080; - font-size: 116%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h5 -{ - color: #000080; - font-size: 100%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h6 -{ - color: #000080; - font-size: 83%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -code -{ - font-family: "Courier New", Courier, monospace; - font-size: 90%; - color: #000000 -} - -dd -{ - margin-top: 0.8em; - margin-bottom: 0.8em; - text-align: justify - -} - -dt -{ - margin-top: 0.8em; - font-family: Arial, Helvetica, sans-serif; - color: #000080 -} - -ol -{ - margin-top: 0.5em; - margin-bottom: 0.5em -} -ol.alpha -{ - list-style-type: lower-alpha -} - -li -{ - margin-top: 0.25em; - margin-bottom: 0.25em; - text-align: justify -} - -a:hover -{ - color: #990000 -} - - -.title -{ - text-align: left; - font-size: 167%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; - margin-top: 0.4em; - margin-bottom: 0.4em -} - -.subtitle -{ - text-align: left; - font-size: 133%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; - margin-top: 0.4em; - margin-bottom: 0.4em -} - -.glossaryTerm -{ - font-style: italic; - color: #006699 -} - -.example -{ - font-family: "Courier New", monospace; - background-color: #CCFFFF; - color: #000000; - margin: 0pt 0pt; - border: #008000 none -} - -.schema -{ - font-family: "Courier New", monospace; - background-color: #FFFFCC; - color: #000000; - margin: 0pt 0pt; - border: #008000 none -} - -.documentinfo -{ - font-family: Arial, Helvetica, sans-serif; - font-size: 100%; -} - -.ol-contents -{ - font-size: 100%; - margin-top: 0.0em; - margin-bottom: 0.0em; -} - -.li-contents -{ - font-size: 100%; - margin-top: 0.0em; - margin-bottom: 0.0em; -} - -.logoTitle -{ - text-align: center; - font-size: 133%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; -} - -.logoTable -{ - margin-bottom: 0px; - margin-left: 0px -} - -.superscript -{ - vertical-align: super; - font-size: 66%; -} - -.term -{ - font-style: italic; -} - -.comment -{ - color: #000000; - background: #ffff00; - font-style: italic -} - -.addedErrata12 -{ - color: #FF0000; - background-color: #FFEEEE; - text-decoration: underline -} - -.deletedErrata12 -{ - color: #999999; - background-color: #EEEEEE; - text-decoration: line-through -} - -.added12 -{ - color: #FF0000; - text-decoration: underline -; background-color: #F8F0FF -} - -.deleted12 -{ - color: #999999; - text-decoration: line-through -; background-color: #f8f0ff -} - -.rfc2119Keyword -{ - font-variant: small-caps; - font-style: normal; -} - -.remark { font-style: italic} - -li.faq -{ - margin-top: 1.5em; - margin-bottom: 1.5em; -} - -.faq-question -{ - color: #000080; - font-size: 100%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - margin-bottom: 0.4em; -} -*/ diff --git a/id/server/doc/handbook/common/logo_digAT.png b/id/server/doc/handbook/common/logo_digAT.png new file mode 100644 index 000000000..4f36681e2 Binary files /dev/null and b/id/server/doc/handbook/common/logo_digAT.png differ diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html index 9b4190035..78661e483 100644 --- a/id/server/doc/handbook/config/config.html +++ b/id/server/doc/handbook/config/config.html @@ -2,23 +2,24 @@ + MOA-ID - Konfiguration -
      NameBeispielwertBeschreibungNameBeispielwertBeschreibung
      general.publicURLContext
      - - - - - -
      Logo BKADokumentationLogo EGIZ
      -
      -

      MOA-ID (Identifikation)

      -

      Konfiguration

      -
      -

      Inhalt

      -
        + +
        +
        + +

        MOA-ID-AUTH

        +
        +
        +
        +
        +

        Konfiguration

        + +

        Inhalt

        +
        1. Übersicht

            @@ -152,14 +153,14 @@
          1. Konfiguration von MOA-SP
          2. Tomcat Security Manager
          -
            +
            1. Referenzierte Spezifikation
            -
            -

            1 Übersicht

            + +

            1 Übersicht

            Dieses Handbuch beschreibt detailliert die Konfigurationsmöglichkeiten für die Module MOA-ID-Auth und MOA-ID-Configuration. Wobei das zentrale Einsatzgebiet des Modules MOA-ID-Configuration die Konfiguration des Modules MOA-ID-Auth darstellt.

            Die Konfiguration der beiden Module MOA-ID-Auth und MOA-ID-Configuration kann in zwei Teilbereiche unterteilt werden. Der erste Abschnitt behandelt die Basiskonfiguration der beiden Module, welche in textueller Form mit Hilfe von properties-Konfigurationsdateien erfolgt. Der zweite Abschnitt behandelt die Konfiguration des Modules MOA-ID-Auth unter Zuhilfenahme des Modules MOA-ID-Configuration.

            -

            1.1 Empfohlener Konfigurationsablauf

            +

            1.1 Empfohlener Konfigurationsablauf

            1. Basiskonfiguration des Modules MOA-ID-Configuration
            2. Initialisierung des Modules MOA-ID-Configuration
            3. @@ -168,24 +169,24 @@
            4. Konfiguration von Online-Applikationen

            Optional kann nach dem Schritt 3 Basiskonfiguration des Modules MOA-ID-Auth eine bestehende MOA-ID 1.5.1 Konfiguration importiert werden. Für bestehende Konfigurationen < 1.5.1 wird eine vollständige Neukonfiguration empfohlen.

            -

            2 Basiskonfiguration

            +

            2 Basiskonfiguration

            Die Basiskonfiguration für die Module MOA-ID-Auth und MOA-ID-Configuration erfolgt mit Hilfe textueller properties-Dateien. Diese properties-Dateien beinhalten alle Konfigurationsparameter welche für den Start der Module erforderlich sind und müssen der Java Virtual Machine durch eine System Property mitgeteilt werden. Alle Änderungen die an der Basiskonfiguration vorgenommen werden erfordern einen Neustart der jeweiligen Java Virtual Machine.

            Hinweis: Alle URL Konfigurationsparameter auf Dateien ohne den Prefix file:/ werden als relative Pfadangaben zum Konfigurationsbasisverzeichnis des jeweiligen Modules interpretiert.

            -

            2.1 MOA-ID-Configuration

            +

            2.1 MOA-ID-Configuration

            Dieser Abschnitt behandelt die Basiskonfiguration des Modules MOA-ID-Configuration. Der erste Teilabschnitt behandelt die Bekanntmachung der Konfigurationsdatei mittels einer System Property und der zweite Teilabschnitt beschreibt die einzelnen Konfigurationsparameter im Detail. Eine Konfiguration die als Ausgangspunkt für die individuelle Konfiguration verwendet werden kann finden Sie hier.

            -

            2.1.1 Bekanntmachung der Konfigurationsdatei

            +

            2.1.1 Bekanntmachung der Konfigurationsdatei

            Die zentrale Konfigurationsdatei von MOA-ID-Configuration wird der Java Virtual Machine, in der MOA-ID-Configuration läuft, durch eine System Property mitgeteilt (wird beim Starten der Java Virtual Machine in der Form -D<name>=<wert> gemacht). Der Name der System Property lautet moa.id.webconfig als Wert der System Property ist der Pfad sowie der Name der Konfigurationsdatei im Dateisystem anzugeben, z.B.

            moa.id.webconfig=C:/Programme/apache/tomcat-4.1.30/conf/moa-id-configuration/moa-id-configuration.properties

            Weitere Informationen zum Bekanntmachen der zentralen Konfigurationsdatei für MOA-ID-Configuration erhalten Sie in Abschnitt 2.1.2.4 des Installationshandbuchs.

            -

            2.1.2 Konfigurationsparameter

            +

            2.1.2 Konfigurationsparameter

            Aus Gründen der Übersichtlichkeit werden die einzelnen Konfigurationsparameter in logisch zusammenhängende Blöcke unterteilt. Die Konfiguration der Blöcke Allgemeine Konfigurationsparameter und Datenbankzugriff sind nicht optional und müssen für den Betrieb angepasst werden.

            -

            2.1.2.1 Allgemeine Konfigurationsparameter

            +
            2.1.2.1 Allgemeine Konfigurationsparameter

            Die folgenden Konfigurationsparameter sind nicht optional und müssen in der Konfigurationsdatei enthalten sein und individuell angepasst werden.

            - +
            - - - + + + @@ -230,13 +231,13 @@
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            general.login.deaktivateInnerhalb dieses Zeitraums muss ein neuer Benutzer die im Benutzerprofil hinterlegte eMail Adresse validieren.
            -

            2.1.2.3 Datenbankzugriff

            +
            2.1.2.3 Datenbankzugriff

            Diese Konfigurationsparameter sind nicht optional und müssen in der Konfigurationsdatei enthalten sein und individuell angepasst werden. Für die Beispielkonfiguration wurde mySQL als Datenbank verwendet wodurch sich die Konfigurationsparameter auf mySQL beziehen. Das Modul MOA-ID-Configuration kann jedoch auch mit Datenbanken anderer Hersteller betrieben werden. Hierfür wird jedoch auf die Hibernate Dokumention verwiesen, welches im Module MOA-ID-Configuration für den Datenbankzugriff verwendet wird.

            - +
            - - - + + + @@ -266,13 +267,13 @@
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            hibernate.dialect

             

            Die Beispielkonfiguration beinhaltet noch zusätzliche Konfigurationsparameter für den Datenbankzugriff welche direkt aus der Beispielkonfiguration übernommen werden können. Eine detaillierte Beschreibung der einzelnen Einstellungsparameter kann der Hibernate Dokumention entnommen werden.

            -

            2.1.2.4 Bürgerkarten LogIn

            +
            2.1.2.4 Bürgerkarten LogIn

            Zusätzlich zur Authentifizierung mittels Benutzername und Passwort unterstützt das Modul MOA-ID-Configuration auch eine Authentifizierung mittels Bürgerkarte oder Handy-Signatur unter Verwendung des Authentifizierungsprotokolls PVP2.1. Wenn eine Authentifizierung mittels Bürgerkarte oder Handy-Signatur gewünscht wird müssen die nachfolgen Parameter konfiguriert werden.

            - +
            - - - + + + @@ -363,13 +364,13 @@ http://<host>:<port>/moa-id-configuration/servlet/metadata

            bzw.

             https://<host>:<port>/moa-id-configuration/servlet/metadata
            -

            2.1.2.5 Mailversand

            +
            2.1.2.5 Mailversand

            Das Modul MOA-ID-Configuration bietet die Möglichkeit zur Generierung von automatischen Statusmeldungen welche via eMail versendet werden. Diese Statusmeldungen betreffen die Aktivierung neuer Online-Applikationen oder Benutzeraccounts und die Verifikation von eMail Adressen welche einem Benutzeraccount zugeordnet sind. Detailinformationen hierzu finden Sie im Abschnitt Benutzerverwaltung.

            -
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            general.login.pvp2.isactive
            +
            - - - + + + @@ -453,7 +454,7 @@ https://<host>:<port>/moa-id-configuration/servlet/metadata
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            general.mail.host

             

            -

            2.1.3 Initialisierung des Modules MOA-ID-Configuration

            +

            2.1.3 Initialisierung des Modules MOA-ID-Configuration

            Für den ersten Start muss die Authentifizierung deaktiviert werden (siehe general.login.deaktivate Abschnitt 2.2.2.1). Anschließend kann die Benutzerverwaltung des Modules MOA-ID-Configuration unter der folgenden Adresse aufgerufen werden.

            http://<host>:<port>/moa-id-configuration/secure/usermanagementInit.action

            bzw.

            @@ -461,16 +462,16 @@ https://<host>:<port>/moa-id-configuration/servlet/metadata https://<host>:<port>/moa-id-configuration/secure/usermanagementInit.action

            Mit Hilfe dieser Benutzerverwaltung kann ein neuer Benutzeraccount am Konfigurationstool angelegt und ein Kennwort für den Benutzer vergeben werden. Zusätzlich müssen dem neu erstellten Benutzer die Eigenschaften aktiv und admin zugewiesen werden. Nach dem speichern wird der neu angelegte Benutzer in der Liste aller vorhandenen Benutzern dargestellt.

            Hiermit ist die Initialisierung des Moduls MOA-ID-Configuration abgeschlossen und die Authentifizierung kann wieder aktiviert werden (siehe general.login.deaktivate Abschnitt 2.2.2.1). Anschließend muss die Java Virtual Machine, in welchem das Modul MOA-ID-Configuration betrieben wird, neu gestartet werden.

            -

            Hinweis: Ein Betrieb des Moduls MOA-ID-Configuration ohne Authentifizierung ist ebenfalls möglich. In diesem Fall wird jedoch empfohlen den Zugriff auf das Konfigurationstool mit anderen Mitteln einzuschränken.

            -

            2.1.4 Benutzerverwaltung

            +

            Hinweis: Ein Betrieb des Moduls MOA-ID-Configuration ohne Authentifizierung ist ebenfalls m\F6glich. In diesem Fall wird jedoch empfohlen den Zugriff auf das Konfigurationstool mit anderen Mitteln einzuschr\E4nken.

            +

            2.1.4 Benutzerverwaltung

            Das Modul MOA-ID-Configuration unterstützt die Benützung und Verwaltung unterschiedlicher Benutzeraccounts. Hierfür stellt die Web-Oberfläche des Modules MOA-ID-Configuration ein spezielles Interface zur Benutzerverwaltung zur Verfügung.

            -

            2.1.4.1 Einen neuen Benutzer erstellen

            +
            2.1.4.1 Einen neuen Benutzer erstellen

            Für die Registrierung eins neuen Benutzeraccounts werden folgende Informationen benötigt.

            - +
            - - - + + + @@ -536,8 +537,8 @@ https://<host>:<port>/moa-id-configuration/secure/usermanagementInit
          1. Durch PVP 2.1 Login: Bei dieser Variante wird die Generierung eines neues Benutzeraccounts durch einen Loginversuch mittels Bürgerkarte oder Handy-Signatur ausgelöst. Nach erfolgreicher Authentifizierung wird die Benutzerin / der Benutzer an das Konfigurationstool weitergeleitet. Hierbei wird geprüft ob aktuell ein Benutzeraccount für diese Person existiert. Wenn kein Account existiert wird die Benutzerin / der Benutzer aufgefordert die fehlenden Informationen für die Registrierung eines neuen Benutzeraccounts einzutragen. In diesem Fall muss die eMail Adresse durch die Benutzerin / den Benutzer zwingend validiert werden wofür der Mailversand am Module MOA-ID-Configuration konfiguriert sein muss. Nach erfolgreicher Validierung der eMail Adresse ist der Benutzeraccount als nicht aktiv registriert und muss anschließend durch einen Administrator aktiviert werden. Erst nach erfolgreicher Aktivierung ist eine gültige Anmeldung möglich.
            Sollte die Validierung der eMail Adresse nicht innerhalb des in Abschnitt 2.2.1.1 konfigurierten Zeitraums erfolgen, wird die Benutzeranforderung automatisch gelöscht und die Benutzerin / der Benutzer muss sich erneut am Konfigurationstool registrieren.
          2. -

            2.1.4.2 Benutzerrechte

            -

            Alle Benutzer die Admin–Rechte (Eigenschaft admin) besitzen haben vollen Zugriff auf die gesamte Konfiguration der verwalteten MOA-ID-Auth Instanz. Benutzer ohne Admin-Rechten stehen nur folgende Operationen zur Verfügung wobei diese auch besondere Einschränkungen aufweisen können.

            +
            2.1.4.2 Benutzerrechte
            +

            Alle Benutzer die Admin–Rechte (Eigenschaft admin) besitzen haben vollen Zugriff auf die gesamte Konfiguration der verwalteten MOA-ID-Auth Instanz. Benutzer ohne Admin-Rechten stehen nur folgende Operationen zur Verf\FCgung wobei diese auch besondere Einschr\E4nkungen aufweisen k\F6nnen.

            • Online-Applikationen bearbeiten: Ein Benutzer ohne Admin-Rechte kann nur jene Online-Applikationen bearbeiten die von ihm erstellt wurden. Das bearbeiten fremder Online-Applikationen ist nicht möglich. Folgende Parameter können durch diesen Benutzer bearbeitet werden.
                @@ -557,21 +558,21 @@ https://<host>:<port>/moa-id-configuration/secure/usermanagementInit
              • Online Applikation anlegen: Ein Benutzer ohne Admin-Rechte kann neue Online-Applikationen anlegen. Die Funktionen „Online-Applikation aktivieren“ (siehe Kapitel 3.2: ) steht jedoch nicht zur Verfügung. Somit muss die Online-Applikation von einem Benutzer mit Admin-Rechten aktiv geschalten werden.
              • Benutzerverwaltung: Ein Benutzer ohne Admin-Rechte kann keine neuen Benutzer erstellen. Dieser kann jedoch seinen Benutzeraccount bearbeiten und gegeben falls löschen. Beim Löschen eines Benutzeraccounts werden Online-Applikationen die von diesem erstellt wurden jedoch nicht automatisch gelöscht.
              -

              2.2 MOA-ID-Auth

              +

              2.2 MOA-ID-Auth

              Dieser Abschnitt behandelt die Basiskonfiguration des Modules MOA-ID-Auth. Der erste Teilabschnitt behandelt die Bekanntmachung der Konfigurationsdatei mittels einer System Property und der zweite Teilabschnitt beschreibt die einzelnen Konfigurationsparameter im Detail. Eine Konfiguration die als Ausgangspunkt für die individuelle Konfiguration verwendet werden kann finden Sie hier.

              -

              2.2.1 Bekanntmachung der Konfigurationsdatei

              +

              2.2.1 Bekanntmachung der Konfigurationsdatei

              Die zentrale Konfigurationsdatei von MOA-ID-Configuration wird der Java Virtual Machine, in der MOA-ID-Configuration läuft, durch eine System Property mitgeteilt (wird beim Starten der Java Virtual Machine in der Form -D<name>=<wert> gemacht). Der Name der System Property lautet moa.id.webconfig als Wert der System Property ist der Pfad sowie der Name der Konfigurationsdatei im Dateisystem anzugeben, z.B.

              moa.id.configuration=C:/Programme/apache/tomcat-4.1.30/conf/moa-id/moa-id.properties

              Weitere Informationen zum Bekanntmachen der zentralen Konfigurationsdatei für MOA-ID-Auth erhalten Sie in Abschnitt 2.1.2.3 des Installationshandbuchs.

              -

              2.2.2 Konfigurationsparameter

              +

              2.2.2 Konfigurationsparameter

              Aus Gründen der Übersichtlichkeit werden die einzelnen Konfigurationsparameter in logisch zusammenhängende Blöcke unterteilt.

              -

              2.2.2.1 Allgemeine Konfigurationsparameter

              +
              2.2.2.1 Allgemeine Konfigurationsparameter

              Die folgenden Konfigurationsparameter sind optional und müssen nicht zwingend angegeben werden. Im Falle eines produktiven Betriebs von MOA-ID-Auth wird jedoch die Angabe eines Schlüssels zur verschlüsselten Speicherung der Session Daten in der Datenbank dringend empfohlen.

              -
            NameBeschreibungoptionalNameBeschreibungOptional
            Vorname
            +
            - - - + + + @@ -620,15 +621,15 @@ https://<host>:<port>/moa-id-configuration/secure/usermanagementInit
             https://<host>:<port>/moa-id-auth/MonitoringServlet

            Nach einem erfolgreichen Testdurchlauf Antwortet das Monitoring mit einen http Statuscode 200 und der oben definierten Statusmeldung aus dem Parameter configuration.monitoring.message.success. Im Falle eines Fehlers antwortet das Monitoring mit einem http Statuscode 500 und die Statusmeldung enthält eine Beschreibung des aufgetretenen Fehlers.

            -

            2.2.2.2 Externe Services

            +
            2.2.2.2 Externe Services

            Für den Aufbau von Verbindungen zu anderen Komponenten werden in manchen Fällen spezielle Client-Zertifikate oder Sicherheitseinstellungen benötigt. In diesem Abschnitt erfolgt die Konfiguration der für den Verbindungsaufbau benötigten Parameter. Die Konfiguration der URL zum jeweiligen Service wird jedoch über die Web-Oberfläche des Modules MOA-ID-Configuration vorgenommen (siehe Kapitel 3.1.7).

            -
            2.2.2.2.1 MOA-SP
            +
            2.2.2.2.1 MOA-SP

            Wird MOA-SP über ein Web-Service, welches Client Authentifizierung voraussetzt, angesprochen müssen in diesem Abschnitt die erforderlichen Schlüssel hinterlegt werden.

            -
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            configuration.moasession.key
            +
            - - - + + + @@ -647,13 +648,13 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            service.moasp.clientKeyStore

             

            -
            2.2.2.2.2 Online-Vollmachen
            +
            2.2.2.2.2 Online-Vollmachen

            MOA-ID-Auth bietet die Möglichkeit der Nutzung von Online-Vollmachten für Anwendungen aus dem öffentlichen Bereich. Hierfür ist ein Online-Vollmachten-Service nötig, wobei die Zugangsdaten zum Online-Vollmachten-Service konfiguriert werden müssen. Der Zugang zum Online-Vollmachten-Service ein Client-Zertifikat für die SSL-Verbindung zum Service. Voraussetzung dafür ist ein Zertifikat von A-Trust bzw. A-CERT mit Verwaltungseigenschaft oder Dienstleistereigenschaft. Wenn ihr MOA-ID-Auth Zertifikat diese Voraussetzung erfüllt, können Sie dieses hier angeben.

            - +
            - - - + + + @@ -672,13 +673,13 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            service.onlinemandates.clientKeyStore

             

            -
            2.2.2.2.3 Foreign Identities
            +
            2.2.2.2.3 Foreign Identities

            MOA-ID-Auth bietet die Möglichkeit der Nutzung von ausländischen Karten oder die Anmeldung ausländischer Personen mittels STORK. Hierfür ist eine Verbindung zum Stammzahlenregister-Gateway nötig, das einen entsprechenden Zugang zum Stammzahlenregister bereitstellt. Für diesen Zugriff muss das Client-Zertifikat für die SSL-Verbindung zum Gateway angegeben werden. Voraussetzung dafür ist ein Zertifikat von A-Trust bzw. A-CERT mit Verwaltungseigenschaft oder Dienstleistereigenschaft. Wenn ihr MOA-ID-Auth Zertifikat diese Voraussetzung erfüllt, können Sie dieses hier angeben.

            - +
            - - - + + + @@ -697,14 +698,14 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            service.foreignidentities.clientKeyStore

             

            -

            2.2.2.3 Protokolle

            +
            2.2.2.3 Protokolle

            MOA-ID-Auth unterstützt mehrere Authentifizierungsprotokolle. Manche dieser Protokolle benötigen Schlüssel zur Signierung von Authentifizierungsdaten oder Metadaten. In diesem Abschnitt erfolgt die Konfiguration des zu verwendeten Schlüsselmaterials.

            -
            2.2.2.3.1 PVP 2.1
            - +
            2.2.2.3.1 PVP 2.1
            +
            - - - + + + @@ -748,44 +749,44 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            protocols.pvp2.idp.ks.file

             

            -
            2.2.2.3.2 OpenID Connect
            - +
            2.2.2.3.2 OpenID Connect
            +
            - - - + + + - + - + - + - +
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            protocols.oauth20.jwt.ks.fileprotocols.oauth30.jwt.ks.file keys/moa_idp[password].p12 Dateiname des Java Keystore oder PKCS12 Keystore zur Signierung des OpenID Connect id_token
            protocols.oauth20.jwt.ks.password=protocols.oauth30.jwt.ks.password= passsword Passwort zum Keystore
            protocols.oauth20.jwt.ks.key.nameprotocols.oauth30.jwt.ks.key.name pvp_assertion Name des Schlüssels der zum Signieren des id_tokens verwendet wird
            protocols.oauth20.jwt.ks.key.passwordprotocols.oauth30.jwt.ks.key.password pasword Password des Schlüssels der zum Signieren des id_tokens verwendet wird

             

            -

            2.2.2.4 Datenbank

            +
            2.2.2.4 Datenbank

            Das Modul MOA-ID-Auth benötigt für den Betrieb zwei (optional drei) separate Datenbank Schema, welche in der Basiskonfiguration konfiguriert werden. Für Beispielkonfiguration wurde mySQL als Datenbank verwendet wodurch sich die Konfigurationsparameter auf mySQL beziehen. Das Modul MOA-ID-Auth kann jedoch auch mit Datenbanken anderer Hersteller oder einer InMemory Datenbank betrieben werden. Hierfür wird jedoch auf die Hibernate Dokumention verwiesen.

            -
            2.2.2.4.1 Konfiguration
            +
            2.2.2.4.1 Konfiguration

            Alle Parameter aus der Basiskonfiguration welche als Prefix configuration.hibernate. im Parameternamen aufweisen konfigurieren den Zugriff auf das Datenbank Schema welches die Konfiguration von MOA-ID-Auth beinhaltet. Eine Konfiguration dieser Parameter ist nicht optional.

            - +
            - - - + + + @@ -814,13 +815,13 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            configuration.hibernate.dialect

             

            -
            2.2.2.4.2 Session Informationen
            +
            2.2.2.4.2 Session Informationen

            Alle Parameter aus der Basiskonfiguration welche als Prefix moasession.hibernate. im Parameternamen aufweisen konfigurieren den Zugriff auf das Datenbank Schema in welchem MOA-ID-Auth die Session Informationen temporär ablegt. Eine Konfiguration dieser Parameter ist nicht optional.

            - +
            - - - + + + @@ -848,13 +849,13 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            moasession.hibernate.dialect Passwort für den Zugriff auf das Datenbank Schema
            -
            2.2.2.4.3 Statistikdaten
            +
            2.2.2.4.3 Statistikdaten

            Alle Parameter aus der Basiskonfiguration welche als Prefix advancedlogging.hibernate. im Parameternamen aufweisen konfigurieren den Zugriff auf das Datenbank Schema welches die Konfiguration von MOA-ID-Auth beinhaltet. Eine Konfiguration dieser Parameter ist nur erforderlich wenn configuration.advancedlogging.active auf true gesetzt wird. (siehe Kapitel 2.2.2.1)

            - +
            - - - + + + @@ -884,13 +885,13 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            advancedlogging.hibernate.dialect

             

            Die Beispielkonfiguration beinhaltet noch zusätzliche Konfigurationsparameter für den Datenbankzugriff der einzelnen Schema welche direkt aus der Beispielkonfiguration übernommen werden können. Eine detaillierte Beschreibung der einzelnen Einstellungsparameter kann der Hibernate Dokumention entnommen werden.

            -

            2.2.2.5 Testing

            +
            2.2.2.5 Testing

            Diese Parameter dienen auf Testsystemen zur Deaktivierung einzelner Verarbeitungs- oder Prüfschritte. Standardmäßig ist jeweils die sichere Variante aktiviert.

            - +
            - - - + + + @@ -905,14 +906,14 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet

            Defaultwert: true

            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            configuration.validation.certificate.QC.ignore
            -

            2.2.2.6 SZR Client für STORK <-> PVP Gateway Betrieb

            +
            2.2.2.6 SZR Client für STORK <-> PVP Gateway Betrieb

            Die Konfiguration des Stammzahlenregister (SZR) Clients ist nur erforderlich wenn das Modul MOA-ID-Auth als STORK <-> PVP Gateway betrieben wird. Da in diesem Fall die Benutzerin oder der Benutzer über ein PVP Stammportal authentifiziert wird ist eine direkte Generierung der STORK eID während des Anmeldevorgangs nicht möglich. Somit erfolgt für diese Personen einen Stammzahlenregisterabfrage zur Bestimmung der STORK eID.

            Für den in MOA-ID-Auth verwendeten SZR Client sind folgende Konfigurationsparameter erforderlich.

            - +
            - - - + + + @@ -1029,19 +1030,19 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            service.egovutil.szr.test

             

            Hinweis: Detaillierte Informationen zu den einzelnen PVP spezifischen Konfigurationsparametern finden Sie in der entsprechenden PVP Spezifikation.

            -

            2.3 Konfiguration des Loggings

            +

            2.3 Konfiguration des Loggings

            Die Module MOA-ID-Auth und MOA-ID-Configuration verwendet als Framework für Logging-Information die Open Source Software log4j. Die Konfiguration der Logging-Information erfolgt nicht direkt durch die einzelnen Module, sondern über eine eigene Konfigurationsdatei, die der Java Virtual Machine durch eine System Property mitgeteilt wird. Der Name der System Property lautet log4j.configuration; als Wert der System Property ist eine URL anzugeben, die auf die log4j-Konfigurationsdatei verweist, z.B.

            log4j.configuration=file:/C:/Programme/apache/tomcat-4.1.30/conf/moa-id/log4j.properties
            Weitere Informationen zur Konfiguration des Loggings erhalten Sie in Abschnitt 2.1.3 des Installationshandbuchs.

            -

            2.4 Konfiguration des SamlEngines

            -

            Für die Untestützung des STORK2 Protokols verwendet MOA-ID eine zusätzliche Bibliothek, die über gesonderte Dateien konfiguriert wird. Diese Dateien sind unter einem Verzeichnis gespeichert, das sich üblicherweise im MOA-ID-Auth Konfigurationsverzeichnis befindet. Der Name der System Property lautet eu.stork.samlengine.config.location; als Wert der System Property ist das Verzeichnis anzugeben, wo die entsprechende SamlEngine Konfigurationsdateien gespeichert werden, z.B.

            +

            2.4 Konfiguration des SamlEngines

            +

            F\FCr die Untest\FCtzung des STORK2 Protokols verwendet MOA-ID eine zus\E4tzliche Bibliothek, die \FCber gesonderte Dateien konfiguriert wird. Diese Dateien sind unter einem Verzeichnis gespeichert, das sich \FCblicherweise im MOA-ID-Auth Konfigurationsverzeichnis befindet. Der Name der System Property lautet eu.stork.samlengine.config.location; als Wert der System Property ist das Verzeichnis anzugeben, wo die entsprechende SamlEngine Konfigurationsdateien gespeichert werden, z.B.

            eu.stork.samlengine.config.location=file:/C:/Programme/apache/tomcat-4.1.30/conf/moa-id/conf/moa-id/stork

            Dieses Verzeichnis muss mindestens folgende Dateien enthalten:

            - +
            - - + + @@ -1049,10 +1050,10 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet - + - +
            DateiBeschreibungDateiBeschreibung
            SamlEngine.xml
            StorkSamlEngine_XXX.xmlEnthält allgemeine Konfigurationsparametern einer spezifischen Instanz des SamlEngines.Enth\E4lt allgemeine Konfigurationsparametern einer spezifischen Instanz des SamlEngines.
            SignModule_XXX.xmlEnthält Konfigurationsparametern für Trust- und Keystore einer spezifischen Instanz des SamlEngines.Enth\E4lt Konfigurationsparametern f\FCr Trust- und Keystore einer spezifischen Instanz des SamlEngines.

            @@ -1079,7 +1080,7 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet </instances>

            In diesem Beispiel ist nur eine Instanz VIDP definiert deren spezifischen Parametern in zwei Konfigurationsdateien aufgeteilt werden.

            -

            Die Datei StorkSamlEngine_VIDP.xml enthält STORK-spezifische Parameter, die im Normalbetrieb nicht geändert werden müssen. Die zweite Datei, SignModule_VIDP.xml, definiert den von der SamlEngine verwendeten Trust- und Keystore. Die Beispielkonfiguration dieser Datei sieht wie folgendes:

            +

            Die Datei StorkSamlEngine_VIDP.xml enth\E4lt STORK-spezifische Parameter, die im Normalbetrieb nicht ge\E4ndert werden müssen. Die zweite Datei, SignModule_VIDP.xml, definiert den von der SamlEngine verwendeten Trust- und Keystore. Die Beispielkonfiguration dieser Datei sieht wie folgendes:

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
            @@ -1094,52 +1095,53 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            <entry key="keystoreType">JKS</entry> </properties> -

            Diese Parameter müssen bei der Installation angepasst werden, um die Zugriff an Keystore und die Schlüssel zu ermöglichen. Die einzelne Parameter werden in folgender Tabelle erläutert:

            +

            Diese Parameter müssen bei der Installation angepasst werden, um die Zugriff an Keystore und die Schl\FCssel zu erm\F6glichen. Die einzelne Parameter werden in folgender Tabelle erläutert:

            +
            - - + + - + - + - + - + - + - +
            NameBeschreibungNameBeschreibung
            keystorePathKeystore mit Schlüssel und Zertifikaten welche für das Signieren und Verschlüsseln von STORK Nachrichten verwendet werden sollen. Keystore mit Schl\FCssel und Zertifikaten welche f\FCr das Signieren und Verschl\FCsseln von STORK Nachrichten verwendet werden sollen.
            keyStorePasswordPasswort des Keystores. Keystore soll den Schlüssel für das Signieren von Nachrichten enthalten, ebenso wie die vertrauenswürdige Zertifikate von anderen Parteien, wie z.B. ausländische PEPSes. Passwort des Keystores. Keystore soll den Schl\FCssel f\FCr das Signieren von Nachrichten enthalten, ebenso wie die vertrauensw\FCrdige Zertifikate von anderen Parteien, wie z.B. ausl\E4ndische PEPSes.
            keyPasswordPassword des Schlüssels, der für das Signieren der STORK Nachrichten verwendet werden soll.Password des Schl\FCssels, der f\FCr das Signieren der STORK Nachrichten verwendet werden soll.
            issuerIssuer des Keypairs, der für das Signieren der STORK Nachrichten verwendet werden soll.Issuer des Keypairs, der f\FCr das Signieren der STORK Nachrichten verwendet werden soll.
            serialNumberNummer des Keypairs, der für das Signieren der STORK Nachrichten verwendet werden soll.Nummer des Keypairs, der f\FCr das Signieren der STORK Nachrichten verwendet werden soll.
            keystoreTypeTyp und Format des Keystores. JKS steht für Java Key Store.Typ und Format des Keystores. JKS steht f\FCr Java Key Store.
            -

            3 Konfiguration MOA-ID-Auth

            +

            3 Konfiguration MOA-ID-Auth

            Dieser Abschnitt beschreibt die Konfiguration des Modules MOA-ID-Auth mithilfe der durch das Modul MOA-ID-Configuration zur Verfügung gestellten Web-Oberfläche. Hierzu muss das Konfigurationstool (Module MOA-ID-Konfiguration) bereits installiert und konfiguriert sein (siehe Kapitel 2.1). Nach erfolgreichem Login am Konfigurationstool kann das Modul MOA-ID-Auth über die Web-Oberfläche konfiguriert werden.

            Die Konfiguration von MOA-ID-Auth ist in zwei Teilbereiche unterteilet. Diese behandeln die Allgemeine Konfiguration der MOA-ID-Auth Instanz und die Konfiguration von Online-Applikationen (Service Providern) welche dieser MOA-ID-Auth Instanz zugeordnet sind.

            -

            3.1 - Allgemeine Konfiguration

            +

            3.1 + Allgemeine Konfiguration

            Die Allgemeine Konfiguration des Modules MOA-ID-Auth umfasst alle nicht online-applikationsspezifischen Konfigurationsparameter. Die Konfiguration dieser Parameter erfolgt über eine Web-Oberfläche, welche Eingabefelder für jeden Konfigurationsparameter zur Verfügung stellt. Jedes Eingabefeld wird validiert bevor der Konfigurationsparameter in der Datenbank gespeichert wird. Die Validierung erfolgt auf Basis des zu erwartenden Eingabewerts, wobei der erlaubte Zeichensatz für freidefinierbare textuelle Eingabefelder eingeschränkt sein kann. Detailinformationen zum erlaubten Zeichen finden Sie bei der jeweiligen Beschreibung des Konfigurationsparameters.

            Eine Änderung (Speicherung) an der allgemeinen Konfiguration wirkt sich nicht umgehend auf die zugeordnete MOA-ID-Auth Instanz aus, sondern erfolgt mit zeitlicher Verzögerung. Die zeitliche Verzögerung beträgt jedoch maximal eine Minute. Dass die geänderte MOA-ID-Auth Konfiguration in der zugeordneten Instanz geladen wurde ist durch folgende Log Meldungen erkennbar.

            INFO | 19 10:25:23,179 | ConfigurationLoader | check for new config.
            INFO | 19 10:25:23,189 | ConfigurationLoader | Read MOA-ID 2.0 configuration from database.
            INFO | 19 10:25:23,192 | ConfigurationLoader | MOA-ID 2.0 is loaded.

            Nachfolgend finden Sie die Detailbeschreibung aller allgemeinen Konfigurationsparameter.

            -

            3.1.1 Public URL Prefix

            +

            3.1.1 Public URL Prefix

            Dieser Parameter definiert den Public URL Prefix unter welchem die MOA-ID Instanz erreichbar ist. Die Konfiguration dieses Parameters ist verpflichtend.

            - +
            - - - + + + @@ -1147,13 +1149,13 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwerteBeschreibungNameBeispielwerteBeschreibung
            Public URL Prefix URL-Prefix der MOA-ID Instanz. Diese URL wird für die automatische Generierung von Formularen und Informationen verwendet und MUSS konfiguriert werden.
            -

            3.1.2 Default BKUs

            +

            3.1.2 Default BKUs

            Hiermit werden die URLs zu den Default Bürgerkartenumgebungen (BKUs) definiert die von MOA-ID-Auth für einen Anmeldevorgang verwendet werden, wenn die Bürgerkartenauswahl nicht bereits auf Seiten der Online-Applikation erfolgt ist (siehe Legacy Request) oder in der Online-Applikationskonfiguration keine BKU URLs konfiguriert wurden (siehe Kapitel 3.2.2).

            - +
            - - - + + + @@ -1171,15 +1173,15 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            Online BKU URL auf die lokale BKU Instanz
            -

            3.1.3 Security-Layer Request Templates

            +

            3.1.3 Security-Layer Request Templates

            Security-Layer (SL) Templates dienen der Kommunikation mit der gewählten Bürgerkartenumgebung. Die hier hinterlegen SL-Templates werden für die Kommunikation mit der jeweiligen BKU verwendet. Nähere Details zum Aufbau dieser SL-Templates finden Sie im Kapitel 4.3.

            Die Lage der Templates wird in Form einer URL beschrieben, wobei sowohl lokale Referenzen als der Bezug über http(s) möglich sind. Relative Pfadangaben werden dabei relativ zum Verzeichnis, in dem sich die MOA-ID-Auth Basiskonfigurationsdatei befindet, interpretiert. Bei Templates die über das Protokoll https referenziert werden, muss vor dem Start des Tomcat ein Truststore angegeben werden, das die notwendigen vertrauenswürdigen Zertifikate enthält.

            Hinweis: Diese hier definierten Templates dienen als zusätzliche WhiteList für Templates welche im „StartAuthentication“ Request mit dem Parameter „template“ übergeben werden. Sollte im „StartAuthentication“ Request der Parameter „template“ fehlen, es wurde jedoch eine „bkuURL“ übergeben, dann wird für den Authentifizierungsvorgang ein bei der Online Applikation konfiguriertes Tempalte oder als Backup das erste Template in dieser Liste verwendet. Detailinformationen zum Legacy Request finden Sie im Kapitel Protokolle.

            - +
            - - - + + + @@ -1197,13 +1199,13 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            Online BKU SL Template zur Kommunikation mit einer lokalen BKU Instanz
            -

            3.1.4 Zertifikatsprüfung

            +

            3.1.4 Zertifikatsprüfung

            Dieser Bereich behandelt die allgemeine Einstellungen zur Zertifikatsprüfung und die Konfiguration von vertrauenswürdigen Zertifikaten.

            - +
            - - - + + + @@ -1227,12 +1229,12 @@ Checking
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            CertStoreDirecorty ChainingMode definiert, ob bei der Zertifikatspfad-überprüfung das Kettenmodell ("chaining") oder das Modell nach PKIX RFC 3280 ("pkix") verwendet werden soll.
            -

            3.1.5 Session TimeOuts

            - +

            3.1.5 Session TimeOuts

            +
            - - - + + + @@ -1255,14 +1257,14 @@ Checking
            NameBeispielwert [sec]BeschreibungNameBeispielwert [sec]Beschreibung
            Anmeldedaten Gibt die Zeitspanne in Sekunden an, die eine Single Sign-On (SSO) Session seit dem letzten Zugriff (Anmeldevorgang) ausgehend gültig ist. Nach Ablauf dieser Zeitspanne muss sich die Benutzerin oder der Benutzer bei einer erneuten Anmeldung neu authentifizieren.
            -

            3.1.6 MOA-SP

            +

            3.1.6 MOA-SP

            Der Abschnitt MOA-SP Konfiguration enthält Parameter zur Nutzung von MOA-SP. MOA-SP wird für die Überprüfung der Signatur der Personenbindung und des AUTH-Blocks verwendet.

            MOA-SP muss entsprechend konfiguriert werden - siehe hierzu Abschnitt Konfiguration von MOA-SP. Alle Details zur Konfiguration von MOA-SP finden sie in der Distribution von MOA-SP/SS beiliegenden Dokumentation im Abschnitt 'Konfiguration'.

            - +
            - - - + + + @@ -1286,13 +1288,13 @@ CheckingHinweis: Wird kein MOA-SP Service URL angegeben so wird eine MOA-ID beiliegende Version von MOA-SP direkt über das Java-API angesprochen. In diesem Fall muss das System-Property auf die verwendete Konfigurationsdatei von MOA-SP gesetzt werden. Eine beispielhafte MOA-SP Konfigurationsdatei ist in $MOA_ID_INST_AUTH/conf/moa-spss/SampleMOASPSSConfiguration.xml enthalten.
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            Personenbindung Trustprofil
            -

            3.1.7 Externe Services

            +

            3.1.7 Externe Services

            Hiermit werden die URLs zum Online-Vollmachten Service und zum SZR-Gateway konfiguriert. Die Konfiguration der für den Zugriff benötigen Client-Zertifikate wurden bereits im Abschnitt 2.2.2.2 behandelt.

            - +
            - - - + + + @@ -1314,7 +1316,7 @@ Checking
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            Online-Vollmachten Service
            -

            3.1.8 Single-Sign On (SSO)

            +

            3.1.8 Single-Sign On (SSO)

            In der SSO Konfiguration muss angegeben werden in welchem Bereich (öffentlicher oder privatwirtschaftlicher Bereich) die MOA-ID-Auth Instanz betrieben wird. Je nach dem zu welchem Bereich die Instanz zugeordnet ist ergibt sich ein unterschiedlicher Funktionsumfang der SSO Funktionalität.

            1. Öffentlicher Bereich: Die MOA-ID-Auth Instanz ist einem öffentlichen Bereich für SSO zugeordnet. In diesem Fall können sowohl öffentlichen als auch privatwirtschaftliche Applikationen diese MOA-ID-Auth Instanz für eine Anmeldung mittels SSO Nutzen. Eine Zuordnung in den öffentlichen Bereich ist jedoch nur dann Möglich wenn mindestens eine der folgenden Anforderungen erfüllt ist. @@ -1331,11 +1333,11 @@ Checking
            2. Privatwirtschaftlicher Bereich: Die MOA-ID-Auth Instanz ist einem privatwirtschaftlichen Bereich für SSO zugeordnet, steht SSO nur eingeschränkt zur Verfügung. Da laut E-Governmentgesetz die Errechnung eines wbPK aus der Stammzahl nicht beim Auftraggeber eines privaten Bereichs durchgeführt werden darf (vgl. E-Government Gesetz §12(1).4), und deshalb an die Bürgerkartenumgebung ausgelagert werden muss. In diesem Fall sind Anmeldungen mittels SSO nur für jenen privatwirtschaftlichen Bereich möglich dem auch der SSO Bereich zugeordnet wurde.
            - +
            - - - + + + @@ -1371,13 +1373,13 @@ Checking

            Ich Max Mustermann, geboren am 01.01.1978 stimme am 05.02.2014 um 10:35 einer Anmeldung mittels Single Sign-On zu.

            NameBeispielwerteBeschreibungNameBeispielwerteBeschreibung

            SSO Service Name

            -

            3.1.8 Secure idenTity acrOss boRders linKed (STORK)

            -

            Hierbei werden allgemeine Parameter für STORK Protokoll konfiguriert.

            - +

            3.1.8 Secure idenTity acrOss boRders linKed (STORK)

            +

            Hierbei werden allgemeine Parameter f\FCr STORK Protokoll konfiguriert.

            +
            - - - + + + @@ -1387,26 +1389,26 @@ Checking - + - + - +
            NameBeispielwerteBeschreibungNameBeispielwerteBeschreibung
            Standard QAA-Level
            Country Code ESDer zweistelligen Code vom unterstützten PEPS-Staat.Der zweistelligen Code vom unterst\FCtzten PEPS-Staat.
            PEPS URL https://prespanishpeps.redsara.es/PEPS/ColleagueRequestDie Adresse von PEPS eines unterstützten PEPS-Staat.Die Adresse von PEPS eines unterst\FCtzten PEPS-Staat.
            Attributname eIdentifierDer Name des unterstützten Attributes. Die als zwingend markierte Attribute müssen im Response von dem gegenstehendem PEPS enthalten sein. Jedes Attribut wird gesondert eingetragen.
            Die Liste von vorhandenen und unterstützen Attributes ist in Konfigurationsdatei von SamlEngine (StorkSamlEngine_XXX.xml) vorhanden.
            Der Name des unterst\FCtzten Attributes. Die als zwingend markierte Attribute m\FCssen im Response von dem gegenstehendem PEPS enthalten sein. Jedes Attribut wird gesondert eingetragen.
            Die Liste von vorhandenen und unterst\FCtzen Attributes ist in Konfigurationsdatei von SamlEngine (StorkSamlEngine_XXX.xml) vorhanden.

             

            Folgende PEPS URLs stehen aktuell zur Verfügung:

            - +
            - - - + + + @@ -1456,12 +1458,12 @@ Checking
            LändercodeTestInstanzURLLändercodeTestInstanzURL
            AT

             

            Folgende Attribute müssen jedoch mindestens angefordert werden, wobei die erforderlichen Attribute je nach Anmeldeart unterschiedlich sind. Eine Liste mit weiteren möglichen Attribute finden Sie im Kapitel Protokolle oder in der STORK Spezifikation.

            - +
            - - - - + + + + @@ -1532,20 +1534,20 @@ Checking
            Namenatürliche PersonAnmeldung in VertretungBeschreibungNamenatürliche PersonAnmeldung in VertretungBeschreibung
            eIdentifier

            -

            3.1.9 Protokolle

            +

            3.1.9 Protokolle

            Hierbei handelt es ich um allgemeine Einstellungen zu den vom Modul MOA-ID-Auth unterstützen Authentifizierungsprotokollen.

            -

            3.1.10.1 Protokolle aktivieren

            +
            3.1.10.1 Protokolle aktivieren

            In diesem Abschnitt können die einzelnen von MOA-ID-Auth unterstützen Authentifizierungsprotokolle aktiviert oder deaktiviert werden. Diese Einstellung gilt für die gesamte MOA-ID-Auth Instanz.

            -

            3.1.10.2 Legacy Modus

            +
            3.1.10.2 Legacy Modus

            Ab der Version 2.0 des Modules MOA-ID-Auth wird die Bürgerkartenauswahl standardmäßig von MOA-ID-Auth bereitgestellt und erfolgt im Kontext von MOA-ID-Auth. Dem zu Folge müssen die aus MOA-ID 1.5.1 bekannten StartAuthentication Parameter (target, bkuURL, template, usemandate) nicht mehr im StartAuthentication Request übergeben werden.

            Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der Online-Applikation erfolgen muss für das jeweilige Protokoll der Legacy Modus aktiviert werden. Wird der Legacy Modus verwendet müssen jedoch die bkuURL, das Security-Layer Template und der Target mit den bei MOA-ID-Auth hinterlegten Konfigurationsparametern der Online-Applikation übereinstimmten. Detailinformationen hierzu finden Sie im Kapitel Protokolle. -

            3.1.10.3 SAML1 Konfiguration

            +
            3.1.10.3 SAML1 Konfiguration

            Die SourceID ist ein Teil des SAML1 Artifacts welches zur Abholung der SAML1 Assertion an die Online-Applikation zurückgegeben wird. Standardmäßig wird die SourceID aus der URL der jeweiligen Online-Applikation, an der die Anmeldung stattfinden, generiert. Optional kann jedoch eine SourceID für die gesamte MOA-ID-Auth Instanz vergeben werden, welche für alle Online-Applikationen verwendet wird.

            - +
            - - - + + + @@ -1554,14 +1556,14 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwerteBeschreibungNameBeispielwerteBeschreibung
            SourceID

             

            -

            3.1.10.4 PVP2.1 Konfiguration

            +
            3.1.10.4 PVP2.1 Konfiguration

            Die allgemeinen Konfigurationsparameter für das Authentifizierungsprotokoll PVP2.1 behandeln Informationen zum Betreiber der MOA-ID-Auth Instanz und zu einer Ansprechperson für diese Instanz. Diese Parameter werden in den PVP2.1 Metadaten, die von MOA-ID-Auth für Online-Applikation (Service Providern) bereitgestellt werden, eingetragen.

            -
            3.1.10.4.1 Betreiberorganisation
            - +
            3.1.10.4.1 Betreiberorganisation
            +
            - - - + + + @@ -1584,12 +1586,12 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung

            PVP Service Name

            URL zu einer Seite mit Informationen der Organisation welche die MOA-ID-Auth Instanz betreibt. Dieser Parameter wird in den Metadaten im Element md:Organization/md:OrganizationURL angezeigt.
            -
            3.1.10.4.2 Kontaktperson
            - +
            3.1.10.4.2 Kontaktperson
            +
            - - - + + + @@ -1630,19 +1632,19 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der

            Dieser Name wird in den Metadaten im Element md:ContactPersonals Attribut contactType angezeigt.

            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            Familienname
            -

            3.1.11 Security-Layer Transformationen

            +

            3.1.11 Security-Layer Transformationen

            Die Security-Layer (SL) Transformation, welche von MOA-ID-Auth für die Erstellung der Signatur des AuthBlock verwendet werden soll, muss hier angegeben werden. Über das Datei-Upload Feld kann die zu verwendende Transformation hochgeladen werden. Diese befindet sich in der MOA-ID-Auth Defaultkonfiguration im Ordner /conf/moa-id/transforms/ TransformsInfoAuthBlockTable_DE_2.0.xml.

            -

            3.2 Online Applikationen

            +

            3.2 Online Applikationen

            Die Konfiguration von Online-Applikationen erfolgt ebenfalls mit Hilfe des Moduls MOA-ID-Configuration. Es können sowohl neue Online-Applikationen erstellt als auch bestehende Online-Applikationen bearbeitet oder gelöscht werden. Der erlaubte Konfigurationsumfang hängt jedoch von Role des aktuellen Benutzers ab, wobei eine Konfiguration der gesamten Parameter nur einem Benutzer mit der Role admin möglich ist. Alle Konfigurationsfelder die nur einem Benutzer mit der Role admin zur Verfügung stehen sind gesondert gekennzeichnet.

            -

            3.2.1 Informationen zur Online-Applikation (Service Provider)

            +

            3.2.1 Informationen zur Online-Applikation (Service Provider)

            Dieser erste Abschnitt behandelt allgemeine Parameter zur Online-Applikation.

            - +
            - - - - - + + + + + @@ -1674,15 +1676,15 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Online-Applikation ist aktiviertDefiniert ob die Online-Applikation dem öffentlichen Bereich oder dem privatwirtschaftlichen Bereich (Business Service) zugeordnet ist. Ja nach Bereich sind unterschiedliche Konfigurationsparameter erforderlich.
            -

            3.2.1.1 Öffentlicher Bereich

            +
            3.2.1.1 Öffentlicher Bereich

            Wurde die Online-Applikation einem öffentlichen Bereich zugeordnet muss in weiterer Folge der zugeordnete Bereich definiert werden. Hierfür stehen folgende Parameter zur Verfügung.

            - +
            - - - - - + + + + + @@ -1717,7 +1719,7 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der -

            3.2.1.2 Privatwirtschaftlicher Bereich

            +
            3.2.1.2 Privatwirtschaftlicher Bereich

            Wurde die Online-Applikation einem privatwirtschaftlichen Bereich zugeordnet muss in weiterer Folge die Stammzahl des privatwirtschaftlichen Unternehmens angegeben werden. Die Stammzahl des öffentlichen Bereichs muss mit dem entsprechenden Prefix des Bereichs angegeben werden, wobei der Prefix aus einer vorgegebenen Liste gewählt werden muss.

            • FN: Die Stammzahl ist eine Firmenbuchnummer. (Beispiel: FN468924i)
            • @@ -1725,13 +1727,13 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            • ERSB: Die Stammzahl ist einer Kennzahl aus dem Ergänzungsregister für sonstige Betroffene (ERsB) (Beispiel: ERSB1425367879)
            • STORK: Ländercode dem der Service Provider zugeordnet werden kann. Wird für die Ableitung des STORK-eIdentifiers verwendet.
            -
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Bereich (Target)
            +
            - - - - - + + + + + @@ -1745,15 +1747,15 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwerteAdminOptionalBeschreibungNameBeispielwerteAdminOptionalBeschreibung
            Identifikationsnummer
            -

            3.2.2 BKU Konfiguration

            +

            3.2.2 BKU Konfiguration

            Dieser Abschnitt behandelt online-applikationsspezifische Einstellungen zum Anmeldeprozess. Diese Einstellungen stehen jedoch nur einer Benutzerin oder einem Benutzer mit der Role admin zur Verfügung.

            - +
            - - - - - + + + + + @@ -1807,15 +1809,15 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Online BKUDieses Feld erlaubt die Konfiguration eines online-applikationsspezifischen Templates für die zusätzliche Anmeldeabfrage im Falle einer Single Sign-On Anmeldung. Dieses Template muss in die Konfiguration hochgeladen werden und muss die Mindestanforderungen aus Kapitel 4.2 umsetzen. Da diese Templates direkt in den Authentifizierungsprozess eingreifen und diese somit eine potentielle Angriffsstelle für Cross-Site Scripting (XSS) bieten wird die Verwendung von online-applikationsspezifischen Templates nicht empfohlen.
            -

            3.2.3 Test Identitäten

            +

            3.2.3 Test Identitäten

            In diesem Abschnitt können für diese Online-Applikation Testidentitäten erlaubt werden. Diese Testidentitäten können auch bei produktiven Instanzen freigeschalten werden, da die Unterschiedung zwischen Produkt- und Testidentität anhand einer speziellen OID im Signaturzertifikat der Testidentität getroffen wird. Folgende Konfigurationsparameter stehen hierfür zur Verfügung.

            - +
            - - - - - + + + + + @@ -1835,15 +1837,15 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Testidentitäten erlauben

             

            Hinweis: Diese Funktionalität steht jedoch nur Testidentitäten welchen bereits mit einer Test OID im Signaturzertifikat ausgestattet sind zur Verfügung.

            -

            3.2.4 Vollmachten

            +

            3.2.4 Vollmachten

            Dieser Abschnitt behandelt online-applikationsspezifische Einstellungen zur Anmeldung mittels Online-Vollmachen.

            - +
            - - - - - + + + + + @@ -1869,15 +1871,15 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Vollmachten (ja/nein)

             

            Hinweis: Werden für die Online-Applikation eigene Templates für die Bürgerkartenauswahl oder die zusätzliche Anmeldeabfrage im SSO Fall (siehe Abschnitt 3.2.2) verwendet, stehen alle Konfigurationsparameter die Einfluss auf die BKU-Auswahl haben nicht zur Verfügung. Die Funktionalität der entsprechenden Parameter hat jedoch weiterhin Einfluss auf den Anmeldevorgang.

            -

            3.2.5 Single Sign-On (SSO)

            +

            3.2.5 Single Sign-On (SSO)

            Dieser Abschnitt behandelt online-applikationsspezifische Einstellungen zu Single Sign-On

            - +
            - - - - - + + + + + @@ -1896,14 +1898,14 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der

            Hinweis: Diese Abfrage ist standardmäßig aktiviert und kann nur durch einen Benutzer mit der Role admin deaktiviert werden.

            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Single Sign-On verwenden
            -

            3.2.6 Secure idenTity acrOss boRders linKed (STORK)

            +

            3.2.6 Secure idenTity acrOss boRders linKed (STORK)

            Dieser Abschnitt behandelt Online-Applikationsspezifische Einstellungen zu STORK.

            - +
            - - - - + + + + @@ -1934,18 +1936,18 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung
            STORK verwenden

             

            Hinweis: Werden für die Online-Applikation eigene Templates für die Bürgerkartenauswahl oder die zusätzliche Anmeldeabfrage im SSO Fall (siehe Abschnitt 3.2.2) verwendet, stehen alle Konfigurationsparameter die Einfluss auf die BKU-Auswahl haben nicht zur Verfügung.

            -

            3.2.7 Authentifizierungsprotokolle

            +

            3.2.7 Authentifizierungsprotokolle

            Dieser Abschnitt behandelt online-applikationsspezifische Einstellungen zu den von der Online-Applikation unterstützen Authentifizierungsprotokollen. Eine Verwendung aller zur Verfügung stehender Authentifizierungsprotokolle durch die Online-Applikation ist ebenfalls möglich. Hierfür müssen nur alle benötigten Protokolle konfiguriert werden. Nähere Informationen zu den unterstützten Protokollen finden sie im Kapitel Protokolle.

            Aus Gründen der Übersichtlichkeit kann der Konfigurationsbereich für jeden Protokoll, in der Web-Oberfläche des Konfigurationstools, ein- oder ausgeblendet werden.

            -

            3.2.7.1 SAML1

            +
            3.2.7.1 SAML1

            Für das Protokoll SAML1 stehen folgende Konfigurationsparameter zur Verfügung.

            - +
            - - - - - + + + + + @@ -1992,15 +1994,15 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            SAML1 aktivieren

             

            Hinweis: Das Modul MOA-ID-Auth in der Version 2.0 unterstützt SAML1 nur mehr zur Abwärtskompatibilität mit bereits bestehenden Online-Applikationen. Wir empfehlen den Umstieg auf ein anderes, von MOA-ID-Auth unterstütztes, Authentifizierungsprotokoll. Aus diesem Grund steht die Konfiguration des SAML1 Protokolls nur mehr einer Benutzerin oder einem Benutzer mit der Role admin zur Verfügung.

            -

            3.2.7.2 PVP 2.1

            +
            3.2.7.2 PVP 2.1

            In diesem Bereich erfolgt die applikationsspezifische Konfiguration für das Authentifizierungsprotokoll PVP 2.1.

            - +
            - - - - - + + + + + @@ -2015,7 +2017,7 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der +

            Hinweis: Metadaten k\F6nnen nur \FCber http oder https bezogen werden. Das Laden von Metadaten aus dem lokalen Verzeichnissystem ist nicht m\F6glich.

            @@ -2033,15 +2035,15 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Neu Laden    URL unter der die MOA-ID-Auth Instanz die Metadaten der Online-Applikation beziehen kann. Diese Metadaten müssen durch die Online-Applikation signiert sein. Für den Fall das die Metadaten über https abgeholt werden, muss das jeweilige Serverzertifikat zur Zertifikatsprüfung im TrustStore der MOA-ID-Auth Instanz hinterlegt sein. Die Metadaten werden anschließend durch MOA-ID-Auth innerhalb des in den Metadaten angegebenen Gültigkeitszeitraums automatisch aktualisiert. Das Aktualisierungsintervall bei automatischer Aktualisierung beträgt jedoch mindestens 15 Minuten jedoch nicht mehr als 24 Stunden. (Intervall: 15min < Aktualisierungszeitpunkt < 24 Stunden) -

            Hinweis: Metadaten können nur über http oder https bezogen werden. Das Laden von Metadaten aus dem lokalen Verzeichnissystem ist nicht möglich.

            Infos zum ZertifikatZertifikat mit dem die Metadaten der Online-Applikation signiert sind. Dieses wird benötigt um die Metadaten zu verifizieren.
            -

            3.2.7.3 OpenID Connect

            +
            3.2.7.3 OpenID Connect

            In diesem Bereich erfolgt die applikationsspezifische Konfiguration für OpenID Connect (OAuth 2.0).

            - +
            - - - - - + + + + + @@ -2065,17 +2067,17 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID 1.5.1 im Kontext der
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            Client IDOpenID Connect Redirect URL. Nach erfolgreicher Authentifizierung wird die Benutzerin oder der Benutzer an diese URL zurückgeleitet.
            -

            3.2.8 Zusätzliche allgemeine Einstellungen

            -

            In Abschnitt ermöglicht eine erweiterte online-applikationsspezifische Individualisierung des AuthBlocks und der Bürgerkartenauswahl. - Die Individualisierung des AuthBlocks steht jedoch dann zur Verfügung wenn die dem Module MOA-ID-Auth beigelegte Security-Layer Transformation verwendet wird oder +

            3.2.8 Zusätzliche allgemeine Einstellungen
            +

            In Abschnitt erm\F6glicht eine erweiterte online-applikationsspezifische Individualisierung des AuthBlocks und der B\FCrgerkartenauswahl. + Die Individualisierung des AuthBlocks steht jedoch dann zur Verf\FCgung wenn die dem Module MOA-ID-Auth beigelegte Security-Layer Transformation verwendet wird oder wenn die individuelle Security-Layer Transformation den Formvorschriften der Spezifikation entspricht.

            - +
            - - - - - + + + + + @@ -2097,71 +2099,71 @@ wenn die individuelle Security-Layer Transformation den Formvorschriften der Sp - +
            NameBeispielwertAdminOptionalBeschreibungNameBeispielwertAdminOptionalBeschreibung
            AuthblockText    XWird diese Option gewählt wird im AuthBlock, welcher im Anmeldevorgang signiert wird, keine bPK oder wbPK dargestellt.Wird diese Option gew\E4hlt wird im AuthBlock, welcher im Anmeldevorgang signiert wird, keine bPK oder wbPK dargestellt.
            -

            3.2.8.1 Login-Fenster Konfiguration

            -

            Diese Konfigurationsparameter bieten zusätzliche Einstellungen für eine Anpassung der Bürgerkartenauswahl welche von MOA-ID-Auth generiert wird. +

            3.2.8.1 Login-Fenster Konfiguration
            +

            Diese Konfigurationsparameter bieten zus\E4tzliche Einstellungen f\FCr eine Anpassung der B\FCrgerkartenauswahl welche von MOA-ID-Auth generiert wird. Zur besseren Handhabung werden die angegebenen Parameter direkt in einer Vorschau dargestellt. -Alle in diesem Abschnitt angegebenen Parameter sind Optional und werden bei Bedarf durch Standardwerte ergänzt. +Alle in diesem Abschnitt angegebenen Parameter sind Optional und werden bei Bedarf durch Standardwerte erg\E4nzt.

            - +
            - - - - - + + + + + - + - + - + - + - + - + - + - + - - + - + @@ -2175,27 +2177,27 @@ Alle in diesem Abschnitt angegebenen Parameter sind Optional und werden bei Beda - + - +
            NameBeispielwertBKU-AuswahlSL-TemplateBeschreibungNameBeispielwertBKU-AuswahlSL-TemplateBeschreibung
            Hintergrundfarbe #E5E5E5 X XHintergrundfarbe der Bürgerkartenauswahl und Hintergrundfarbe des Java-Applets der Online-BKU (wird über den Security-Layer Request angegeben). Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.Hintergrundfarbe der B\FCrgerkartenauswahl und Hintergrundfarbe des Java-Applets der Online-BKU (wird über den Security-Layer Request angegeben). Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.
            Vordergrundfarbe #E5E5E5 X  Vordergrundfarbe (Textfarbe) der Bürgerkartenauswahl. Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.Vordergrundfarbe (Textfarbe) der B\FCrgerkartenauswahl. Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.
            Hintergrundfarbe ÜberschriftHintergrundfarbe \DCberschrift #E5E5E5 X  Hintergrundfarbe der Überschrift der Bürgerkartenauswahl. Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.Hintergrundfarbe der \DCberschrift der B\FCrgerkartenauswahl. Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.
            Vordergrundfarbe ÜberschriftVordergrundfarbe \DCberschrift #E5E5E5 X  Vordergrundfarbe (Textfarbe) der Überschrift der Bürgerkartenauswahl. Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.Vordergrundfarbe (Textfarbe) der \DCberschrift der B\FCrgerkartenauswahl. Die Angabe der Farbe erfolgt als RGB Wert in hexadezimaler Form.
            Überschriftstext\DCberschriftstext Anmeldung X  Die hier angegebene Zeichenkette wird als Überschrift in der Bürgerkartenauswahl dargestellt. Es sind jedoch nur Buchstaben, Zahlen und Satzzeichen erlaubt.Die hier angegebene Zeichenkette wird als \DCberschrift in der B\FCrgerkartenauswahl dargestellt. Es sind jedoch nur Buchstaben, Zahlen und Satzzeichen erlaubt.
            Targetparameter     XMit diesem Parameter kann der Redirect-Target welcher im Security-Layer Request an die BKU übergeben wird definiert werden. Die möglichen Parameter sind äquivalent zum + Mit diesem Parameter kann der Redirect-Target welcher im Security-Layer Request an die BKU \FCbergeben wird definiert werden. Die m\F6glichen Parameter sind \E4quivalent zum html Attribut target (siehe Kapitel 4.3).
            ApplethöheAppleth\F6he 220   XMit diesem Parameter kann die Höhe des Java-Applets der Online-BKU definiert werden. Dieser Parameter überschreibt einen in der BKU-Auswahl übergebenen Parameter (siehe Kapitel 3.4.1).Mit diesem Parameter kann die H\F6he des Java-Applets der Online-BKU definiert werden. Dieser Parameter überschreibt einen in der BKU-Auswahl übergebenen Parameter (siehe Kapitel 3.4.1).
            Appletbreite  X  Dieses Feld erlaubt die Auswahl der gewünschten Schriftart, welche für die BKU-Auswahl verwendet werden soll. Es kann jedoch nur eine Schriftart gewählt werden.Dieses Feld erlaubt die Auswahl der gew\FCnschten Schriftart, welche f\FCr die BKU-Auswahl verwendet werden soll. Es kann jedoch nur eine Schriftart gew\E4hlt werden.
            Formularschrifttyp (Textfeld)   X  Dieses Textfeld erlaubt die Konfiguration eine Liste von Schriftarten, welche für die BKU-Auswahl verwendet werden soll. - Die Angabe erfolgt mittels einer durch "," getrennten Liste, äquivalent zur Schriftartendefinition laut HTML SpezifikationDieses Textfeld erlaubt die Konfiguration eine Liste von Schriftarten, welche f\FCr die BKU-Auswahl verwendet werden soll. + Die Angabe erfolgt mittels einer durch "," getrennten Liste, \E4quivalent zur Schriftartendefinition laut HTML Spezifikation

             

            -

            Hinweis: Bei Verwendung einer online-applikationsspezifischen Bürgerkartenauswahl stehen alle Parameter die die Bürgerkartenauswahl betreffen nicht zur Verfügung.

            -

            Hinweis: Bei Verwendung eines online-applikationsspezifischen Security-Layer-Request Templates stehen alle Parameter die das SL-Template betreffen nicht zur Verfügung.

            -

            3.2.8.2 Fremd-bPK Konfiguration

            +

            Hinweis: Bei Verwendung einer online-applikationsspezifischen B\FCrgerkartenauswahl stehen alle Parameter die die B\FCrgerkartenauswahl betreffen nicht zur Verf\FCgung.

            +

            Hinweis: Bei Verwendung eines online-applikationsspezifischen Security-Layer-Request Templates stehen alle Parameter die das SL-Template betreffen nicht zur Verf\FCgung.

            +
            3.2.8.2 Fremd-bPK Konfiguration

            Dieser Konfigurationsparameter ermöglicht die Konfiguration eines Key Stores, welcher im Falle einer Anmeldung mittels Single Sign-On Interfederation zur Entschlüsselung einer verschlüsselten Fremd-bPK verwendet werden soll. Hierfür sind folgende Konfigurationsparameter notwenig.

            - +
            - - - + + + @@ -2220,18 +2222,18 @@ Alle in diesem Abschnitt angegebenen Parameter sind Optional und werden bei Beda
            NameBeispielwertBeschreibungNameBeispielwertBeschreibung
            KeyStore hochladen

             

            Hinweis: Diese Konfiguration ist jedoch nur nötig wenn die für das Modul MOA-ID-Auth Interfederation verwendet und von weiteren Identity Providern in der Federation Fremd-bPKs übermittelt werden welche bereits im Modul MOA-ID-Auth entschlüsselt werden sollen (z.B. bei Verwendung von SAML 1 als Authentifizierungsprotokoll). Bei Verwendung von PVP 2.1 und OpenID Connect kann die Fremd-bPK auch direkt an die Online Applikation weitergeben werden wodurch eine Entschlüsselung auf Seiten des Modules MOA-ID-Auth nicht zwingend notwendig ist.

            -

            3.3 Import / Export

            -

            Über diese Funktionalität besteht die Möglichkeit eine bestehende MOA-ID 1.5.1 -Konfiguration in MOA-ID 2.0 zu importieren. Zusätzlich besteht die Möglichkeit eine MOA-ID-Auth 2.0 +

            3.3 Import / Export

            +

            \DCber diese Funktionalit\E4t besteht die M\F6glichkeit eine bestehende MOA-ID 1.5.1 +Konfiguration in MOA-ID 2.0 zu importieren. Zus\E4tzlich besteht die M\F6glichkeit eine MOA-ID-Auth 2.0 Konfiguration in ein XML Dokument zu exportieren oder in eine bestehende MOA-ID-Auth 2.0 XML Konfiguration zu importieren. Eine exportierte MOA-ID-Auth 2.0 XML-Konfiguration kann auch direkt zur Konfiguration des Modules MOA-ID-Auth herangezogen werden (siehe Kapitel 2.2.2.1)

            Hinweis: Zu beachten ist, dass bei einem Import die aktuell vorhandene - Konfiguration vollständig gelöscht und durch die importierte Konfiguration ersetzt wird. + Konfiguration vollst\E4ndig gel\F6scht und durch die importierte Konfiguration ersetzt wird. Es wird empfohlen ein Backup einer eventuell vorhandenen MOA-ID 2.0 Konfiguration - zu erstellen, bevor eine neue Konfiguration importiert wird. Hierfür kann die + zu erstellen, bevor eine neue Konfiguration importiert wird. Hierf\FCr kann die Exportfunktion verwendet werden.

            -

            3.3.1 Import alter Konfigurationen (<= MOA-ID 1.5.1)

            +

            3.3.1 Import alter Konfigurationen (<= MOA-ID 1.5.1)

            Es besteht auch die Möglichkeit eine bestehende MOA-ID 1.5.1 Konfiguration zu importieren. Da nicht alle neuen Konfigurationsparameter automatisiert aus der MOA-ID 1.5.1 Konfiguration erstellt werden sind für den Importvorgang mehrere Schritte notwendig.

            1. Importieren einer bestehenden MOA-ID 1.5.1 Konfiguration mithilfe der Import Funktion des Modules MOA-ID-Configuration. Danach sollten sowohl die allgemeine Konfiguration als auch die Online-Applikationen eingetragen sein.
            2. @@ -2257,16 +2259,16 @@ Exportfunktion verwendet werden.

            4 Templates

            Dieser Abschnitt spezifiziert den Mindestaufbau der Templates für die BKU Auswahl, die Single Sign-On Anmeldeabfrage und die Security-Layer Request Templates welche vo Module MOA-ID-Auth verwendet werden. Alle hier beschriebenen Templates werden durch MOA-ID-Auth geladen, erweitert und gegeben falls der Benutzerin oder dem Benutzer im Web-Browser dargestellt. Um einen korrekten Anmeldeprozess zu gewährleisten müssen diese Templates mindestens folgende Formvorschriften und Strukturen aufweisen.

            -

            4.1 Bürgerkartenauswahl

            +

            4.1 B\FCrgerkartenauswahl

            Das BKU Template dient im Anmeldeprozess der Auswahl der gewünschten Bürgerkatenumgebung oder Handysignatur. Nach erfolgter Auswahl durch die Benutzer oder dem Benutzer wird diese an MOA-ID-Auth übermittelt.

            Hinweis: In der Datei ./htmlTemplates/loginFormFull.html welcher sich relativ zur MOA-ID-Auth Konfigurationsdatei befindet finden Sie das Standard Template welches für den Anmeldevorgang verwendet wird, wenn kein online-applikationsspezifisches Template hinterlegt wurde. Dieses Standard Template unterstützt Responsive Design und passt sich somit in einem weiten Bereich an die aktuelle Fenstergröße an.

            Für die Übermittlung an MOA-ID-Auth ist ein http GET Request vorgesehen welcher folgende Parameter unterstützt. Die URL dieses http GET Request wird automatisiert über den Parameter „#AUTH_URL#“ (ohne „“) eingetragen und muss nicht manuell hinterlegt werden. Folgende http GET Parameter werden für die BKU-Auswahl akzeptiert.

            - +
            - - - - + + + + @@ -2313,11 +2315,11 @@ Exportfunktion verwendet werden.

            NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung
            bkuURI


            Einige dieser Parameter werden jedoch nicht durch den Benutzer oder dem Service-Provider sondern durch das Modul MOA-ID-Auth im Rahmen des Anmeldeprozesses automatisiert, an im Template gekennzeichneten Stellen, eingetragen. Folgende Platzhalter stehen zur Verfügung und werden von MOA-ID-Auth durch die jeweiligen Werte ersetzt. Alle nicht als Optional gekennzeichneten Platzhalter müssen durch MOA-ID-Auth ersetzt werden.

            - +
            - - - + + + @@ -2356,17 +2358,17 @@ Einige dieser Parameter werden jedoch nicht durch den Benutzer oder dem Service </form>

            Als Beispiel für ein BKU-Auswahl Template steht auch das bei MOA-ID-Auth hinterlegte Standardtemplate zur Verfügung. Dieses finden Sie hier.

            -

            4.2 Single Sign-On Anmeldeabfrage

            +

            4.2 Single Sign-On Anmeldeabfrage

            Das Send-Assertion Template dient im Falle einer Anmeldung mittels Single Sign-On der Abfrage ob die Anmeldedaten an die betreffende Online Applikation übertragen werden dürfen.

            Hinweis: In der Datei ./htmlTemplates/sendAssertionFormFull.html welcher sich relativ zur MOA-ID-Auth Konfigurationsdatei befindet finden Sie das Standard Template welches für den Anmeldevorgang verwendet wird, wenn kein online-applikationsspezifisches Template hinterlegt wurde. Dieses Standard Template unterstützt Responsive Design und passt sich somit in einem weiten Bereich an die aktuelle Fenstergröße an.

            Ähnlich dem Template für die Bürgerkartenauswahl müssen auch hierbei Formvorschriften und Strukturen im Aufbau des Templates eingehalten werden.
            Für die Übermittlung an das Modul MOA-ID-Auth ist ein http POST Request vorgesehen welcher folgende Parameter unterstützt. Die URL, an welche dieser http POST Request gesendet werden muss, wird automatisiert über den Parameter „#URL#“ (ohne „“) eingetragen und muss nicht manuell hinterlegt werden.

            -
            NameOptionalBeschreibungNameOptionalBeschreibung
            #AUTH_URL#
            +
            - - - - + + + + @@ -2395,11 +2397,11 @@ Für die Übermittlung an das Modul MOA-ID-Auth ist ein http POST Reques
            NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung
            mod


            Einige dieser Parameter werden jedoch nicht durch den Benutzer oder dem Service-Provider sondern durch das Modul MOA-ID-Auth im Rahmen des Anmeldeprozesses automatisiert, an im Template gekennzeichneten Stellen, eingetragen. Folgende Platzhalter stehen zur Verfügung und werden von MOA-ID-Auth durch die jeweiligen Werte ersetzt. Alle nicht als Optional gekennzeichneten Platzhalter müssen durch MOA-ID-Auth ersetzt werden.

            - +
            - - - + + + @@ -2424,15 +2426,15 @@ Einige dieser Parameter werden jedoch nicht durch den Benutzer oder dem Service
            NameOptionalBeschreibungNameOptionalBeschreibung
            #URL#


            Die nachfolgende Form zeigt ein Beispiel für den Aufbau des im BKU-Auswahl Template zu verwendeten http GET Request Templates für die lokale BKU.

            -
            <form method="post"  id="moaidform_yes" action="#URL#">
            -     <input type="hidden" name="value" value="true">
            -     <input type="hidden" name="mod" value="#MODUL#">
            -     <input type="hidden" name="action" value="#ACTION#">
            -     <input type="hidden" name="identifier" value="#ID#">
            -     <input type="submit" size="400" value="Ja">
            +
            <form method="post"  id="moaidform_yes" action="#URL#">
            +  <input type="hidden" name="value"  value="true">
            +  <input type="hidden" name="mod"  value="#MODUL#">
            +  <input type="hidden" name="action"  value="#ACTION#">
            +  <input type="hidden" name="identifier"  value="#ID#">
            +  <input type="submit" size="400"  value="Ja">
             </form>

            Als Beispiel für ein Single Sign-On Anmeldeabfrage Template steht auch das bei MOA-ID-Auth hinterlegte Standardtemplate zur Verfügung. Dieses finden Sie hier.

            -

            4.3 Security-Layer Request

            +

            4.3 Security-Layer Request

            Das Security-Layer (SL) Request Template dient zur Kommunikation zwischen dem Modul MOA-ID-Auth und der gewählten Bürgerkartenumgebung. Diese Kommunikation erfolgt über ein http Formular welches als http POST Request an die Bürgerkartenumgebung gesendet wird. Bei MOA-ID-Auth werden SL Templates mitgeliefert, wobei einige Template Parameter auch über das Konfigurationstool je Online-Applikation angepasst werden können (siehe Kapitel 3.2.7.1).

            Für den Fall das individuelle Anpassungen am SL Template erforderlich sind müssen diese folgende Formvorschriften erfüllen.

            <form name="CustomizedForm" action="<BKU>" method="post">
            @@ -2443,11 +2445,11 @@ Die nachfolgende Form zeigt ein Beispiel für den Aufbau des im  BKU-Auswahl
             </form>
             

            Innerhalb dieser <form>-Elemente können Texte, Beschriftungen und Styles modifiziert werden, und es können zusätzliche Elemente darin aufgenommen werden. Die vorgegebene Grundstruktur ist aber in jedem Fall einzuhalten, und es müssen die speziellen Tags <BKU> (kommt 2x vor), <XMLRequest>, <DataURL> darin enthalten sein.

            - +
            - - - + + + @@ -2467,11 +2469,11 @@ Die nachfolgende Form zeigt ein Beispiel für den Aufbau des im BKU-Auswahl
            NameOptionalBeschreibungNameOptionalBeschreibung
            <BKU>

             

            Folgende zusätzliche Tags zur Layout Anpassung (siehe Kapitel 3.2.7.1) stehen optional zur Verfügung und können über das SL Template an die Bürgerkartenumgebung übergeben werden. Ein Beispiel für die Verwendung dieser zusätzlichen Tags finden Sie im beigelegten SL Template.

            - +
            - - - + + + @@ -2496,22 +2498,22 @@ Die nachfolgende Form zeigt ein Beispiel für den Aufbau des im BKU-Auswahl
            NameOptionalBeschreibungNameOptionalBeschreibung
            <REDIRECTTARGET>

             

            Hinweis: Das in MOA-ID 1.5.1 verwendete Security-Layer Template ist kompatibel zu dem in MOA-ID 2.0 verwendeten Security-Layer Template. Jedoch stehen bei dem Template aus MOA-ID 1.5.1 die zusätzlichen Parameter zur Konfiguration mittels Konfigurationstool nicht zur Verfügung.

            -

            5 Konfiguration von MOA-SP

            +

            5 Konfiguration von MOA-SP

            MOA-ID überprüft die Signaturen der Personenbindung und des AUTH-Blocks mit dem VerifyXMLSignatureRequest von MOA-SP. Dazu muss MOA-SP wie unten beschreiben konfiguriert werden.

            - VerifyTransformsInfoProfile
            + VerifyTransformsInfoProfile
            Der Request zum Überprüfen der Signatur des AUTH-Blocks verwendet ein vordefiniertes VerifyTransformsInfoProfile. Die im Request verwendete Profil-ID wird in der MOA-ID-Auth Konfiguration im Parameter Authentfizierungsblock Transformationen definiert. Entsprechend muss am MOA-SP Server ein VerifyTransformsInfoProfile mit gleichlautender ID definiert werden. Die Profiledefinition selbst ist in der Auslieferung von MOA-ID in $MOA_ID_INST_AUTH/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_2.0.xml enthalten. Diese Profildefinition muss unverändert übernommen werden.

            TrustProfile
            Die Requests zur Überprüfung der Signatur verwenden vordefinierte TrustProfile. Die im Request verwendete Profil-IDs werden in der MOA-ID-Auth Konfiguration in den Parametern Personenbindung Trustprofil und Authentfizierungsblock Trustprofil definiert. Diese beiden Elemente können unterschiedliche oder identische TrustProfileIDs enthalten. Am MOA-SP Server müssen TrustProfile mit gleichlautender ID definiert werden. Die Auslieferung von MOA-ID enthält das Verzeichnis $MOA_ID_INST_AUTH/conf/moa-spss/trustprofiles/MOAIDBuergerkarteRoot, das als TrustProfile verwendet werden kann. Weitere Zertifikate können als vertrauenswürdig hinzugefügt werden.

            Certstore
            Zum Aufbau eines Zertifikatspfades können benötigte Zertifikate aus einem Zertifikatsspeicher verwendet werden. Die Auslieferung von MOA-ID enthält das Verzeichnis $MOA_ID_INST_AUTH/conf/moa-spss/certstore, das als initialer Zertifikatsspeicher verwendet werden kann.

            Hinweis: Mit dem Wechsel auf Version 1.3 verwendet MOA SP/SS ein neues Format für die XML-Konfigurationsdatei. Für die Konvertierung einer älteren Konfigurationsdatei auf das neue Format steht Ihnen ein Tool zur Verfügung. Details dazu finden sie in der der Distribution von MOA-SP/SS beiliegenden Dokumentation im Kapitel 'Konfiguration', Abschnitt 1.2.1.

            -

            6 Tomcat Security Manager

            +

            6 Tomcat Security Manager

            Apache Tomcat bietet die Möglichkeit den Server unter einem Security Manager zu betreiben. Damit ist es möglich den lokalen Dateizugriff zu beschränken. Mit Hilfe der Datei "catalina.policy" können so Zugriffe auf lokale Dateien und Verzeichnisse festgelegt werden. Eine beispielhafte catalina.policy Datei finden Sie im Verzeichnis $MOA_ID_INST_AUTH/tomcat. Diese Datei wurde unter Apache Tomcat 4.1.31, 5.0.28 und 5.5.27 getestet.

            Mehr Informationen zum Security Manager entnehmen Sie bitte der entsprechenden Apache Tomcat Dokumentation.

             

            -

            A Referenzierte Spezifikation

            - +

            A Referenzierte Spezifikation

            +
            @@ -2549,5 +2551,6 @@ Zum Aufbau eines Zertifikatspfades können benötigte Zertifikate aus ei
            Spezifikation

             

             

            +
        diff --git a/id/server/doc/handbook/index.html b/id/server/doc/handbook/index.html index c3b25b390..d1b01a55d 100644 --- a/id/server/doc/handbook/index.html +++ b/id/server/doc/handbook/index.html @@ -2,21 +2,34 @@ + MOA ID - Übersicht - + + + +
        +
        + +

        MOA-ID-AUTH

        +
        +
        +
        + +
        +

        Übersicht zur Dokumentation der Version 2.1.2

        +
        Einführung
        Übersicht über die einzelnen Module.
        @@ -36,5 +49,6 @@
         
        +
        diff --git a/id/server/doc/handbook/install/install.html b/id/server/doc/handbook/install/install.html index 3b1a7e905..fb3239dfb 100644 --- a/id/server/doc/handbook/install/install.html +++ b/id/server/doc/handbook/install/install.html @@ -2,26 +2,22 @@ + MOA-ID - Installation -< - - - - - - -
        Logo BKADokumentation 
        -
        -

        MOA-ID (Identifikation)

        -

        Installation

        -
        -

        Inhalt

        -
          -
        1. -

          ÜbersichtLogo EGIZ

          -
        2. + +
          +
          + +

          MOA-ID-AUTH

          +
          +
          +
          +
          +

          Installation

          +

          Inhalt

          +
          1. MOA-ID-Auth und MOA-ID-Configuration

              @@ -77,17 +73,16 @@
          -
            +
            1. Referenzierte Software
            -
            -

            1 Übersicht

            +

            1 Übersicht

            Die Module MOA-ID-Auth und MOA-ID-Configuration sind als plattformunabhängige Module ausgelegt. MOA-ID-Auth bietet Webservices über HTTPS zur Identifizierung und Authentifizierung an. Das Modul MOA-ID-Configuration stellt eine Weboberfläche zur Konfiguration des MOA-ID-Auth Modules zur Verfügung.

            Dieses Handbuch beschreibt die Installation der beiden Module.

            -

            2 MOA-ID-Auth und MOA-ID-Configuration

            +

            2 MOA-ID-Auth und MOA-ID-Configuration

            Dieser Abschnitt beschreibt die Installation von der Module MOA-ID-Auth und MOA-ID-Configuration. Im ersten Unterkapitel wird eine minimale Basisinstallation beschrieben. Das zweite Unterkapitel zeigt eine Reihe von optionalen Erweiterungsmöglichkeiten auf.

            -

            2.1 Basisinstallation

            -

            2.1.1 Einführung

            +

            2.1 Basisinstallation

            +

            2.1.1 Einführung

            Die Basisinstallation der Module MOA-ID-Auth und MOA-ID-Configuration stellt einerseits die minimalen Anforderungen für den Betrieb von MOA-ID dar, andererseits dient sie als Ausgangspunkt für optionale Erweiterungsmöglichkeiten.

            Die Mindestanforderungen für die Basisinstallation sind:

            In diesem Betriebs-Szenario wird das MOA-ID-Auth Webservice und das MOA-ID Konfigurationstool in Tomcat zum Einsatz gebracht. Beide Module können sowohl in derselben Tomcat-Instanz, als auch in separaten Tomcat-Instanzen betrieben werden. Für den Fall des separaten Betriebs muss die Installation auf beiden Tomcat-Instanzen ausgeführt werden. In beiden Fällen fungiert der Tomcat gleichzeitig als HTTP- und HTTPS-Endpunkt für beide Module. Beide Protokolle werden direkt in Tomcat konfiguriert, wobei MOA-ID-Auth und MOA-ID-Configuration Log4j als Logging Toolkit verwenden.

            -

            2.1.2 Installation

            -

            2.1.2.1 Vorbereitung

            +

            2.1.2 Installation

            +
            2.1.2.1 Vorbereitung

            Die folgenden Schritte dienen der Vorbereitung der Installation.

            Installation von Java SE
            @@ -121,11 +116,11 @@
            Für den Betrieb von MOA-ID 2.0 wird eine Datenbank benötigt, wobei mySQL als Datenbank empfohlen wird (wurde mit mySQL getestet). Der Einsatz eines alternativen Datenbanksystems ist jedoch ebenfalls möglich. Für den Betrieb werden mindestens zwei getrennte Datenbank Schema benötig, da die Konfiguration und die Session Informationen getrennt abgelegt werden. Erstellen Sie zwei Datenbank Schemas welche von MOA-ID-Auth verwendet werden sollen. Deren Namen können z.B. auf moa-id-session für Sessiondaten und moa-id-config für die Konfiguration lauten. Beliebige andere Namen für die Datenbank Schema sind jedoch auch möglich.
            -

            2.1.2.2 Konfiguration von Apache Tomcat

            +
            2.1.2.2 Konfiguration von Apache Tomcat

            Die zentrale Konfigurations-Datei von Tomcat ist $CATALINA_HOME/conf/server.xml. Tomcat wird grundsätzlich mit einer funktionierenden Default-Konfiguration ausgeliefert.

            -
            2.1.2.2.1 Konfiguration des HTTP Connectors
            +
            2.1.2.2.1 Konfiguration des HTTP Connectors

            Die Tomcat Default-Konfiguration schaltet ausschließlich den Connector für HTTP auf Port 8080 frei. Wir empfehlen diese Konfiguration nur für Fälle, in denen das MOA-ID-Configuration Modul in einer abgeschlossenen Netzwerkumgebung betrieben wird. Das Modul MOA-ID-Auth verlangt für Authentifizierungsanfragen zwingend HTTPS.

            -
            2.1.2.2.2 Konfiguration des HTTPS Connectors
            +
            2.1.2.2.2 Konfiguration des HTTPS Connectors

            Für den sicheren Betrieb von MOA-ID-AUTH ist die Verwendung von SSL Voraussetzung, sofern nicht ein vorgelagerter Webserver (Apache oder IIS) das SSL-Handling übernimmt. Ebenso kann SSL auch für MOA-ID-Configuration verwendet werden.

            Für die dazu notwendige Konfiguration kann die im vorigen Abschnitt besprochene minimale Tomcat-Konfiguration als Ausgangspunkt verwendet werden: Zunächst ist der HTTP Connector abzuschalten (auskommentieren). Anschließend ist der HTTPS Connector zu konfigurieren. Das Dokument Tomcat SSL Configuration HOW-TO gibt einen guten Überblick dazu. Grob zusammengefasst sind folgende Schritte durchzuführen:

              @@ -134,7 +129,7 @@
            • Falls eine Client-Authentisierung gewünscht ist, muss die Konfiguration des SSL-Connectors in $CATALINA_HOME/conf/server.xml angepasst werden.

            Die Konfiguration des HTTPS Connectors kann entfallen, wenn Tomcat ein Webserver vorgeschaltet ist, und dieser die SSL-Kommunikation mit dem Kunden übernimmt (siehe Abschnitt 2.2.1).

            -
            2.1.2.3 Einsatz des Moduls MOA-ID-Auth in Tomcat
            +
            2.1.2.3 Einsatz des Moduls MOA-ID-Auth in Tomcat

            Um die Module MOA-ID-Auth und MOA-ID-Configuration in Tomcat für den Einsatz vorzubereiten, sind folgende Schritte notwendig:

            • Die Datei $MOA_ID_AUTH_INST/moa-id_auth.war enthält das einsatzfertige MOA-ID-Auth Webarchiv und muss ins Verzeichnis $CATALINA_HOME/webapps kopiert werden. Dort wird sie beim ersten Start von Tomcat automatisch ins Verzeichnis $CATALINA_HOME/webapps/moa-id-auth entpackt.
            • @@ -153,7 +148,7 @@
            -
            2.1.2.4 Einsatz des Moduls MOA-ID-Configuration in Tomcat
            +
            2.1.2.4 Einsatz des Moduls MOA-ID-Configuration in Tomcat
            • Die Datei $MOA_ID_AUTH_INST/moa-id_configuration.war enthält das einsatzfertige MOA-ID-Configuration Webarchiv und muss ins Verzeichnis $CATALINA_HOME/webapps kopiert werden. Dort wird sie beim ersten Start von Tomcat automatisch ins Verzeichnis $CATALINA_HOME/webapps/moa-id-configuration entpackt.
            • Die Konfigurationsdatei mit der Basiskonfiguration für MOA-ID-Auth und die zugehörigen Verzeichnisse müssen in ein beliebiges Verzeichnis im Dateisystem kopiert werden (z.B. $CATALINA_HOME/conf/moa-id-configuration). Eine funktionsfähige Konfiguration, die als Ausgangspunkt für die Basiskonfiguration des MOA-ID-Auth Modules dienen kann, finden Sie hier.
              @@ -169,18 +164,18 @@
            -

            2.1.2.4 Starten und Stoppen von Tomcat

            -
            2.1.2.4.1 Unter Windows
            +
            2.1.2.4 Starten und Stoppen von Tomcat
            +
            2.1.2.4.1 Unter Windows

            Das Verzeichnis $MOA_IA_AUTH_INST/tomcat/win32 enthält Script-Dateien zum Starten und Stoppen von Tomcat. Vor der erstmaligen Verwendung der Scripts müssen in den ersten Zeilen die Umgebungsvariablen JAVA_HOME (Basisverzeichnis der eingesetzten Java SE) und CATALINA_HOME (Basisverzeichnis der eingesetzten Tomcat-Installation) angepasst werden. Evtl. müssen Sie auch noch die in den Script-Dateien gesetzten, in Abschnitt 2.1.2.3 besprochenen System Properties anpassen.

            -
            2.1.2.4.2 Unter Unix
            +
            2.1.2.4.2 Unter Unix

            Zunächst müssen die in Abschnitt 2.1.2.3 besprochenen System Properties mit Hilfe der Umgebungsvariablen CATALINA_OPTS gesetzt sein. Die Datei $MOA_ID_AUTH_INST/tomcat/unix/moa-env.sh enthält ein Beispiel dafür. Des Weiteren müssen noch die Umgebungsvariablen JAVA_HOME (Basisverzeichnis der eingesetzten Java SE) und CATALINA_HOME (Basisverzeichnis der eingesetzten Tomcat-Installation) angepasst werden.

            Nun kann Tomcat aus seinem Basisverzeichnis mit

            bin/catalina.sh start
            gestartet werden. Das Stoppen von Tomcat erfolgt analog mit
            bin/catalina.sh stop
            -
            2.1.2.4.3 Prüfen des erfolgreichen Starts
            +
            2.1.2.4.3 Prüfen des erfolgreichen Starts

            Ein erfolgreicher Start des MOA-ID-Auth Modules ist an folgender Log-Meldung ersichtlich:

            @@ -200,7 +195,7 @@ http://<host>:<port>/moa-id-configuration/ https://<host>:<port>/moa-id-auth/ https://<host>:<port>/moa-id-configuration/

            Die Verfügbarkeit des Services können Sie einfach überprüfen, indem Sie die Endpunkte mit einem Web-Browser aufgerufen; dies sollte nach erfolgreichem Start zur Anzeige einer Informationsseite führen.

            -

            2.1.3 Logging

            +
            2.1.3 Logging

            Beide Module verwenden Log4j für die Ausgabe von Log-Meldungen am Bildschirm bzw. in Log-Dateien. Log4j bietet zahlreiche Konfigurationsmöglichkeiten, die ausführlich im Log4j Handbuch beschrieben sind. Unter anderem gibt es die Möglichkeit, folgende Einstellungen vorzunehmen:

            • @@ -227,7 +222,7 @@ https://<host>:<port>/moa-id-configuration/

            Eine für beide Module passende Konfigurationsdatei für Log4j finden Sie hier. Wird diese Datei als Logging-Konfiguration verwendet, so werden alle Log-Meldungen sowohl in die Konsole, als auch in die Dateien moa-id-auth.log und moa-id-configuration.log geschrieben.

            -

            2.1.3.1 Format der Log-Meldungen

            +
            2.1.3.1 Format der Log-Meldungen

            Anhand einer konkreten Log-Meldung wird das Format der MOA SP/SS Log-Meldungen erläutert:

             INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=node1 
            @@ -254,7 +249,7 @@ INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=node1
                 

            Der nächste Wert 01 21:25:26,540 gibt den Zeitpunkt an, zu dem die Log-Meldung generiert wurde (in diesem Fall den 1. Tag im aktuellen Monat, sowie die genaue Uhrzeit).

            Der Wert Thread-3 bezeichnet den Thread, von dem die Anfrage bearbeitet wird.

            Der Rest der Zeile einer Log-Meldung ist der eigentliche Text, mit dem das System bestimmte Informationen anzeigt. Im Fehlerfall ist häufig ein Java Stack-Trace angefügt, der eine genauere Ursachen-Forschung ermöglicht.

            -

            2.1.3.2 Wichtige Log-Meldungen

            +
            2.1.3.2 Wichtige Log-Meldungen

            Neben den im Abschnitt 2.1.2.4.3 beschriebenen Log-Meldungen, die anzeigen, ob das Service ordnungsgemäß gestartet wurde, geben nachfolgenden Log-Meldungen Aufschluss über die Abarbeitung von Anfragen.

            Die Entgegennahme einer Anfrage wird angezeigt durch: @@ -267,32 +262,32 @@ INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=node1

            In diesem Fall gibt der mitgeloggte Stacktrace Auskunft über die Art des Fehlers.

            Die tatsächlich übertragenen Anfragen bzw. Antworten werden aus Effizienzgründen nur im Log-Level DEBUG angezeigt.

            -

            2.2 Erweiterungsmöglichkeiten

            +

            2.2 Erweiterungsmöglichkeiten

            Ausgehend von der Basisinstallation können die optionalen Erweiterungen, die in den nachfolgenden Abschnitten beschrieben werden, unabhängig und in beliebiger Kombination aufgesetzt werden.

            -

            2.2.1 Vorgeschalteter Webserver

            -

            2.2.1.1 Microsoft Internet Information Server (MS IIS)

            +

            2.2.1 Vorgeschalteter Webserver

            +
            2.2.1.1 Microsoft Internet Information Server (MS IIS)

            Den MOA SP/SS Webservices kann optional ein MS IIS vorgeschaltet sein. In diesem Fall übernimmt der MS IIS die HTTP- bzw. HTTPS-Kommunikation mit dem Aufrufer des Webservices. Die Kommunikation zwischen MS IIS und dem in Tomcat eingerichteten MOA-ID Modulen wird durch mod_jk durchgeführt. Die angeführten Konfigurationsschritte gehen von einer MS IIS Standard-Installation aus.

            -
            2.2.1.1.1 Konfiguration von mod_jk im MS IIS
            +
            2.2.1.1.1 Konfiguration von mod_jk im MS IIS

            Für die Kommunikation des MS IIS mit dem im Tomcat eingerichteten MOA SP/SS Webservice wird das ISAPI-Modul von mod_jk im MS IIS installiert und konfiguriert. Eine detaillierte Installations- und Konfigurationsanleitung gibt das mod_jk IIS HowTo. Beispiele für workers.properties und uriworkermap.properties Dateien liegen im Verzeichnis $MOA_ID_AUTH_INST/tomcat bei.

            -
            2.2.1.1.2 Konfiguration von Tomcat
            +
            2.2.1.1.2 Konfiguration von Tomcat

            Damit Tomcat die Aufrufe entgegennehmen kann, die von MS IIS mittels mod_jk weiterleitet werden, muss in $CATALINA_HOME/conf/server.xml der AJP Connector aktiviert werden. Im Gegenzug können die Konnektoren für HTTP und HTTPS deaktiviert werden. Das geschieht am einfachsten durch Ein- bzw. Auskommentieren der entsprechenden Connector Konfigurations-Elemente in dieser Datei.

            -
            2.2.1.1.3 Konfiguration von SSL
            +
            2.2.1.1.3 Konfiguration von SSL

            Die Dokumentation zum Einrichten von SSL auf dem MS IIS steht nach Installation des IIS unter http://localhost/iisHelp/ oder aber auch auf den Webseiten von Mircrosoft zur Verfügung.

            -

            2.2.1.2 Apache

            +
            2.2.1.2 Apache

            Den MOA SP/SS Webservices kann ein Apache Webserver vorgeschaltet sein. Das Prinzip funktioniert wie bei MS IIS, auch hier wird mod_jk für die Kommunikation zwischen Webserver und Tomcat eingesetzt. Die angeführten Konfigurationsschritte gehen von einer Standard-Installation des Apache Webservers aus.

            -
            2.2.1.2.1 Konfiguration von mod_jk im Apache
            +
            2.2.1.2.1 Konfiguration von mod_jk im Apache

            Um die MOA-ID Module hinter einem Apache Webserver zu betreiben, ist die Konfiguration des Apache-Moduls mod_jk erforderlich. Eine detaillierte Installations- und Konfigurationsanleitung gibt das mod_jk Apache HowTo. Ein Beispiel für eine workers.properties Datei liegt im Verzeichnis $MOA_ID_AUTH_INST/tomcat bei.

            Um die MOA-ID Module dem Apache Webserver bekannt zu machen, sind zumindest folgende Einträge im globalen Kontext der Apache-Konfigurationsdatei notwendig:

            LoadModule jk_module /usr/lib/apache/mod_jk.so
            AddModule jk_module
            JkOptions +ForwardKeySize +ForwardURICompat -ForwardDirectories
            JkWorkersFile conf/workers.properties
            JkMount /moa-spss/* moaworker

            Die Pfad- und Dateinamen können je nach existierender Apache Installation geringfügig variieren.

            -
            2.2.1.2.2 Konfiguration von Tomcat
            +
            2.2.1.2.2 Konfiguration von Tomcat

            Die Konfiguration von Tomcat ist analog zu Abschnitt 2.2.1.1.2 durchzuführen.

            -
            2.2.1.2.2 Konfiguration von SSL mit mod_SSL
            +
            2.2.1.2.2 Konfiguration von SSL mit mod_SSL

            Apache kann in Verbindung mit mod_SSL als SSL-Endpunkt für die MOA-ID Module fungieren. In diesem Fall entfällt die SSL-Konfiguration in Tomcat, da Apache und Tomcat auch im Fall von SSL Daten via mod_jk austauschen. Eine detaillierte Installations- und Konfigurationsanleitung enthält die Online-Dokumentation von mod_SSL.

            Bei der Verwendung von Client-Authentisierung muss darauf geachtet werden, dass mod_ssl die HTTP-Header mit den Informationen über das Client-Zertifikat exportiert. Dies wird durch Angabe der folgenden Option in der Apache-Konfiguration erreicht:

            SSLOptions +ExportCertData +StdEnvVars

            Je nach vorhandener SSL-Konfiguration des Apache Webservers kann diese Option im globalen Kontext, im Kontext des Virtual Hosts oder im Kontext eines Verzeichnisses spezifiziert werden.

            -

            A Referenzierte Software

            +

            A Referenzierte Software

            Auf folgende Software-Pakete wird in diesem Handbuch verwiesen:

            @@ -312,6 +307,6 @@ INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=node1
            Logging Framework
            - +
          diff --git a/id/server/doc/handbook/interfederation/interfederation.html b/id/server/doc/handbook/interfederation/interfederation.html index f52556e23..4c6804ef0 100644 --- a/id/server/doc/handbook/interfederation/interfederation.html +++ b/id/server/doc/handbook/interfederation/interfederation.html @@ -2,23 +2,22 @@ + MOA-ID - Protokolle - - - - - - -
          Logo BKADokumentationLogo EGIZ
          -
          -

          MOA-ID (Identifikation)

          -

          Interfederation

          -
          -

          Inhalt

          -
            +
            +
            + +

            MOA-ID-AUTH

            +
            +
            +
            +
            +

            Interfederation

            +

            Inhalt

            +
            1. Allgemeines
              1. Sequenzdiagramm
              2. @@ -40,9 +39,9 @@
              3. STORK <-> PVP Gateway

               

              -

              1 Allgemeines

              +

              1 Allgemeines

              Ab der Version 2.1.0 des Modulpakets MOA-ID unterstützt das Modul MOA-ID-Auth Single Sign-On Interfederation zwischen Instanzen des Modules MOA-ID-Auth, welche bei unterschiedlichen Service Providern betrieben werden. Die nachfolgende Abbildung zeigt das Blockdiagramm einer solchen Systemkonfiguration und beschreibt die Funktionalität auf einer abstrakten Ebene.

              -

              Blockdiagramm MOA-ID Inderfederation

              +
              Blockdiagramm MOA-ID Inderfederation
              1. Eine Benutzerin oder ein Benutzer möchte sich an einer Online Applikation (Applikation 1) oder einem Service Portal anmelden.
              2. Für den Anmeldevorgang wird die Benutzerin oder der Benutzer an den IdentityProvider (MOA-ID IDP 1) welcher die Identifizierung und Authentifizierung durchführt und eine Single Sign-On (SSO) Session anlegt.
              3. @@ -52,9 +51,9 @@
              4. IDP 2 holt von IDP 1 die Authentifizierungsinformationen für Applikation 2 ab. Für die Kommunikation zwischen den beiden IDPs wird PVP 2.1 als Protokoll verwendet. Sollte am IDP 1 keine aktive SSO Session für diesen Benutzer existieren wird eine lokale Authentifizierung der Benutzerin oder des Benutzer an IDP 2 gestartet.
              5. Anschließend wird die Benutzerin oder der Benutzer an Applikation 2 zurückgeleitet und befindet sich im angemeldeten Bereich der Applikation 2.
              -

              1.1 Sequenzdiagramm

              +

              1.1 Sequenzdiagramm

              Das nachfolgende Sequenzdiagramm beschreibt den Ablauf eines Anmeldevorgangs an einer Online Applikation mit Hilfe von Interfederation im Detail wobei in diesem Beispiel als Authentifizierungsprotokoll an der Online Applikation 2 PVP 2.1 und die Variante mit Redirect Servlet verwendet werden. Eine Verwendung aller anderen, durch das Modul MOA-ID-Auth bereitgestellten Authentifizierungsprotokolle ist jedoch ebenfalls möglich. Aus Gründen der Übersichtlichkeit sind die Schritte 1 - 3 aus dem oben dargestellten Blockdiagramm im Sequenzdiagramm nicht berücksichtigt, da diese Schritte bereits im Kapitel Protokolle im Detail beschrieben wurden.

              -

              SSO Interfederation Sequenze

              +
              SSO Interfederation Sequenze

               

              1. Die Benutzerin oder der Benutzer ist bereits an einer Online Applikation (Application 1) angemeldet und möchte sich nun an einer zweiten Online Applikation (Application 2) mittels Single Sign On anmelden. Nach dem Click auf die entsprechende Login Schaltfläche wird der Anmeldevorgang gestartet.
              2. @@ -84,21 +83,21 @@
              3. Online Applikation 2 validiert die Assertion
              4. Wurde die Validierung der Assertion positiv abgeschlossen wird der Benutzer im sicheren Bereich von Online Applikation zwei angemeldet.
              -

              2 Konfiguration

              +

              2 Konfiguration

              Die Konfiguration des Modules MOA-ID-Auth in einer IDP Interfederation ist in zwei Abschnitte unterteilt. Der erste Teil behandelt die Basiskonfiguration des Modules MOA-ID-Auth. Im zweiten Abschnitt erfolgt die Konfiguration der einzelnen IDP Instanzen welche von dieser MOA-ID-Auth verwendet werden können oder in einem IDP interfederation Verbund stehen.

              Bei IDP Interfederation handelt es sich um eine Erweiterung der Funktionalität des Modules MOA-ID-Auth. Die in diesem Abschnitt beschriebene Konfiguration bezieht sich speziell auf den Bereich Interfederation, ersetzt jedoch nicht die Konfiguration des Modules MOA-ID-Auth laut Kapitel Konfiguration.

              -

              2.1 Basiskonfiguration

              +

              2.1 Basiskonfiguration

              Wird das Modul MOA-ID-Auth in einer IDP Interfederation betrieben muss das PVP 2.1 Protokoll, in der Basiskonfiguration von MOA-ID-Auth konfiguriert werden. Eine Beschreibung der entsprechenden Konfigurationsparameter finden Sie im Kapitel Protokolle -> PVP 2.1.

              -

              2.2 Konfiguration einzelner IDPs

              +

              2.2 Konfiguration einzelner IDPs

              Zusätzlich zu Basiskonfiguration müssen alle für diese IDP Interfederation registrierten IDPs konfiguriert werden. Diese Konfiguration erfolgt über das Modul MOA-ID-Configuration wobei für Interfederation ein eigener Menüpunkt im Hauptmenü zur Verfügung steht. Über diesen Konfigurationspunkt können neue IDPs hinzugefügt (MOA-ID IDP hinzufügen) oder bestehende IDPs bearbeitet werden wobei alle aktuell hinterlegten IDPs in einer Liste dargestellt werden.

              Die Konfiguration der einzelnen IDP Instanzen erfolgt ähnlich zur Konfiguration von Online-Applikationen (siehe Online-Applikationskonfiguration), jedoch sind für eine IDP Konfiguration nicht alle Konfigurationsparameter aus der Online-Applikationskonfiguration erforderlich.

              Im ersten Abschnitt werden allgemeine Informationen zum IDP konfiguriert.

              - +
              - - - - + + + + @@ -128,12 +127,12 @@
              NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung
              Online-Applikation ist aktiviert

               

              Der zweite Abschnitt behandelt spezielle Konfigurationsparameter für IDP Interfederation.

              - +
              - - - - + + + + @@ -185,13 +184,13 @@ -

              3 Integration in bestehende Systeme

              +

              3 Integration in bestehende Systeme

              Um den Interfederation Mechanismus in ein bestehendes System zu integrieren muss dem protokollspezifischen Authentifizierungsrequest, welcher da das Modul MOA-ID-Auth gesendet wird, ein zusätzlicher Parameter angefügt werden. Dieser Parameter identifiziert den interfederation IDP von welchem eine aktive SSO Session verwendet werden soll. Dieser zusätzliche Parameter kann als http GET oder als http POST Parameter an MOA-ID-Auth übertragen werden.

              -
              NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung
              Eingehendes SSO erlauben
              +
              - - - + + + @@ -202,7 +201,7 @@
              NameBeispielwertBeschreibungNameBeispielwertBeschreibung
              interIDP

               

              Wie bereits im Abschnitt Sequenzdiagramm erwähnt stehen für die Übertragung des zusätzlichen Parameters zwei Varianten zur Verfügung.

              -

              3.1 Direkte Übermittlung im Authentifizierungsrequest

              +

              3.1 Direkte Übermittlung im Authentifizierungsrequest

              Bei dieser Variante wird der zusätzliche Parameter interIDP direkt im protokollspezifischen Authentifizierungsrequest, welcher den Authentifizierungsvorgang startet, angefügt. In diesem Fall muss der Service Provider, welcher den Authentifizierungsrequest erzeugt, den zusätzlichen Parameter interIDP einfügen. Diese Variante steht für alle verfügbaren Authentifizierungsvarianten des Modules MOA-ID-Auth zur Verfügung und es existieren keine besonderen Einschränkungen. Das nachfolgende Beispiel zeigt die Verwendung in Kombination mit SAML 1 wobei der interIDP Parameter als http GET Parameter übermittelt wird.

              <a href="https://<moa-id-server-und-pfad>/StartAuthentication
                 ?Target=<geschäftsbereich>  
              @@ -210,13 +209,13 @@
               	&bkuURI=<bku-url>
                 &interIDP=<IDP EntityID>
               >
              -

              3.2 Verwendung des Redirect Servlets

              +

              3.2 Verwendung des Redirect Servlets

              Bei dieser Variante wird der zusätzliche Parameter interIDP und eine Redirect-URL redirecturl an ein Service der MOA-ID-Auth Instanz übermittelt. Dieses Service validiert alle Parameter und hinterlegt den Parameter interIDP in einem http Cookie im Browser der Benutzerin oder des Benutzers. Anschließend erfolgt ein Redirect an die im Parameter redirecturl angegebene Service welches den eigentlichen Authentifizierungsrequest erzeugt und an die MOA-ID-Auth Instanz sendet. In diesem Fall ist es nicht erforderlich dass der Authentifizierungsrequest den zusätzlichen Parameter interIDP enthält, da dieser über das zuvor gesetzte http Cookie vom Modul MOA-ID-Auth ausgewertet wird.

              - +
              - - - + + + @@ -232,15 +231,15 @@
              NameBeispielwertBeschreibungNameBeispielwertBeschreibung
              interIDP

               

              -

              4 STORK VIDP Konfiguration

              +

              4 STORK VIDP Konfiguration

              Das Modul MOA-ID-Auth kann auch als STORK2 VIDP betrieben werden. Diese VIDP Konfiguration erfolgt ebenfalls über den Menüpunkt Interfederation, wobei neues VIDPs mit Hilfe der Schaltfläche VIDP hinzufügen konfiguriert werden können.

              Die Konfiguration eines VIDPs erfolgt weitgehend identisch zur Konfiguration einer Online-Applikation, wobei im Falle eines VIDPs noch folgende zusätzliche Konfigurationsparameter zur Verfügung stehen.

              - +
              - - - - + + + + @@ -260,10 +259,10 @@ Diese Attributprovider werden für die Abholung einiger Attribute von österreichischen Bürgern benötigt (Anmeldung in Ausland). Die Eintragung und Auswahl von Attributprovidern ist optional.

              Während des Anmeldevorgangs wird der Benutzer an den entsprechenden Attributprovider weitergeleitet. Am Attributprovider werden die erforderlichen Attribute ausgewählt und zurück an VIDP (am Service Provider) geliefert.


              -
              NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung

              VIDP Interface aktiv

              +
              - - + + @@ -293,11 +292,11 @@
              Name des PluginsBeschreibungName des PluginsBeschreibung
              EHvdAttributeProvider

               

              Beispiel eines Eintrages für Attributprovider:

              -
              
              +
              - - - + + + @@ -306,10 +305,10 @@
              AP PluginURLAttributeAP PluginURLAttribute
              MISAttributeRequestProvider

               

              -

              5 STORK <-> PVP Gateway

              +

              5 STORK <-> PVP Gateway

              Das Modul MOA-ID-Auth kann auch als Gateway zwischen dem Portalverbund der österreichischen Behörden und der STORK Infrastruktur betrieben werden. Diese Konfiguration konfiguriert einen Gateway welcher zur Authentifizierung österreichischer Benutzerinnen oder Benutzer im Falle einer STORK Anmeldung mit Hilfe der österreichischen PVP Infrastruktur dient. Der Einsprung zum Gateway erfolgt über den PVPAuthenticationProvider in der VIDP Konfiguration.

              Die nachstehende Grafik skizziert den Prozessfluss eines solchen Anmeldevorgangs.

              -

              Blockdiagramm STORK-PVP Gateway

              +
              Blockdiagramm STORK-PVP Gateway
              1. Eine österreichische Benutzerin oder ein österreichischer Benutzer möchte sich an einer europäischen Online Applikation (Applikation 1) anmelden.
              2. Die Benutzerin oder der Benutzer wird an den entsprechenden VIDP unter Verwendung des STORK Protokolls zur Authentifizierung weitergeleitet. Für den Fall das spezielle Attribute durch die Applikation angefordert wurden (z.B. ECApplicationRole) kann die Authentifizierung nicht am VIDP vorgenommen werden. In diesem Fall erfolgt eine Weiterleitung an den nationalen STORK-PVP Gateway (siehe VIDP Konfiguration).
              3. @@ -322,12 +321,12 @@

               

              Die Konfiguration eines STORK-PVP Gateways besteht aus folgenden Elementen.

              - +
              - - - - + + + + @@ -357,12 +356,13 @@
              NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung
              Online-Applikation ist aktiviert

               

              - +
              +
              - - - - + + + + @@ -374,7 +374,7 @@
              NameBeispielwertOptionalBeschreibungNameBeispielwertOptionalBeschreibung
              EntityID des PVP Portals:

               

               

              -

              A Referenzierte Spezifikation

              +

              A Referenzierte Spezifikation

              @@ -411,5 +411,6 @@
              +
            diff --git a/id/server/doc/handbook/intro/intro.html b/id/server/doc/handbook/intro/intro.html index f2af77391..2b4a3c2a8 100644 --- a/id/server/doc/handbook/intro/intro.html +++ b/id/server/doc/handbook/intro/intro.html @@ -2,66 +2,66 @@ + MOA-ID - Einführung - - - - - - -
            Logo BKADokumentationLogo EGIZ
            -
            -

            MOA-ID (Identifikation)

            -

            Einführung

            -
            -

            Inhalt

            -
              -
            1. Allgemeines -
                +
                +
                + +

                MOA-ID-AUTH

                +
                +
                +
                + +
                +

                Einführung

                +

                Inhalt

                +
              +
            2. -
            3. MOA-ID-Auth -
                +
              1. MOA-ID-Auth +
              +
            4. -
            5. MOA-ID-Configuration
            6. -
            -
            -

            1 Allgemeines

            +
          1. MOA-ID-Configuration
          2. + +

            1 Allgemeines

            Das Module MOA-ID-Auth kann von Anwendungen zur Identifizierung und Authentifizierung im Rahmen eines Anmeldeprozesses an einer Online-Applikation verwendet werden. Die Konfiguration des Modules MOA-ID-Auth erfolgt mit Hilfe des Zusatzmodules MOA-ID-Configuration welches eine web-basierte Konfigurationsschnittstelle zur Verfügung stellt.

            Das nachfolgende Blockdiagramm zeigt Struktur von MOA-ID und gibt eine kurze Beschreibung der einzelnen Komponenten.

            -

            Architektur MOA-ID

            -

             

            +
            +

            Architektur MOA-ID

            +

            MOA-ID besteht aus folgenden Kernkomponenten:

              -
            1. CORE LOGIC: Diese Komponente ist die zentrale Logik zur Steuerung der einzelnen Prozesse innerhalb MOA-ID 2.x.
            2. -
            3. Protocol Adapter: Stellt die in MOA-ID 2.x unterstützten Authentifizierungsprotokolle für die Anbindung von Service Providern zur Verfügung.
            4. -
            5. Auth Sources: Stellt die von MOA-ID 2.x unterstützten Identifikationsmechanismen und Single Sign-On Management Funktionen zur Verfügung. Dies sind die österreichische Bürgerkarte oder Handy-Signatur, die Anmeldung ausländischer Personen mit Hilfe des STORK Protokoll oder mittels Single Sign-On von einem weiteren vertrauenswürdigen Identity Provider (Interfederation). Dieses Modul beinhaltet somit alle jene Funktionen welche für den Authentifizierungs- oder Abmeldeprocess erforderlich sind.
            6. -
            7. Template Generator: Der Template Generator erzeugt für Service Provider die entsprechenden Login-Masken für die Integration in die eigene Web-Applikation.
            8. -
            9. SSO Module: Das Single Sign-On (SSO) Modul verwaltet die zusätzlichen Operationen die sich aus der Umsetzung von SSO ergeben. Dies umfasst im Besonderen das SSO Session-Management.
            10. -
            11. Statistic Module: Dieses Modul dient zur Generierung von anonymisierten Statistikdaten aus den Anmeldeinformationen.
            12. -
            13. Monitoring & Testing Module: Dieses Modul implementiert Methoden mit deren Hilfe einzelne funktionale Bereiche aus MOA-ID-Auth getestet werden können. Somit dient dieses Modul als Schnittstellte zu einem externen Monitoring-Service.
            14. -
            15. Configuration Modul: Dieses Modul stellt die Schnittstelle zur MOA-ID-Auth Konfiguration dar welche in einer Datenbank abgelegt wird.
            16. -
            17. Konfigurationstool: Oberfläche, mit deren Hilfe MOA-ID konfiguriert werden kann. Dies umfasst sowohl allgemeine Konfigurationsteile als auch die Konfiguration der einzelnen bei MOA-ID-Auth registrierten Online-Applikationen. Service Provider können sich am Konfigurationstool mittels Bürgerkarte oder Handy-Signatur anmelden und ihre Online-Applikationen verwalten.
            18. +
            19. CORE LOGIC: Diese Komponente ist die zentrale Logik zur Steuerung der einzelnen Prozesse innerhalb MOA-ID 2.x.
            20. +
            21. Protocol Adapter: Stellt die in MOA-ID 2.x unterstützten Authentifizierungsprotokolle für die Anbindung von Service Providern zur Verfügung.
            22. +
            23. Auth Sources: Stellt die von MOA-ID 2.x unterstützten Identifikationsmechanismen und Single Sign-On Management Funktionen zur Verfügung. Dies sind die österreichische Bürgerkarte oder Handy-Signatur, die Anmeldung ausländischer Personen mit Hilfe des STORK Protokoll oder mittels Single Sign-On von einem weiteren vertrauenswürdigen Identity Provider (Interfederation). Dieses Modul beinhaltet somit alle jene Funktionen welche für den Authentifizierungs- oder Abmeldeprocess erforderlich sind.
            24. +
            25. Template Generator: Der Template Generator erzeugt für Service Provider die entsprechenden Login-Masken für die Integration in die eigene Web-Applikation.
            26. +
            27. SSO Module: Das Single Sign-On (SSO) Modul verwaltet die zusätzlichen Operationen die sich aus der Umsetzung von SSO ergeben. Dies umfasst im Besonderen das SSO Session-Management.
            28. +
            29. Statistic Module: Dieses Modul dient zur Generierung von anonymisierten Statistikdaten aus den Anmeldeinformationen.
            30. +
            31. Monitoring & Testing Module: Dieses Modul implementiert Methoden mit deren Hilfe einzelne funktionale Bereiche aus MOA-ID-Auth getestet werden können. Somit dient dieses Modul als Schnittstellte zu einem externen Monitoring-Service.
            32. +
            33. Configuration Modul: Dieses Modul stellt die Schnittstelle zur MOA-ID-Auth Konfiguration dar welche in einer Datenbank abgelegt wird.
            34. +
            35. Konfigurationstool: Oberfläche, mit deren Hilfe MOA-ID konfiguriert werden kann. Dies umfasst sowohl allgemeine Konfigurationsteile als auch die Konfiguration der einzelnen bei MOA-ID-Auth registrierten Online-Applikationen. Service Provider können sich am Konfigurationstool mittels Bürgerkarte oder Handy-Signatur anmelden und ihre Online-Applikationen verwalten.
            -

            1.1 Externe Services

            +

            1.1 Externe Services

            Für die Anmeldung in Vertretung und die Anmeldung ausländischer Personen werden zusätzliche externe Services verwendet.

            -

            1.1.1 Online-Vollmachten

            +

            1.1.1 Online-Vollmachten

            Ab der MOA-ID Release 1.5.0 werden Online-Vollmachten (für Anwendungen aus dem öffentlichen Bereich) unterstützt. Hierzu werden diese Vollmachten über ein Online-Vollmachten-Service ausgewählt. Der Zugang zu diesem Online-Vollmachten Service ist über eine Client-Server Authentifizierung abgesichert. Als Client-Zertifikate werden Zertifikate der Firmen A-Trust bzw. A-CERT, die mit der Verwaltungs- oder Dienstleistereigenschaft versehen sind, akzeptiert.

            -

            1.1.2 Ausländische Bürger

            +

            1.1.2 Ausländische Bürger

            Ab der MOA-ID Release 1.4.7 ist es möglich, dass sich auch ausländische Bürger mittels MOA-ID einloggen können. Hierzu wird eine Verbindung zu einem sogenannten Stammzahlenregister-Gateway aufgebaut, dass basierend auf den Zertifikatsdaten des ausländischen Bürgers eine Eintragung im Ergänzungsregister für natürliche Personen gemäß E-Government Gesetz §6(5) vornimmt. Somit ist es möglich, dass eine Personenbindung ausgestellt werden kann, die in weitere Folge an MOA-ID weitergeleitet wird. Der Zugang zu diesem Stammzahlenregister-Gateway ist über eine Client-Server Authentifizierung abgesichert. Als Client-Zertifikate werden Zertifikate der Firmen A-Trust bzw. A-CERT, die mit der Verwaltungs- oder Dienstleistereigenschaft versehen sind, akzeptiert.

            -

            2 MOA-ID-Auth

            +

            2 MOA-ID-Auth

            Das Modul MOA-ID-Auth dient der Identifizierung und Authentifizierung im Rahmen eines Anmeldevorgangs an einer Online-Applikation. Die Identifizierung und Authentifizierung erfolgt mit Bürgerkarte, Handy-Signatur oder für ausländische Personen mittels STORK.

            Die Funktionalität und der Aufbau der Schnittstellen des Modules MOA-ID-Auth in Richtung Online-Applikation werden im Kapitel Protokolle beschrieben.

            Für den Betrieb von MOA-ID-Auth ist der Einsatz von MOA-Signaturprüfung (MOA-SP) erforderlich.

            -

            2.1 Ablauf einer Anmeldung

            +

            2.1 Ablauf einer Anmeldung

            Die nachfolgende Grafik beschreibt den Ablauf eines Abmeldevorgangs an einer Online-Applikation mit Hilfe von MOA-ID-Auth unter Verwendung der Bürgerkarte oder der Handy-Signatur.

            -

            Sequenzdiagramm eines Anmeldevorgangs mit MOA-ID-Auth

            +

            Sequenzdiagramm eines Anmeldevorgangs mit MOA-ID-Auth

             

            1. Der Benutzer verbindet sich zu einem Web-Portal (Service Provider) über das die Online-Applikation erreichbar ist. Nach der Betätigung eines Login-Buttons wird der Anmeldevorgang ausgelöst.
            2. @@ -69,10 +69,10 @@
            3. MOA-ID-Auth validiert die Authentifizierungsanfrage des Service Providers
            4. MOA-ID-Auth bietet dem Benutzer eine Auswahl von verfügbaren Authentifizierungsmethoden (Bürgerkarte, Handy-Signatur, STORK) an.
            5. Der Benutzer wählt die gewünschte Authentifizierungsmethode und sendet diese an MOA-ID-Auth.
            6. -
            7. MOA-ID-AUTH erzeugt eine HTML-Seite mit einem <InfoboxReadRequest> zum Auslesen der Personenbindung. Diese HTML-Seite wird an den Browser geschickt.
            8. -
            9. Der Browser schickt den <InfoboxReadRequest> an die ausgewählte Bürgerkartenumgebung unter Verwendung des Security-Layer. Die Bürgerkartenumgebung liest die Personenbindung von der Bürgerkarte und sendet diese an MOA-ID-AUTH. MOA-ID-Auth prüft die Signatur der Personenbindung durch einen Aufruf von MOA-SP.
            10. -
            11. MOA-ID-AUTH erstellt den AUTH-Block. Der AUTH-Block enthält Vor- und Nachname aus der Personenbindung, URL von MOA-ID-AUTH, URL und Geschäftsbereich der Online-Applikation oder im Falle einer SSO Anmeldung die URL und den Geschäftsbereich der MOA-ID-Auth Instanz, die aktuelle Zeit, das aktuelle Datum und einen Zufallswert für diesen Anmeldevorgang. Anschließend wird eine XML Antwortseite, die das Kommando zum Signieren (<CreateXMLSignatureRequest>) des generierten AUTH-Blocks enthält, an die ausgewählte Bürgerkartenumgebung, unter Verwendung des Security-Layers, gesendet.
            12. -
            13. Der Request wird von der Bürgerkartenumgebung verarbeitet. Die signierten Daten werden an MOA-ID-AUTH zurückgesendet.
            14. +
            15. MOA-ID-Auth erzeugt eine HTML-Seite mit einem <InfoboxReadRequest> zum Auslesen der Personenbindung. Diese HTML-Seite wird an den Browser geschickt.
            16. +
            17. Der Browser schickt den <InfoboxReadRequest> an die ausgewählte Bürgerkartenumgebung unter Verwendung des Security-Layer. Die Bürgerkartenumgebung liest die Personenbindung von der Bürgerkarte und sendet diese an MOA-ID-Auth. MOA-ID-Auth prüft die Signatur der Personenbindung durch einen Aufruf von MOA-SP.
            18. +
            19. MOA-ID-Auth erstellt den AUTH-Block. Der AUTH-Block enthält Vor- und Nachname aus der Personenbindung, URL von MOA-ID-Auth, URL und Geschäftsbereich der Online-Applikation oder im Falle einer SSO Anmeldung die URL und den Geschäftsbereich der MOA-ID-Auth Instanz, die aktuelle Zeit, das aktuelle Datum und einen Zufallswert für diesen Anmeldevorgang. Anschließend wird eine XML Antwortseite, die das Kommando zum Signieren (<CreateXMLSignatureRequest>) des generierten AUTH-Blocks enthält, an die ausgewählte Bürgerkartenumgebung, unter Verwendung des Security-Layers, gesendet.
            20. +
            21. Der Request wird von der Bürgerkartenumgebung verarbeitet. Die signierten Daten werden an MOA-ID-Auth zurückgesendet.
            22. MOA-ID-Auth überprüft den signierten AUTH-Block und generiert Information für weitere Anmeldungen mittels Single Sign-On.
            23. MOA-ID-Auth generiert die Anmeldedaten (Assertion) welche folgende Information enthalten:
                @@ -89,7 +89,7 @@
              • MOA-ID-Auth sendet die Anmeldedaten an den Service-Provider und setzt im Browser des Benutzers ein SSO Session-Token welches für weitere Anmeldevorgänge verwendet werden kann.
              • Die Anmeldedaten werden vom Service-Provider verarbeitet und der Benutzer wird vom Service-Provider an die Online-Applikation weitergeleitet.
            -

            3 MOA-ID-Configuration

            +

            3 MOA-ID-Configuration

            Das Modul MOA-ID-Configuration stellt eine web-basierte Benutzerschnittstelle zur Konfiguration des Moduls MOA-ID-Auth zur Verfügung, wobei sich die Konfiguration in zwei Teilbereiche unterteilt ist. Eine detaillierte Aufstellung der einzelnen Konfigurationspunkte befindet sich im Kapitel Konfiguration.

            1. Allgemeine Konfiguration
              @@ -99,5 +99,6 @@

            Zusätzlich unterstützt das Module MOA-ID-Configuration auch eine einfache Benutzerverwaltung mit Rechtevergabe mit deren Hilfe die Verwaltung von Online-Applikationen an den jeweiligen Service-Provider ausgelagert werden kann. Die Anmeldung am Konfigurationstool erfolgt mittels Bürgerkarte, Handysignatur oder STORK, wobei optional auch eine Anmeldung mittels Benutzername und Passwort zur Verfügung steht.

             

            +
      diff --git a/id/server/doc/handbook/protocol/protocol.html b/id/server/doc/handbook/protocol/protocol.html index 1c6e51661..2989ca4af 100644 --- a/id/server/doc/handbook/protocol/protocol.html +++ b/id/server/doc/handbook/protocol/protocol.html @@ -6,19 +6,19 @@ - - - - - - -
      Logo BKADokumentationLogo EGIZ
      -
      -

      MOA-ID (Identifikation)

      -

      Protokolle

      -
      -

      Inhalt

      -
        +
        +
        + +

        MOA-ID-AUTH

        +
        +
        +
        + +
        +

        Protokolle

        + +

        Inhalt

        +
        1. Allgemeines
          1. Übersicht der Zugangspunkte
          2. @@ -78,18 +78,18 @@
          3. Referenzierte Spezifikation
          -
          -

          1 Allgemeines

          -

          Dieses Kapitel behandelt jene Authentifizierungsprotokolle die vom Modul MOA-ID-Auth unterstützt werden. + +

          1 Allgemeines

          +

          Dieses Kapitel behandelt jene Authentifizierungsprotokolle die vom Modul MOA-ID-Auth unterstützt werden. Wobei die Verwendung der Protokolle PVP 2.1 oder OpenID Connect empfohlen wird. Das Protokoll SAML 1, welches bis zur MOA-ID Version 1.5.1 - verwendet wurde, wird jedoch ab der Version 2.0 nur mehr aus Kompatibilitätsgründen angeboten und nicht mehr aktiv weiterentwickelt.

          -

          1.1 Übersicht der Zugangspunkte

          + verwendet wurde, wird jedoch ab der Version 2.0 nur mehr aus Kompatibilitätsgründen angeboten und nicht mehr aktiv weiterentwickelt.

          +

          1.1 Übersicht der Zugangspunkte

          In diesem Abschnitt sind die Zugangspunkte der vom Modul MOA-ID-Auth unterstützten Protokolle kurz zusammengefasst. Eine detaillierte Beschreibung der einzelnen Protokolle finden Sie in den anschließenden Unterkapiteln.

          - +
          - - - + + + @@ -122,12 +122,12 @@ Redirect Binding - + - + @@ -153,21 +153,21 @@ Redirect Binding

          http://<host>:<port>/moa-id-auth/idpSingleLogout

          ProtokollRequesttypURLProtokollRequesttypURL
          PVP 2.1 OpenID Connect Authentifizierungsrequest
          (AuthCode-Request)
          https://<host>:<port>/moa-id-auth/oauth2/authhttps://<host>:<port>/moa-id-auth/oauth3/auth
          OpenID Connect

          AccessToken-Request

          https://<host>:<port>/moa-id-auth/oauth2/tokenhttps://<host>:<port>/moa-id-auth/oauth3/token
          SAML 1
          -

          1.2 Übersicht der möglichen Attribute

          +

          1.2 Übersicht der möglichen Attribute

          Die nachfolgende Tabelle beinhaltet eine Liste aller Attribute die vom Modul MOA-ID-Auth an die Online-Applikation zurückgeliefert werden können, sofern diese nach der Authentifizierung zur Verfügung stehen. Alle Namen beziehen sich auf den Attributnamen im jeweiligen Protokoll. Detailinformationen zu den einzelnen Attributen finden Sie in der PVP 2.1 Spezifikation der der STORK Spezifikation.

          - +
          - + - + - + - - + + @@ -515,16 +515,16 @@ Redirect Binding

          Hinweis: Dieses Attribut steht nur bei einer Anmeldung mittels STORK zur Verfügung.

          ProtokolleBeschreibungBeschreibung
          PVP 2.1PVP 2.1 OpenID ConnectSAML 1SAML 1
          NameProfilNameProfil
          urn:oid:1.2.40.0.10.2.1.1.149
          -

          1.3 Übersicht der möglichen MOA-ID spezifischen Statuscodes

          +

          1.3 Übersicht der möglichen MOA-ID spezifischen Statuscodes

          Vom Modul MOA-ID-Auth werden verschiedene Authentifizierungsprotokolle wobei diese Protokolle die Fehlerrückgabe unterschiedlich spezifizieren. Zusätzlich zu den protokollabhängigen Statuscodes (siehe Spezifikation des jeweiligen Protokolls) werden zusätzliche protokollunabhängige Statuscodes an den Service Provider zurückgeliefert, wobei sich das Format der Fehlerrückgabe jedoch weiterhin protokollspezifisch ist.

          Die nachfolgende Tabelle zeigt alle protokollunabhängigen Statuscodes welche vom Modul MOA-ID-Auth zurückgeliefert werden können.

          -

          1.3.1 Statuscodes 1xxxx

          +

          1.3.1 Statuscodes 1xxxx

          Alle Statuscodes beginnend mit der Zahl eins beschreiben Fehler welche während des Identifizierungs- und Authentifizierungsvorgangs aufgetreten sind.

          -

          1.3.1.1 Authentifizierung (10xxx)

          - +
          1.3.1.1 Authentifizierung (10xxx)
          +
          - - + + @@ -559,11 +559,11 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          1000 Vollmachtsmodus für ausländische Personen wird nicht unterstützt.
          -

          1.3.1.2 Validierung (11xxx)

          - +
          1.3.1.2 Validierung (11xxx)
          +
          - - + + @@ -606,11 +606,11 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          1100 Fehler beim Validieren der SZR-Gateway Response
          -

          1.3.1.3 STORK (12xxx)

          - +
          1.3.1.3 STORK (12xxx)
          +
          - - + + @@ -637,16 +637,16 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          1200 Der geforderte QAA Level ist höher als der QAA Level der gewählten Authentifizierungsmethode
          -

          1.3.2 Statuscodes 4xxxx

          +

          1.3.2 Statuscodes 4xxxx

          Alles Statuscodes beginnend mit der Zahl vier beschreiben Fehler die während der Kommunikation mit externen Services aufgetreten sind.

          -

          1.3.2.1 BKU (40xxxx)

          +
          1.3.2.1 BKU (40xxxx)

          Tritt während des Anmeldevorgangs in der Bürgerkartenumgebung ein Fehler auf so wird der entsprechende Fehlercode an den Service Provider weitergereicht. Der der durch das Modul MOA-ID-Auth weitergereichte Statuscode für Bürgerkartenumgebungsfehler weißt das folgende zweiteilige Format auf. Der erste Teil, bestehend aus zwei Dezimalstellen, kennzeichnet den Fehler als Fehler als Bürgerkartenumgebungsfehler. Der zweite Teil, bestehend aus vier Dezimalstellen bezeichnet den eindeutigen Identifikator des Fehlers aus der Bürgerkartenumgebung (siehe SecurityLayer Spezifikation).

          {40}{xxxxx}

          {40} ... MOA-ID Statuscode für Fehler aus der Bürgerkartenumgebung

          {xxxx} .... Fehlercode der Bürgerkartenumgebung.

          -

          1.3.2.2 MIS (41xxxx)

          +
          1.3.2.2 MIS (41xxxx)

          Tritt während der Kommunikation mit dem Online-Vollmachten Service oder der Vollmachtsauswahl ein Fehler auf so wird der entsprechende Fehlercode an den Service Provider weitergereicht. Der der durch das Modul MOA-ID-Auth weitergereichte Statuscode für Fehler aus dem Online-Vollmachten Service weißt das folgende zweiteilige Format auf. Der erste Teil, bestehend aus drei Dezimalstellen, kennzeichnet den Fehler als Fehler als Online-Vollmachten Service Fehler. Der zweite Teil, bestehend aus drei Dezimalstellen bezeichnet den eindeutigen Identifikator des Fehlers aus dem Online-Vollmachten Service (siehe Online-Vollmachten Spezifikation).

          {411}{xxxx}

          @@ -654,10 +654,10 @@ Redirect Binding

          {xxx} .... Fehlercode des Online-Vollmachten Service.

          Zusätzlich zu den gemappten Fehlern aus dem Online-Vollmachen Service werden zusätzliche weitere Fehlercodes definiert.

          - +
          - - + + @@ -668,11 +668,11 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          41000 Allgemeiner Fehler bei der Kommunikation mit dem Online-Vollmachten Service
          -

          1.3.2.3 SZR-Gateway (42xxx)

          - +
          1.3.2.3 SZR-Gateway (42xxx)
          +
          - - + + @@ -683,35 +683,35 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          4200 Die Antragung in das SZR ist fehlgeschlagen
          -

          1.3.2.4 MOA SP/SS(43xxx)

          - +
          1.3.2.4 MOA SP/SS(43xxx)
          +
          - - + +
          StatuscodeBeschreibungStatuscodeBeschreibung
          4300 Fehler beim Aufruf von MOA SP/SS
          -

          1.3.2.5 Interfederation (44xxx)

          - +
          1.3.2.5 Interfederation (44xxx)
          +
          - - + +
          StatuscodeBeschreibungStatuscodeBeschreibung
          4400 Fehler beim Generieren der Anmeldedaten
          -

          1.3.3 Statuscodes 6xxxx

          +

          1.3.3 Statuscodes 6xxxx

          Alles Statuscodes beginnend mit der Zahl sechs beschreiben protokollspezifische Fehler die nicht durch das jeweilige Authentifizierungsprotokoll abgebildet werden.

          -

          1.3.3.1 Allgemein (61xxx)

          - +
          1.3.3.1 Allgemein (61xxx)
          +
          - - + + @@ -722,11 +722,11 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          6000 Der STORK Request wurde nicht erkannt oder wird nicht unterstützt
          -

          1.3.3.2 PVP 2.1 (61xxx)

          - +
          1.3.3.2 PVP 2.1 (61xxx)
          +
          - - + + @@ -753,35 +753,35 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          6100 Der Request konnte nicht gültig validiert werden.
          -

          1.3.3.3 OpenID Connect (62xxx)

          - +
          1.3.3.3 OpenID Connect (62xxx)
          +
          - - + +
          StatuscodeBeschreibungStatuscodeBeschreibung
          6200 Fehlerhafte redirect url
          -

          1.3.3.4 SAML 1(63xxx)

          - +
          1.3.3.4 SAML 1(63xxx)
          +
          - - + +
          StatuscodeBeschreibungStatuscodeBeschreibung
          6300 Fehlerhaftes SAML Artifact Format
          -

          1.3.4 Statuscodes 9xxxx

          +

          1.3.4 Statuscodes 9xxxx

          Alles Statuscodes beginnend mit der Zahl neun beschreiben interne Serverfehler.

          -

          1.3.4.1 Konfigurationsfehler (90xxx)

          - +
          1.3.4.1 Konfigurationsfehler (90xxx)
          +
          - - + + @@ -816,11 +816,11 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          9000 Der SZR-Gateway Client konnte nicht initialisiert werden.
          -

          1.3.4.2 Interne Fehler (91xxx)

          - +
          1.3.4.2 Interne Fehler (91xxx)
          +
          - - + + @@ -844,7 +844,7 @@ Redirect Binding
          StatuscodeBeschreibungStatuscodeBeschreibung
          9100

           

          -

          1.4 Single Sign-On

          +

          1.4 Single Sign-On

          Das Modul MOA-ID-Auth unterstützt ab der Version 2.0 Single Sign-On (SSO), wobei diese Funktionalität unabhängig vom verwendeten Protokoll ist. Bei Verwendung von SSO muss sich der Benutzer nur ein Mal bei MOA-ID-Auth authentifizieren und danach steht die authentifizierte Session für die Benutzerin oder den Benutzer für weitere Anmeldevorgänge ohne weitere Authentifizierung mittels Bürgerkarte, Handy-Signatur oder STORK zur Verfügung. Die SSO Session kann danach durch die Benutzerin oder den Benutzer beendet werden, oder sie wird von MOA-ID-Auth nach der maximal erlaubten Sessionzeit serverseitig beendet.

          Das nachfolgende Sequenzdiagramm zeigt eine Anmeldung mittels Single Sign-On an zwei Online-Applikationen unter Verwendung von PVP 2.1. Aus Gründen der Übersichtlichkeit wurden die Teile welche die Kommunikation mit der Bürgerkartenumgebung, die Vollmachten-Auswahl oder den Metadatenaustausch betreffen bewusst nicht berücksichtigt.

          Sequenzdiagramm einer Anmeldung mittels Single Sign-On

          @@ -873,7 +873,7 @@ Redirect Binding
        2. Ist die Validierung der Assertion erfolgreich wird die Benutzerin oder der Benutzer an der Online-Applikation 2 angemeldet

        Zusätzliche Informationen zur Konfiguration und die sich daraus ergebenden Anforderungen oder Einschränkungen finden sie hier.

        -

        1.5 SSO Logout

        +

        1.5 SSO Logout

        Das Modul MOA-ID-Auth stellt ein einfaches Service zur Beendigung einer bestehenden Single Sign-On Session zur Verfügung. Nach dem Aufruf dieses Service aus dem Browser des Users wird eine bestehende SSO Session beendet und anschließend wird die Benutzerin oder der Benutzer an eine im LogOut Request angegebene URL weitergeleitet.

        Das SSO Logout Service steht unter folgender URL zur Verfügung und benötigt einen http GET Parameter:

        http://<host>:<port>/moa-id-auth/LogOut
        @@ -882,11 +882,11 @@ Redirect Binding
         
         https://<host>:<port>/moa-id-auth/LogOut
           
        - +
        - - - + + + @@ -901,7 +901,7 @@ https://<host>:<port>/moa-id-auth/LogOut
        https://demo.egiz.gv.at/moa-id-auth/LogOut?redirect=https://demo.egiz.gv.at/demoportal-openID_demo
         

        Hinweis: Dieses Service bietet jedoch NICHT eine vollständige Single Log-Out Funktionalität wie sie im SAML 2 Protokoll vorgesehen ist, sondern beendet ausschließlich die SSO Session in der MOA-ID-Auth Instanz.

        -

        1.5.1 Single LogOut

        +

        1.5.1 Single LogOut

        Ab der Version 2.1 unterstützt das Modul MOA-ID-Auth Single LogOut (SLO) laut SAML2 Spezifikation. Die SLO Funktionaltität steht jedoch nur für Online-Applikationen zur Verfügung welche als Authentifizierungsprotokoll PVP 2.1 verwenden. Für alle anderen Authentifizierungsprotokolle steht aktuell kein SLO zur Verfügung.

        Für Single LogOut stehen sowohl IDP initialisiertes SLO als auch Service Provider initialisiertes SLO zur Verfügung. Als Einsprungpunkt für IDP initialisiertes SLO stellt das Modul MOA-ID-Auth folgende Web Adressen zur Verfügung. Nach dem Aufruf dieses Services wird der Single LogOut Vorgang gestartet. Nach erfolgreicher Bearbeitung aller SLO Requests / Response erfolgt die Statusausgabe in den Browser.

        https://<host>:<port>/moa-id-auth/idpSingleLogout
        @@ -912,14 +912,14 @@ https://<host>:<port>/moa-id-auth/LogOut

         

        Hinweis: Wenn Single Sign-On mit Authentifizierungsprotokollen, welche kein SLO untersützen verwendet wurde, schlägt der Single LogOut Vorgang auf jeden Fall fehl, da der Benutzer an den jeweiligen Online-Applikationen nicht angemeldet werden kann. Die SSO Session am Identityprovider wird jedoch auf jeden Fall beendet

         

        -

        1.6 Legacy Request (Bürgerkartenauswahl beim Service Provider)

        +

        1.6 Legacy Request (Bürgerkartenauswahl beim Service Provider)

        Soll die Bürgerkartenauswahl jedoch weiterhin, wie aus MOA-ID 1.5.1 bekannt direkt in der Online-Applikation des Service Providers erfolgen muss für das jeweilige Protokoll der Legacy Modus aktiviert werden. Wird der Legacy Modus verwendet muss jedoch zusätzlich zu den protokollspezifischen Parametern mindestens der Parameter bkuURI, welcher die gewählte Bürgerkartenumgebung enthält, im Authentifizierungsrequest an MOA-ID-Auth übergeben werden (siehe Protokoll SAML 1). Die folgenden Parameter stehen bei Verwendung des Legacy Modus unabhängig vom verwendeten Protokoll zur Verfügung und bilden den gesamten Umfang der Bürgerkartenauswahl, wie aus MOA-ID 1.5.1 bekannt, ab.

        -
        NameBeispielwertBeschreibungNameBeispielwertBeschreibung
        redirect
        +
        - - - + + + @@ -948,10 +948,10 @@ https://<host>:<port>/moa-id-auth/LogOut

         

        Hinweis: Bei einer vollständigen Neukonfiguration ist der Legacy Modus standardmäßig für alle Protokolle deaktiviert.

        Hinweis: Bei der Verwendung des Legacy Request für die Bürgerkartenauswahl ist jedoch zu beachten dass im Falle einer aktiven Single Sign-On Session, MOA-ID-Auth mit einer Abfrage zum SSO Anmeldevorgang antwortet.

        -

        2 PVP 2.1

        +

        2 PVP 2.1

        Die PVP 2.1 Implementierung des Modules MOA-ID-Auth bezieht sich auf das S-Profil der PVP 2 Spezifikation. Das S - Profil von PVP 2 verwendet SAML WebSSO für die Authentifizierung von Benutzern mit Webbrowser. Dadurch wird die direkte Kommunikation des Browsers mit der Anwendung ermöglicht, was in Anwendungsfällen notwendig ist, wo Anwendungen nicht kompatibel mit dem Reverse - Proxy - Verfahren sind, datenschutzrechtliche Probleme bestehen oder SAML WebSSO als Industriestandard unterstützt werden soll.

        Bevor PVP 2.1 als Authentifizierungsprotokoll verwendet werden kann muss das Modul MOA-ID-Auth entsprechend konfiguriert werden. Detailinformationen zur Konfiguration finden Sie hier.

        -

        2.1 Ablauf einer Anmeldung mittels PVP 2.1

        +

        2.1 Ablauf einer Anmeldung mittels PVP 2.1

        Die nachfolgende Abbildung zeigt das Sequenzdiagramm eines Anmeldevorgangs mittels PVP 2.1 und des Modules MOA-ID-Auth als Identity Provider. Aus Gründen der Übersichtlichkeit wurden die Teile welche die Kommunikation mit der Bürgerkartenumgebung oder die Vollmachten-Auswahl betreffen bewusst nicht berücksichtigt.

        Sequenzdiagramm PVP 2.1

          @@ -973,7 +973,7 @@ https://<host>:<port>/moa-id-auth/LogOut
        -

        2.2 Metadaten

        +

        2.2 Metadaten

        Das Modul MOA-ID-Auth stellt für Service-Provider (Online-Applikationen) Metadaten bereit welche alle PVP 2.1 spezifischen Informationen der MOA-ID-Auth Instanz beinhalten. Diese Metadaten werden durch das Modul MOA-ID-Auth signiert, wodurch Service Provider die Authentizität der Metadaten verifizieren können. Ein Beispiel für Metadaten von MOA-ID-Auth finden sie hier. Die aktuellen Metadaten zu Ihrer MOA-ID-Auth Instanz können unter folgender URL abgerufen werden.

        http://<host>:<port>/moa-id-auth/pvp2/metadata
         
        @@ -993,7 +993,7 @@ https://<host>:<port>/moa-id-auth/pvp2/metadata

        Zusätzlich unterstützt das Modul MOA-ID-Auth auch die Verschlüsselung PVP 2.1 Assertion mit einem vom Service-Provider definierten Zertifikat. Um diese Funktion zu nutzen muss in den Metadaten ein zweites XML Element md:EntitiesDescriptor/md:EntityDescriptormd:SPSSODescriptor/md:KeyDescriptor mit dem Attribut use="encryption" vorhanden sein (siehe Beispiel). In diesem Fall verwendet das Modul MOA-ID-Auth, dass in diesem Element hinterlegte Zertifikat zur Verschlüsselung der PVP 2.1 Assertion.

        Hinweis: Fehlt im XML Element md:EntitiesDescriptor/md:EntityDescriptormd:SPSSODescriptor/md:KeyDescriptor das Attribut use wird das in diesem Element hinterlegte Zertifikat sowohl zur Prüfung der Signatur des Authentifizierungsrequest als auch zur Verschlüsselung der PVP 2.1 Assertion verwendet.

        -

        2.3 Zugangspunkte

        +

        2.3 Zugangspunkte

        Für die Kommunikation zwischen Service Provider und dem Modul MOA-ID-Auth stellt MOA-ID-Auth aktuell zwei PVP 2.1 spezifische Zugangspunkte zur Verfügung. Detailinformationen zu den beiden Zugangspunkten (Bindings) entnehmen finden Sie in der SAML2 Spezifikation.

        • POST Binding: In diesem Fall erfolgt die Übertragung mittels http POST. Hierfür stellt MOA-ID-Auth den folgenden Zugangspunkt zur Verfügung.
        • @@ -1004,16 +1004,16 @@ https://<host>:<port>/moa-id-auth/pvp2/metadata
        https://<host>:<port>/moa-id-auth/pvp2/redirect

        Hinweis: Die Zugangspunkte können auch direkt aus den von MOA-ID-Auth generierten Metadaten entnommen werden.

        -

        2.3.1 Authentifizierungsrequest

        +

        2.3.1 Authentifizierungsrequest

        Der Authentifizierungsrequest wird vom Service Provider erstellt und an das Modul MOA-ID-Auth übermittelt. Zur Übertragung, muss je nach verwendetem Binding, einer der beiden Zugangspunkte und die entsprechende Kodierung der Parameter verwendet werden.

        Folgende Minimalanforderungen an den Authentifizierungsrequest müssen erfüllt sein.

        • Der Request muss durch den Service Provider signiert sein (siehe Beispiel). Die Signatur wird durch das Modul MOA-ID-Auth mit Hilfe des in den Metadaten hinterlegten Zertifikats validiert. Schlägt die Signaturprüfung fehl oder ist keine Signatur vorhanden wird der Request abgewiesen und MOA-ID-Auth antwortet mit http Code 400 und der Fehlermeldung NO valid protocol request received!.
        • -
        NameBeispielwertBeschreibungNameBeispielwertBeschreibung
        bkuURI=<bku-url>
        +
        - - + + @@ -1026,7 +1026,7 @@ https://<host>:<port>/moa-id-auth/pvp2/metadata
        Namesaml2p:AuthnRequest/saml2:IssuerNamesaml2p:AuthnRequest/saml2:Issuer
        Gebrauch
      1. - +
        @@ -1044,7 +1044,7 @@ https://<host>:<port>/moa-id-auth/pvp2/metadata

        Einen Beispielrequest finden Sie hier.

        Hinweis: Detailinformationen finden Sie im Abschnitt Spezifikationen in der PVP 2.1 Spezifikation und der SAML2 Spezifikation.

        -

        2.3.2 Authentifizierungsresponse

        +

        2.3.2 Authentifizierungsresponse

        Nach erfolgreicher Authentifizierung antwortet das Modul MOA-ID-Auth mit einer PVP 2.1 Assertion. Zur Übertragung der Assertion erfolgt an das in den Metadaten der Online-Applikation angegebene AssertionConsumerService (siehe Metadaten).

        Aktuell werden vom Modul MOA-ID-Auth zwei Bindings zur Übertragung der Assertion unterstützt.

          @@ -1145,13 +1145,13 @@ https://<host>:<port>/moa-id-auth/pvp2/metadata
        Name /saml2p:AuthnRequest/@ID

        Dieses Attribut beinhaltet einen von MOA-ID-Auth ausgestellten Gültigkeitszeitraum für diese Assertion. Aktuell beträgt der Gültigkeitszeitraum fünf Minuten ab dem Ausstellzeitpunkt.

        -

        3 OpenID Connect

        -

        OpenID Connect ist ein Authentifizierungsprotokoll welches auf dem OAuth 2.0 Protokoll aufbaut. Dieses Protokoll erlaubt Online-Applikationen die Identifizierung und Authentifizierung von Benutzern, mit Hilfe des Modules MOA-ID-Auth. Der Vorteil von OpenID Connect im Vergleich zu auf SAML basierten Protokollen (PVP 2.1, SAML 1) ist der einfachere Aufbau der einzelnen Protokollnachrichten. Zusätzlich existieren einige frei Verfügbare Bibliotheken für unterschiedliche Programmiersprachen, welche OpenID Connect implementieren.

        +

        3 OpenID Connect

        +

        OpenID Connect ist ein Authentifizierungsprotokoll welches auf dem OAuth 2.0 Protokoll aufbaut. Dieses Protokoll erlaubt Online-Applikationen die Identifizierung und Authentifizierung von Benutzern, mit Hilfe des Modules MOA-ID-Auth. Der Vorteil von OpenID Connect im Vergleich zu auf SAML basierten Protokollen (PVP 2.1, SAML 1) ist der einfachere Aufbau der einzelnen Protokollnachrichten. Zusätzlich existieren einige frei Verfügbare Bibliotheken für unterschiedliche Programmiersprachen, welche OpenID Connect implementieren.

        Bevor OpenID Connect in Kombination mit dem Modul MOA-ID-Auth verwendet werden kann muss das Modul MOA-ID-Auth konfiguriert werden. Detailinformationen zur Allgemeinen Konfiguration und zur online-applikationsspezifischen Konfiguration finden Sie im jeweiligen Abschnitt des Kapitels Konfiguration.

        -

        Die nachfolgende Beschreibung gibt einen kurzen Überblick zur Verwendung des Protokolls OpenID Connect in Kombination mit dem Modul MOA-ID-Auth. Detailinformationen zu OpenID Connect entnehmen Sie bitte der aktuellen OpenID Connect Spezifikation

        +

        Die nachfolgende Beschreibung gibt einen kurzen Ãœberblick zur Verwendung des Protokolls OpenID Connect in Kombination mit dem Modul MOA-ID-Auth. Detailinformationen zu OpenID Connect entnehmen Sie bitte der aktuellen OpenID Connect Spezifikation

        -

        3.1 Ablauf einer Anmeldung mittels OpenID Connect

        -

        Die nachfolgende Abbildung zeigt das Sequenzdiagramm eines Anmeldevorgangs mittels OpenID Connect und des Modules MOA-ID-Auth als Identity Provider. Aus Gründen der Übersichtlichkeit wurden die Teile welche die Kommunikation mit der Bürgerkartenumgebung oder die Vollmachten-Auswahl betreffen bewusst nicht berücksichtigt.

        +

        3.1 Ablauf einer Anmeldung mittels OpenID Connect

        +

        Die nachfolgende Abbildung zeigt das Sequenzdiagramm eines Anmeldevorgangs mittels OpenID Connect und des Modules MOA-ID-Auth als Identity Provider. Aus Gründen der Übersichtlichkeit wurden die Teile welche die Kommunikation mit der Bürgerkartenumgebung oder die Vollmachten-Auswahl betreffen bewusst nicht berücksichtigt.

        Sequenzdiagramm OpenID Connect

          @@ -1182,23 +1182,23 @@ https://<host>:<port>/moa-id-auth/pvp2/metadata
      -

      3.2 Zugangspunkte

      -

      Zur Verwendung von OpenID Connect stellt das Modul MOA-ID-Auth zwei Zugangspunkte zur Kommunikation mit der Online-Applikation zur Verfügung. Diese Zugangspunkte bezeichnen die URLs unter welchen das Modul MOA-ID-Auth die entsprechenden OpenID Connect Nachrichten entgegennimmt.

      +

      3.2 Zugangspunkte

      +

      Zur Verwendung von OpenID Connect stellt das Modul MOA-ID-Auth zwei Zugangspunkte zur Kommunikation mit der Online-Applikation zur Verfügung. Diese Zugangspunkte bezeichnen die URLs unter welchen das Modul MOA-ID-Auth die entsprechenden OpenID Connect Nachrichten entgegennimmt.

        -
      • AuthCode-Request: https://<host>:<port>/moa-id-auth/oauth2/auth
        Unter dieser URL wird der Authn Request entgegengenommen. Dieser Request startet den Authentifizierungsvorgang an der Online-Applikation. Hier finden Sie Detailinformationen zum Request und zur Response.
      • -
      • AccessToken-Request: https://<host>:<port>/moa-id-auth/oauth2/token
        Unter dieser URL können nach erfolgreicher Authentifizierung die eigentlichen Authentifizierungsdaten am Modul MOA-ID-Auth abgeholt werden. Hier finden Sie Detailinformationen zum Request und zur Response.
      • +
      • AuthCode-Request: https://<host>:<port>/moa-id-auth/oauth3/auth
        Unter dieser URL wird der Authn Request entgegengenommen. Dieser Request startet den Authentifizierungsvorgang an der Online-Applikation. Hier finden Sie Detailinformationen zum Request und zur Response.
      • +
      • AccessToken-Request: https://<host>:<port>/moa-id-auth/oauth3/token
        Unter dieser URL können nach erfolgreicher Authentifizierung die eigentlichen Authentifizierungsdaten am Modul MOA-ID-Auth abgeholt werden. Hier finden Sie Detailinformationen zum Request und zur Response.
      -

      3.3 Beschreibung der Nachrichten

      -

      Dieser Abschnitt beschreibt die einzelnen OpenID Connect spezifischen Nachrichten, welche zwischen der Online-Applikation und dem Modul MOA-ID-Auth während eines Authentifizierungsvorgangs ausgetauscht werden. Hierbei wird auch auf das Sequenzdiagramm aus Abschnitt 3.1 Bezug genommen.

      +

      3.3 Beschreibung der Nachrichten

      +

      Dieser Abschnitt beschreibt die einzelnen OpenID Connect spezifischen Nachrichten, welche zwischen der Online-Applikation und dem Modul MOA-ID-Auth während eines Authentifizierungsvorgangs ausgetauscht werden. Hierbei wird auch auf das Sequenzdiagramm aus Abschnitt 3.1 Bezug genommen.

      -

      3.2.1 AuthCode Request

      -

      Der AuthCode Request ist die Authentifizierungsanfrage einer Online-Applikation für eine Benutzerin oder einen Benutzer. -Folgende Parameter müssen mit dem AuthCode-Request mitgesendet werden, wobei für die Übertragung der Parameter sowohl http GET als auch http POST verwendet werden kann.

      - +

      3.2.1 AuthCode Request

      +

      Der AuthCode Request ist die Authentifizierungsanfrage einer Online-Applikation für eine Benutzerin oder einen Benutzer. +Folgende Parameter müssen mit dem AuthCode-Request mitgesendet werden, wobei für die Übertragung der Parameter sowohl http GET als auch http POST verwendet werden kann.

      +
      - - - + + + @@ -1241,7 +1241,7 @@ Folgende Parameter m
      NameBeispielwertBeschreibungNameBeispielwertBeschreibung
      client_id

       

      Nachfolgend ein Beispiel für einen OpenID Connect Authentifizierungsrequest an das Modul MOA-ID-Auth.

      -
      <form method="get" action="https://demo.egiz.gv.at/demoportal_moaid-2.0/oauth2/auth">
      +
      <form method="get" action="https://demo.egiz.gv.at/demoportal_moaid-2.0/oauth3/auth">
         <input type="hidden" value="code" name="response_type">
         <input type="hidden" value="https://demo.egiz.gv.at/demoportal-openID_demo" name="client_id">
         <input type="hidden" value="https://demo.egiz.gv.at/demoportal-openID_demo/securearea.action" name="redirect_uri">
      @@ -1249,13 +1249,13 @@ Folgende Parameter m
         <input type="hidden" value="1152547590" name="state">
         <input type="submit" value="OpenID Connect login">
       </form>
      -

      3.2.2 AuthCode Response

      +

      3.2.2 AuthCode Response

      Das Ergebnis des AuthCode Requests wird an die redirect_uri der Online-Applikation gesendet. Die nachfolgenden Parameter werden dabei übergeben.

      - +
      - - - + + + @@ -1271,13 +1271,13 @@ Folgende Parameter m

       

      Nachfolgend ein Beispiel für eine AuthCode Response.

      https://demo.egiz.gv.at/demoportal-openID_demo/securearea.action?state=1425782214234&code=4/P7q7W91a-oMsCeLvIaQm6bTrgtp7 
      -

      3.2.3 AccessToken Request

      +

      3.2.3 AccessToken Request

      Mit dem AccessToken Request können vom Service Provider der Online-Applikation die Anmeldedaten an der MOA-ID-Auth Instanz abgeholt werden. Für die Abholung müssen folgende Parameter mit dem AccessToken Request an MOA-ID-Auth übertragen werden, wobei für die Übertragung der Parameter sowohl http GET als auch http POST verwendet werden kann.

      -
      NameBeispielwertBeschreibungNameBeispielwertBeschreibung
      state
      +
      - - - + + + @@ -1307,7 +1307,7 @@ Folgende Parameter m
      NameBeispielwertBeschreibungNameBeispielwertBeschreibung
      grant_type

       

      Nachfolgend ein Beispiel für einen AccessToken Request

      -
      <form method="POST" action="https://demo.egiz.gv.at/demoportal_moaid-2.0/oauth2/token">
      +
      <form method="POST" action="https://demo.egiz.gv.at/demoportal_moaid-2.0/oauth3/token">
         <input type="hidden" value="authorization_code" name="grant_type">
         <input type="hidden" value="https://demo.egiz.gv.at/demoportal-openID_demo" name="client_id">
         <input type="hidden" value="https://demo.egiz.gv.at/demoportal-openID_demo/securearea.action" name="redirect_uri">
      @@ -1315,16 +1315,16 @@ Folgende Parameter m
         <input type="hidden" value="4/P7q7W91a-oMsCeLvIaQm6bTrgtp7" name="code">
       </form>
      -

      3.2.4 AccessToken Response

      +

      3.2.4 AccessToken Response

      Die AccessToken Response beinhaltet ein signiertes JSON-Token welches alle angeforderten (Parameter scope im AuthCode Request) und vorhandenen Authentifizierungsdaten beinhaltet. Dieses JSON-Token ist mit einer JSON Web Signatur von MOA-ID-Auth signiert, wobei die Signatur alle angeforderten Daten einschließt. Details zur Konfiguration des Signatur Zertifikats finden Sie hier.

      - +
      - - - + + + @@ -1365,20 +1365,20 @@ Folgende Parameter m NzYxMDAxIiwKICJhdWQiOiAiczZCaGRSa3F0MyIsCiAibm9uY2UiOiAibi0wUzZ fV3pBMk1qIiwKICJleHAiOiAxMzExMjgxOTcwLAogImlhdCI6IDEzMTEyODA5Nz AKfQ.ggW8hZ1EuVLuxNuuIJKX_V8a_OMXzR0EHR9R6jgdqrOOF4daGU96Sr_P6q - Jp6IcmD3HP99Obi1PRs-cwh3LO-p146waJ8IhehcwL7F09JdijmBqkvPeB2T9CJ + Jp6IcmD3HP99Obi1PRs-cwh4LO-p146waJ8IhehcwL7F09JdijmBqkvPeB2T9CJ NqeGpe-gccMg4vfKjkM8FcGvnzZUN4_KSP0aAp1tOJ1zZwgjxqGByKHiOtX7Tpd QyHE5lcMiKPXfEIQILVq0pc_E2DzL7emopWoaoZTF_m0_N0YzFC6g6EJbOEoRoS K5hoDalrcvRYLSrQAZZKflyuVCyixEoV9GfNQC3_osjzw2PAithfubEEBLuVVk4 XUVrWOLrLl0nx7RkKU8NXNHq-rvKMzqg" } -

      3.2.5 Error Response

      +

      3.2.5 Error Response

      Sollte während des Authentifizierungsvorgangs ein Fehler auftreten antwortet das Modul MOA-ID-Auth mit einer Error Response. Diese beinhaltet folgende Parameter

      -
      NameBeispielwertBeschreibungNameBeispielwertBeschreibung
      access_token
      +
      - - - + + + @@ -1397,10 +1397,10 @@ Folgende Parameter m
      NameBeispielwertBeschreibungNameBeispielwertBeschreibung
      error

       

      -

      3 SAML 1

      +

      3 SAML 1

      SAML 1 wird durch MOA-ID-Auth 2.0 auch weiterhin, aus Gründen der Abwärtskompatibilität, als Authentifizierungsprotokoll unterstützt. Es wird jedoch der Umstieg auf ein aktuelles Authentifizierungsprotokoll wie PVP 2.1 oder OpenID Connect empfohlen.

      Die nachfolgenden Abschnitte beschreiben den Anmeldevorgang unter Verwendung von SAML1 wobei die Funktionalität, wie sie aus MOA-ID <= 1.5.1 bekannt ist, auch weiterhin unterstützt wird (Bürgerkartenauswahl auf Seiten des Service Provider). Zusätzlich steht für SAML 1 jedoch auch die Funktionalität der automatischen Generierung der Bürgerkartenauswahl durch das Modul MOA-ID-Auth zur Verfügung.

      -

      3.1 Ablauf einer Anmeldung mittels SAML 1

      +

      3.1 Ablauf einer Anmeldung mittels SAML 1

      Die nachfolgende Abbildung zeigt das Sequenzdiagramm eines Anmeldevorgangs mittels SAML 1 und des Modules MOA-ID-Auth als Identity Provider. Hierbei wird die aus MOA-ID 1.5.1 bekannte Variante der Bürgerkartenauswahl beim Service Provider verwenden. Aus Gründen der Übersichtlichkeit wurden die Teile welche die Kommunikation mit der Bürgerkartenumgebung oder die Vollmachten-Auswahl betreffen bewusst nicht berücksichtigt.

      Sequenzdiagramm für SAML 1

        @@ -1419,7 +1419,7 @@ Folgende Parameter m
      1. MOA-ID-Auth validiert das Artifact. Ist die Validierung erfolgreich antwortet MOA-ID-Auth mit der SAML 1 Assertion, welche die Anmeldedaten beinhaltet.
      2. Der Service Provider verarbeitet die Assertion und danach ist der Benutzer an der Online-Applikation angemeldet.
      -

      3.2 Zugangspunkte

      +

      3.2 Zugangspunkte

      Zur Verwendung von SAML 1 stellt das Modul MOA-ID-Auth zwei Zugangspunkte zur Kommunikation mit der Online-Applikation (Service Provider) zur Verfügung. Diese Zugangspunkte bezeichnen die URLs unter welchen das Modul MOA-ID-Auth die entsprechenden SAML1 Nachrichten entgegennimmt.

      • StartAuthentication Request: https://<host>:<port>/moa-id-auth/StartAuthentication
        @@ -1427,7 +1427,7 @@ Folgende Parameter m
      • GetAuthenticationData: http(s)://<host>:<port>/moa-id-auth/services/GetAuthenticationData
        Unter dieser URL können nach erfolgreicher Authentifizierung die eigentlichen Authentifizierungsdaten am Modul MOA-ID-Auth abgeholt werden.
      -

      3.3 StartAuthentication Request

      +

      3.3 StartAuthentication Request

      MOA-ID-Auth wird immer durch eine andere (verweisende) Webseite aufgerufen. Diese Webseite kann z.B. Teil eines Portals sein. Der Aufruf erfolgt durch einen Verweis der Form, wobei die Parameter sowohl als http GET als auch als http POST an MOA-ID-Auth übergeben werden können.

      <a href="https://<moa-id-server-und-pfad>/StartAuthentication
         ?Target=<geschäftsbereich>  
      @@ -1436,11 +1436,11 @@ Folgende Parameter m
         &Template=<template-url>
       	&useMandate=false
         &CCC=<ccc>">
      - +
      - - - + + + @@ -1486,12 +1486,12 @@ Folgende Parameter m
      NameBeispielwertBeschreibungNameBeispielwertBeschreibung
      <moa-id-server-und-pfad>Optional: Die sourceID fließt in die Generierung des SAML1 Artifacts, welches an den Service Provider returniert wird, ein. Detailinformationen zur Generierung des SAML1 Artifacts und zur sourceID finden Sie in der SAML1 Spezifikation.
      -

      3.4 GetAuthenticationData Request

      +

      3.4 GetAuthenticationData Request

      Nach erfolgter Authentisierung stehen in MOA-ID-AUTH Anmeldedaten zum Abholen bereit, und MOA-ID-AUTH veranlasst einen Redirect zur Online-Applikation (OA).

      In diesem Redirect werden der Geschäftsbereich und ein SAML-Artifact als Parameter übergeben.

      <a href="https://<oa-url>?Target=<geschäftsbereich>&SAMLArtifact=<saml-artifact>">
      - +
      @@ -1519,8 +1519,8 @@ Sollte während des Anmeldevorgangs ein Fehler aufgetreten sein, antwortet d
    1. SAML 1.0 Assertion Schema
    2. Der detaillierte Aufbau der <saml:Assertion> zu den Anmeldedaten ist in der Spezifikation MOA-ID 1.4 beschrieben.

      -

      A Referenzierte Spezifikation

      -
      oa-url>
      +

      A Referenzierte Spezifikation

      +
      @@ -1560,5 +1560,6 @@ Sollte während des Anmeldevorgangs ein Fehler aufgetreten sein, antwortet d
      Spezifikation
      + -- cgit v1.2.3 From 73f17b3662f318acab08e389141ce0953553f3af Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 7 Jan 2015 13:53:45 +0100 Subject: Fix local repository. - Rename axis-1.0_IAIK_1.1.pom to appropriate axis-1.0_IAIK_1.2.pom. --- repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.1.pom | 7 ------- repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.2.pom | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.1.pom create mode 100644 repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.2.pom diff --git a/repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.1.pom b/repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.1.pom deleted file mode 100644 index 6efb3d78d..000000000 --- a/repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - axis - axis - 1.0_IAIK_1.2 - AXIS 1.0 patched(1.2) (XXE attacks / wsdl ressource loader) - diff --git a/repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.2.pom b/repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.2.pom new file mode 100644 index 000000000..6efb3d78d --- /dev/null +++ b/repository/axis/axis/1.0_IAIK_1.2/axis-1.0_IAIK_1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + axis + axis + 1.0_IAIK_1.2 + AXIS 1.0 patched(1.2) (XXE attacks / wsdl ressource loader) + -- cgit v1.2.3 From 1625de9410a9ed4bc250b9baa813b421e14a6e19 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 7 Jan 2015 15:42:57 +0100 Subject: Fix moa-id-auth-proxy pom.xml. - Replace version 2.0.0 with ${moa-id-proxy-version}. --- id/server/proxy/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index 27a722432..baef394a7 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -20,7 +20,7 @@ 4.0.0 MOA.id.server moa-id-proxy - 2.0.0 + ${moa-id-proxy-version} war MOA ID-Proxy WebService -- cgit v1.2.3 From 7133df83104f3e885ee1b7532f64c058f392a412 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 7 Jan 2015 16:52:47 +0100 Subject: Set MOA modules' version to *-SNAPSHOT. --- pom.xml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 1b5319eca..c5973a4ab 100644 --- a/pom.xml +++ b/pom.xml @@ -10,13 +10,23 @@ ${basedir}/repository UTF-8 - - 2.0.1 - 2.1.2 - 2.0.0 - 2.0.3 - 1.1.4 - 2.0.2 + + + + 2.0.2-SNAPSHOT + 3.0.0-SNAPSHOT + 2.0.1-SNAPSHOT + 2.0.4-SNAPSHOT + 1.1.5-SNAPSHOT + 2.0.3-SNAPSHOT @@ -56,8 +66,16 @@ - + + + + + maven-release-plugin + 2.5.1 + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jvnet.hyperjaxb3 + maven-hyperjaxb3-plugin + 0.5.6 + + generate + + + + + + + + + + + + + diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 44ab8ddaf..369e3fa6d 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -41,7 +41,6 @@ log4j log4j - 1.2.17 javax.jms diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 777c7393f..63a84998c 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -124,7 +124,6 @@ xerces xercesImpl - 2.11.0 test diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml index 581c29e56..0690b65e3 100644 --- a/spss/handbook/clients/api/pom.xml +++ b/spss/handbook/clients/api/pom.xml @@ -9,7 +9,6 @@ MOA.spss.handbook moa-spss-handbook-apiClient jar - 2.0 MOA SP/SS Handbook API Client diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml index c104c6c3b..1dfa3d532 100644 --- a/spss/handbook/clients/pom.xml +++ b/spss/handbook/clients/pom.xml @@ -10,7 +10,6 @@ MOA.spss.handbook.clients moa-spss-handbook-clients pom - 2.0 MOA SP/SS Handbook Clients diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml index 3a220fd4d..e9370cd44 100644 --- a/spss/handbook/clients/referencedData/pom.xml +++ b/spss/handbook/clients/referencedData/pom.xml @@ -10,7 +10,6 @@ MOA.spss.handbook moa-spss-handbook-referencedData war - 2.0 MOA SP/SS Handbook Referenced Data diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml index 50850b592..9a98ce472 100644 --- a/spss/handbook/clients/webservice/pom.xml +++ b/spss/handbook/clients/webservice/pom.xml @@ -6,10 +6,8 @@ 4.0.0 - MOA.spss.handbook.clients moa-spss-handbook-webserviceClient jar - 2.0 MOA SP/SS Handbook WebService Client -- cgit v1.2.3 From 33a37cce841e6c48ab044cd153aa7ed7cfffc6cc Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 14 Jan 2015 12:41:54 +0100 Subject: Apply some minor fixes. - Add some FIXMEs. - Fix moa-id-auth web.xml and switch to Servlet 3.0. - Fix moa-id-auth logging (replace commons-logging with commons-logging-slf4j bridge, use log4j native binding). - Adjust logging of periodical tasks (no more logging at info level). --- .../auth/pvp2/servlets/Authenticate.java | 1 + id/server/auth/pom.xml | 21 +++++++++++++++++++++ .../moa/id/auth/MOAIDAuthInitializer.java | 2 +- .../moa/id/config/auth/AuthConfigLoader.java | 2 +- .../moa/id/commons/utils/ssl/SSLUtils.java | 1 + 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java index 390b8c476..f7406c42e 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/servlets/Authenticate.java @@ -84,6 +84,7 @@ public class Authenticate extends HttpServlet { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); try { + // FIXME[tlenz]: Neither DocumentBuilderFactory nor DocumentBuilder is guaranteed to be thread-safe! builder = factory.newDocumentBuilder(); } catch (ParserConfigurationException e) { log.warn("PVP2 AuthenticationServlet can not be initialized.", e); diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index dd75ee6aa..7db6ce648 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -112,11 +112,25 @@ axis-wsdl4j axis + + commons-logging + commons-logging + MOA.id.server moa-id-lib + + + commons-logging + commons-logging + + + ch.qos.logback + logback-classic + + eu.stork @@ -173,6 +187,13 @@ provided + + + org.slf4j + jcl-over-slf4j + 1.7.10 + + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java index c3575470f..d4ce8670e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java @@ -148,7 +148,7 @@ public class MOAIDAuthInitializer { } } - // FIXME[@tlenz]: iaik.prod:iaik_X509TrustManager requires iaik.IAIKRuntimeException (should have been moved from iaik.server.modules (iaik.prod:iaik_moa:1.51)) + // FIXME[@tlenz]: iaik.prod:iaik_X509TrustManager requires iaik.IAIKRuntimeException which might have been moved to iaik.server.modules (iaik.prod:iaik_moa:1.51)) // Initializes IAIKX509TrustManager logging /* String log4jConfigURL = System.getProperty("log4j.configuration"); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java index b02c0946c..593b72658 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java @@ -40,7 +40,7 @@ public class AuthConfigLoader implements Runnable { try { Thread.sleep(INTERVAL * 1000); - Logger.info("check for new config."); + Logger.trace("check for new config."); MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration(); if (moaidconfig != null) { diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java index 68437a04d..dfd549b6a 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java @@ -177,6 +177,7 @@ public class SSLUtils { // This call fixes a bug occuring when PKIConfiguration is // initialized by the MOA-SP initialization code, in case // MOA-SP is called by API + // FIXME[tlenz]: Requires IAIKX509TrustManager (iaik.prod:iaik_X509TrustManager requires iaik.IAIKRuntimeException which might have been moved to iaik.server.modules (iaik.prod:iaik_moa:1.51))) MOAIDTrustManager.initializeLoggingContext(); IAIKX509TrustManager tm = new MOAIDTrustManager(acceptedServerCertURL); tm.init(cfg, profile); -- cgit v1.2.3 From 4bf73cfd794a8ecb90c856d97e2aabdcb443f8e8 Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Fri, 16 Jan 2015 08:32:36 +0100 Subject: modified handbook --- id/server/doc/handbook/additional/additional.html | 1 + .../doc/handbook/application/application.html | 1 + id/server/doc/handbook/common/MOA.css | 85 +++++++++++++++------- id/server/doc/handbook/config/config.html | 1 + id/server/doc/handbook/index.html | 1 + id/server/doc/handbook/install/install.html | 1 + .../handbook/interfederation/interfederation.html | 1 + id/server/doc/handbook/intro/intro.html | 3 +- id/server/doc/handbook/protocol/protocol.html | 1 + 9 files changed, 66 insertions(+), 29 deletions(-) diff --git a/id/server/doc/handbook/additional/additional.html b/id/server/doc/handbook/additional/additional.html index a4f7739fd..bb3d73c5b 100644 --- a/id/server/doc/handbook/additional/additional.html +++ b/id/server/doc/handbook/additional/additional.html @@ -5,6 +5,7 @@ MOA-ID - Zusatzinformationen +
      diff --git a/id/server/doc/handbook/application/application.html b/id/server/doc/handbook/application/application.html index 3558a6e09..ee03e4ed4 100644 --- a/id/server/doc/handbook/application/application.html +++ b/id/server/doc/handbook/application/application.html @@ -5,6 +5,7 @@ MOA-ID - Anwendungen +
      diff --git a/id/server/doc/handbook/common/MOA.css b/id/server/doc/handbook/common/MOA.css index 03390e729..f8fd01d8c 100644 --- a/id/server/doc/handbook/common/MOA.css +++ b/id/server/doc/handbook/common/MOA.css @@ -7,24 +7,29 @@ body { - font-family: sans-serif; + font-family: "Roboto", sans-serif; + color: #000; font-size: medium; - font-weight: normal; + font-weight: 300; margin-left: 0px; margin-right: 0px; margin-top: 0px; background-color: white; + letter-spacing: 0.05em; } - +b{ + font-weight: 500; +} p { margin-top: 0pt; margin-bottom: 0.5em; - text-align: justify + text-align: justify; + } .centeredimage{ @@ -49,6 +54,12 @@ p list-style-type: none; } +td{ + font-weight: 300; +} + + + pre { font-family: "Courier New", monospace; @@ -93,6 +104,7 @@ table.configtable{ border-style:solid; border-color: #404040; border-width: 2px; + font-family: "Roboto",sans-serif } table.configtable th{ border-style:solid; @@ -100,6 +112,10 @@ table.configtable th{ border-width: 2px; padding:3px; } +table.configtable th{ + font-weight: 300; + font-size: 120%; +} table.configtable td{ border-style:solid; border-color: #404040; @@ -107,52 +123,64 @@ table.configtable td{ border-left-width: 2px; border-right-width: 2px; padding:3px; + font-weight: 300; } th { text-align: left; + +} + +h1 +{ + font-size: 220%; + font-weight: 400; } h2 { - - font-size: 150%; - font-weight: bold; + letter-spacing: 1px; + font-size: 170%; + font-weight: 300; } h3 { - - font-size: 133%; - font-weight: bolder; + letter-spacing: 1px; + font-size: 160%; + font-weight: 300; } h4 { - font-size: 110%; - font-weight: bolder; + letter-spacing: 1px; + font-size: 150%; + font-weight: 300; } h5 { - font-size: 100%; - font-weight: bolder; + letter-spacing: 1px; + font-size: 140%; + font-weight: 300; } h6 { - font-size: 90%; - font-weight: bold; + letter-spacing: 1px; + font-size: 130%; + font-weight: 300; } code { - font-family: "Courier New", Courier, monospace; + font-family: "Roboto","Courier New", Courier, monospace; font-size: 90%; + font-weight: 400; color: #000000; } @@ -176,7 +204,8 @@ dt a{ ol { margin-top: 0.5em; - margin-bottom: 0.5em + margin-bottom: 0.5em; + padding-left:0.8em; } ol.alpha @@ -206,7 +235,7 @@ a{ text-align: left; font-size: 200%; color: #000000; - font-family: sans-serif; + font-family: "Roboto", sans-serif; margin-top: 0.4em; margin-bottom: 0.4em; } @@ -216,7 +245,7 @@ a{ text-align: left; font-size: 133%; color: #000000; - font-family: sans-serif; + font-family: "Roboto", sans-serif; margin-top: 0.4em; margin-bottom: 0.4em } @@ -229,7 +258,7 @@ a{ .example { - font-family: "Courier New", monospace; + font-family: "Roboto", sans-serif; background-color: #CCFFFF; color: #000000; margin: 0pt 0pt; @@ -247,7 +276,7 @@ a{ .documentinfo { - font-family: sans-serif; + font-family: "Roboto", sans-serif; font-size: 100%; } @@ -295,7 +324,7 @@ a{ .strongerterm { font-style: italic; - font-weight: 600; + font-weight: 500; } @@ -323,8 +352,8 @@ a{ .added12 { color: #FF0000; - text-decoration: underline -; background-color: #F8F0FF + text-decoration: underline; + background-color: #F8F0FF; } .deleted12 @@ -352,8 +381,8 @@ li.faq { color: #000080; font-size: 100%; - font-family: sans-serif; - font-weight: normal; + font-family: "Roboto", sans-serif; + font-weight: 300; margin-bottom: 0.4em; } /*********************************/ @@ -371,7 +400,7 @@ li.faq #headline h1 { color: #404040; padding-right: 1em; - padding-top: 0.3em; + padding-top: 0.15em; margin-bottom: 0; float: right; } diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html index 78661e483..4fbc02d92 100644 --- a/id/server/doc/handbook/config/config.html +++ b/id/server/doc/handbook/config/config.html @@ -5,6 +5,7 @@ MOA-ID - Konfiguration + diff --git a/id/server/doc/handbook/index.html b/id/server/doc/handbook/index.html index d1b01a55d..4555f2f05 100644 --- a/id/server/doc/handbook/index.html +++ b/id/server/doc/handbook/index.html @@ -5,6 +5,7 @@ MOA ID - Übersicht + + + org.springframework.web.context.ContextLoaderListener + + + + + requestContextFilter + org.springframework.web.filter.RequestContextFilter + + + requestContextFilter + /* + + - GenerateIframeTemplate - GenerateIframeTemplate Generate BKU Request template + GenerateIframeTemplate + GenerateIframeTemplate at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet - RedirectServlet RedirectServlet + RedirectServlet at.gv.egovernment.moa.id.auth.servlet.RedirectServlet - MonitoringServlet MonitoringServlet + MonitoringServlet at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet - SSOSendAssertionServlet SSOSendAssertionServlet + SSOSendAssertionServlet at.gv.egovernment.moa.id.auth.servlet.SSOSendAssertionServlet - LogOut - LogOut SSO LogOut + LogOut + LogOut at.gv.egovernment.moa.id.auth.servlet.LogOutServlet - IDPSLO - IDP-SLO IDP Single LogOut Service + IDP-SLO + IDPSLO at.gv.egovernment.moa.id.auth.servlet.IDPSingleLogOutServlet - VerifyIdentityLink - VerifyIdentityLink Verify identity link coming from security layer + VerifyIdentityLink + VerifyIdentityLink at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet - VerifyCertificate - VerifyCertificate Verify the certificate coming from security layer + VerifyCertificate + VerifyCertificate at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet - GetMISSessionID - GetMISSessionID Get the MIS session ID coming from security layer + GetMISSessionID + GetMISSessionID at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet - GetForeignID - GetForeignID Gets the foreign eID from security layer + GetForeignID + GetForeignID at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet - VerifyAuthBlock - VerifyAuthBlock Verify AUTH block coming from security layer + VerifyAuthBlock + VerifyAuthBlock at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet - AxisServlet Apache-Axis Servlet + AxisServlet org.apache.axis.transport.http.AxisServlet @@ -100,18 +117,18 @@ org.apache.jasper.servlet.JspServlet --> - PEPSConnectorServlet - PEPSConnectorServlet Servlet receiving STORK SAML Response Messages from different C-PEPS + PEPSConnectorServlet + PEPSConnectorServlet at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet - PEPSConnectorWithLocalSigningServlet - PEPSConnectorWithLocalSigningServlet Servlet receiving STORK SAML Response Messages from different C-PEPS + PEPSConnectorWithLocalSigningServlet + PEPSConnectorWithLocalSigningServlet at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet @@ -124,8 +141,8 @@ 1 --> - DispatcherServlet Dispatcher Servlet + DispatcherServlet at.gv.egovernment.moa.id.entrypoints.DispatcherServlet 1 diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html index 7e2ddc491..f19cc5320 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html @@ -794,13 +794,13 @@
      - + + + + + + + Date: Fri, 16 Jan 2015 10:29:11 +0100 Subject: modified moa-id auth start page --- id/server/auth/src/main/webapp/common/MOA.css | 617 --------------------- .../auth/src/main/webapp/common/logo_digAT.png | Bin 0 -> 22964 bytes id/server/auth/src/main/webapp/common/main.css | 253 +++++++++ id/server/auth/src/main/webapp/index.html | 193 +++---- id/server/doc/handbook/common/LogoBKA.png | Bin 8062 -> 0 bytes 5 files changed, 344 insertions(+), 719 deletions(-) delete mode 100644 id/server/auth/src/main/webapp/common/MOA.css create mode 100644 id/server/auth/src/main/webapp/common/logo_digAT.png create mode 100644 id/server/auth/src/main/webapp/common/main.css delete mode 100644 id/server/doc/handbook/common/LogoBKA.png diff --git a/id/server/auth/src/main/webapp/common/MOA.css b/id/server/auth/src/main/webapp/common/MOA.css deleted file mode 100644 index b7a2b9280..000000000 --- a/id/server/auth/src/main/webapp/common/MOA.css +++ /dev/null @@ -1,617 +0,0 @@ -body -{ - font-family: "Times New Roman", Times, serif; - font-size: medium; - font-weight: normal; - margin-left: 2.5em; - margin-right: 2.5em; - background-color: white; - text: #000000; - link: #990000; - vlink: #666666; - alink: #cc9966; -} - - - -p -{ - margin-top: 0pt; - margin-bottom: 0.5em; - text-align: justify -} - -pre -{ - font-family: "Courier New", monospace; - font-size: 90%; - background-color: #cccccc; - color: #000000; - margin-left:1.5%; - margin-right:1.5%; - margin-top: 1em; - margin-bottom: 1em; - border: #008000 none; -} - -hr -{ - color: #000080; - background-color: #000080; - margin-top: 0.5em; - margin-bottom: 0.5em; -} - -table.fixedWidth -{ - width: 97%; - margin-left:1.5%; - margin-right:1.5%; - margin-top: 1em; - margin-bottom: 1em; -} - - -table.varWidth -{ - margin-left:1.5%; - margin-top: 1em; - margin-bottom: 1em; -} - -th -{ - text-align: left; -} - -h1 -{ - color: #000000; - text-align: left; - font-size: 167%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; -} - -h2 -{ - color: #000000; - font-size: 150%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; -} - -h3 -{ - color: #000000; - font-size: 133%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; -} - -h4 -{ - color: #000000; - font-size: 116%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; -} - -h5 -{ - color: #000000; - font-size: 100%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; -} - -h6 -{ - color: #000000; - font-size: 83%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - background-color:#999; -} - -code -{ - font-family: "Courier New", Courier, monospace; - font-size: 90%; - color: #000000 -} - -dd -{ - margin-top: 0.8em; - margin-bottom: 0.8em; - text-align: justify - -} - -dt -{ - margin-top: 0.8em; - font-family: Arial, Helvetica, sans-serif; - color: #000080 -} - -ol -{ - margin-top: 0.5em; - margin-bottom: 0.5em -} - -ol.alpha -{ - list-style-type: lower-alpha -} - -li -{ - margin-top: 0.25em; - margin-bottom: 0.25em; - text-align: justify -} - -a:hover -{ - color: #990000 -} - - -.title -{ - text-align: left; - font-size: 200%; - color: #000000; - font-family: Arial, Helvetica, sans-serif; - margin-top: 0.4em; - margin-bottom: 0.4em; - background-color:#999; -} - -.subtitle -{ - text-align: left; - font-size: 133%; - color: #000000; - font-family: Arial, Helvetica, sans-serif; - margin-top: 0.4em; - margin-bottom: 0.4em -} - -.glossaryTerm -{ - font-style: italic; - color: #006699 -} - -.example -{ - font-family: "Courier New", monospace; - background-color: #CCFFFF; - color: #000000; - margin: 0pt 0pt; - border: #008000 none -} - -.schema -{ - font-family: "Courier New", monospace; - background-color: #FFFFCC; - color: #000000; - margin: 0pt 0pt; - border: #008000 none -} - -.documentinfo -{ - font-family: Arial, Helvetica, sans-serif; - font-size: 100%; -} - -.ol-contents -{ - font-size: 100%; - margin-top: 0.0em; - margin-bottom: 0.0em; -} - -.li-contents -{ - font-size: 100%; - margin-top: 0.0em; - margin-bottom: 0.0em; -} - -.logoTitle -{ - text-align: center; - font-size: 200%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; -} - -.logoTable -{ - margin-bottom: 0px; - margin-left: 0px -} - -.superscript -{ - vertical-align: super; - font-size: 66%; -} - -.term -{ - font-style: italic; -} - -.comment -{ - color: #000000; - background: #ffff00; - font-style: italic -} - -.addedErrata12 -{ - color: #FF0000; - background-color: #FFEEEE; - text-decoration: underline -} - -.deletedErrata12 -{ - color: #999999; - background-color: #EEEEEE; - text-decoration: line-through -} - -.added12 -{ - color: #FF0000; - text-decoration: underline -; background-color: #F8F0FF -} - -.deleted12 -{ - color: #999999; - text-decoration: line-through -; background-color: #f8f0ff -} - -.rfc2119Keyword -{ - font-variant: small-caps; - font-style: normal; -} - -.remark { font-style: italic} - -li.faq -{ - margin-top: 1.5em; - margin-bottom: 1.5em; -} - -.faq-question -{ - color: #000080; - font-size: 100%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - margin-bottom: 0.4em; -} - - -/*body -{ - font-family: "Times New Roman", Times, serif; - font-size: medium; - font-weight: normal; - margin-left: 2.5em; - margin-right: 2.5em; -} - -p -{ - margin-top: 0pt; - margin-bottom: 0.5em; - text-align: justify -} - -pre -{ - font-family: "Courier New", monospace; - font-size: 90%; - background-color: #cccccc; - color: #000000; - margin-left:1.5%; - margin-right:1.5%; - margin-top: 1em; - margin-bottom: 1em; - border: #008000 none; -} - -hr -{ - color: #000080; - background-color: #000080; - margin-top: 0.5em; - margin-bottom: 0.5em; -} - -table.fixedWidth -{ - width: 97%; - margin-left:1.5%; - margin-right:1.5%; - margin-top: 1em; - margin-bottom: 1em; -} - - -table.varWidth -{ - margin-left:1.5%; - margin-top: 1em; - margin-bottom: 1em; -} - -th -{ - text-align: left; -} - -h1 -{ - color: #000080; - text-align: left; - font-size: 167%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h2 -{ - color: #000080; - font-size: 150%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h3 -{ - color: #000080; - font-size: 133%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h4 -{ - color: #000080; - font-size: 116%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h5 -{ - color: #000080; - font-size: 100%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -h6 -{ - color: #000080; - font-size: 83%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal -} - -code -{ - font-family: "Courier New", Courier, monospace; - font-size: 90%; - color: #000000 -} - -dd -{ - margin-top: 0.8em; - margin-bottom: 0.8em; - text-align: justify - -} - -dt -{ - margin-top: 0.8em; - font-family: Arial, Helvetica, sans-serif; - color: #000080 -} - -ol -{ - margin-top: 0.5em; - margin-bottom: 0.5em -} - -ol.alpha -{ - list-style-type: lower-alpha -} - -li -{ - margin-top: 0.25em; - margin-bottom: 0.25em; - text-align: justify -} - -a:hover -{ - color: #990000 -} - - -.title -{ - text-align: left; - font-size: 167%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; - margin-top: 0.4em; - margin-bottom: 0.4em -} - -.subtitle -{ - text-align: left; - font-size: 133%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; - margin-top: 0.4em; - margin-bottom: 0.4em -} - -.glossaryTerm -{ - font-style: italic; - color: #006699 -} - -.example -{ - font-family: "Courier New", monospace; - background-color: #CCFFFF; - color: #000000; - margin: 0pt 0pt; - border: #008000 none -} - -.schema -{ - font-family: "Courier New", monospace; - background-color: #FFFFCC; - color: #000000; - margin: 0pt 0pt; - border: #008000 none -} - -.documentinfo -{ - font-family: Arial, Helvetica, sans-serif; - font-size: 100%; -} - -.ol-contents -{ - font-size: 100%; - margin-top: 0.0em; - margin-bottom: 0.0em; -} - -.li-contents -{ - font-size: 100%; - margin-top: 0.0em; - margin-bottom: 0.0em; -} - -.logoTitle -{ - text-align: center; - font-size: 133%; - color: #000080; - font-family: Arial, Helvetica, sans-serif; -} - -.logoTable -{ - margin-bottom: 0px; - margin-left: 0px -} - -.superscript -{ - vertical-align: super; - font-size: 66%; -} - -.term -{ - font-style: italic; -} - -.comment -{ - color: #000000; - background: #ffff00; - font-style: italic -} - -.addedErrata12 -{ - color: #FF0000; - background-color: #FFEEEE; - text-decoration: underline -} - -.deletedErrata12 -{ - color: #999999; - background-color: #EEEEEE; - text-decoration: line-through -} - -.added12 -{ - color: #FF0000; - text-decoration: underline -; background-color: #F8F0FF -} - -.deleted12 -{ - color: #999999; - text-decoration: line-through -; background-color: #f8f0ff -} - -.rfc2119Keyword -{ - font-variant: small-caps; - font-style: normal; -} - -.remark { font-style: italic} - -li.faq -{ - margin-top: 1.5em; - margin-bottom: 1.5em; -} - -.faq-question -{ - color: #000080; - font-size: 100%; - font-family: Arial, Helvetica, sans-serif; - font-weight: normal; - margin-bottom: 0.4em; -} -*/ \ No newline at end of file diff --git a/id/server/auth/src/main/webapp/common/logo_digAT.png b/id/server/auth/src/main/webapp/common/logo_digAT.png new file mode 100644 index 000000000..4f36681e2 Binary files /dev/null and b/id/server/auth/src/main/webapp/common/logo_digAT.png differ diff --git a/id/server/auth/src/main/webapp/common/main.css b/id/server/auth/src/main/webapp/common/main.css new file mode 100644 index 000000000..6bd964346 --- /dev/null +++ b/id/server/auth/src/main/webapp/common/main.css @@ -0,0 +1,253 @@ +html { + font-family: "Roboto", sans-serif; + color: #000; + font-weight:300; +} + +.container { + margin: auto; + max-width: 1000px; + padding-left: 20px; + padding-right: 20px; +} + +body { + margin: 0; + padding: 0; + letter-spacing: 0.05em; +} + +h1 +{ +font-family: "Roboto", sans-serif; +} + +#headline { + /*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/ + background: linear-gradient(#FAFAFA, #F5F5F5); + border-bottom: 1px solid #EEE; +} + +#headline br { + clear: both; +} + +#headline h1 { + color: #404040; + padding-right: 1em; + padding-top: 0.3em; + margin-bottom: 0; + float: right; + font-size: 220%; + font-weight: 400; + } +#headline img { + width: 300px; + padding-left: 0; + padding-top: 35px; + padding-bottom:20px; + } + +#description { + text-align: justify; +} + +#maincontent { + height: 13em; +} + +#demologin p { + padding-left: 10px; + padding-right: 10px; + text-align: justify; + font-size: 100%; + color: #000; + padding-top:20px; + +} + +#demologin a{ + +} + +.button { + border-radius: 5px; + /*background-color: rgb(41,127,184); */ + background-color: #E10319; + text-decoration: none; + text-transform: uppercase; + padding: 10px 80px 10px 80px; + letter-spacing: 1.5px; + text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.3); + color: WHITE; + box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); + margin-left: 10px; +} + +.button:hover { + box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.8); + text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.9); +} + +#singlelogout { + clear: both; + width: 100%; + box-sizing: border-box; + +} +a{ + text-decoration: none; + font-size:100%; + color: #666; +} +a:hover{ + text-decoration: none; + font-size:100%; + color: #E10319; +} + +/*****************************/ +@media ( max-width :599px) { + #headline { + /*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/ + background: linear-gradient(#FAFAFA, #F5F5F5); + border-bottom: 1px solid #EEE; + } + + #headline img { + width: 150px; + padding-left: 0; + padding-top: 0.5em; + padding-bottom:0.5em; + } + #headline br { + clear: both; + } + #headline h1 {font-family: "Roboto", sans-serif; + color: #404040; + padding: 0; + margin-bottom: 0; + margin-top: 0; + text-align: center; + } + nav { + display: block; + width: 100%; + text-align: center; + box-sizing: border-box; + color: WHITE; + margin: 0px 0px 0px 0px; + overflow: hidden; + + } + nav ul { + margin: 0; + padding: 0; + } + nav ul li { + list-style-type: none; + padding-top: 2px; + padding-bottom: 2px; + } + nav>ul>li>a { + color: #666; + display: block; + text-decoration: none; + } + nav>ul>li:hover { + color: #404040; + } + nav>ul>li:hover>a { + color: #404040; + } + nav>ul>li:active>a { + color: #404040; + } + #demologin { + width: 100%; + box-sizing: border-box; + border: 1px solid; + border-radius: 1px; + border-color: #818286; + background: #F5F5F5; + height: 182px; + width: 242px; + margin-top: 18px; + padding-left:0; + } +} +/*****************************/ +@media ( min-width :600px) { + #headline { + /*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/ + background: linear-gradient(#FAFAFA, #F5F5F5); + border-bottom: 1px solid #EEE; + + } + #headline br { + clear: both; + } + + #headline h1 { + color: #404040; + padding-right: 1em; + padding-top: 0.15em; + margin-bottom: 0; + float: right; + } + #headline img { + width: 300px; + padding-left: 0; + padding-top: 35px; + padding-bottom:20px; + } + nav { + display: block; + float: left; + width: 30%; + box-sizing: border-box; + background-color: #fff; + color: #888; + margin: 8px 0px 8px 0px; + overflow: hidden; + } + nav ul { + margin: 0; + padding: 0; + } + nav ul li { + list-style-type: none; + padding-top: 15px; + } + nav>ul>li>a { + color: #666; + display: block; + text-decoration: none; + } + nav>ul>li:hover { + color: #E10319; + } + nav>ul>li:hover>a { + color: #E10319; + } + nav>ul>li:active>a { + color: #E10319; + } + #demologin { + float: right; + width: 50%; + box-sizing: border-box; + border: 1px solid; + border-radius: 1px; + border-color: #818286; + background: #F5F5F5; + height: 282px; + width: 342px; + margin-right: 150px; + margin-top: 18px; + padding-left:0; + } + #demologin a:hover{ + color:white; + } +} \ No newline at end of file diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html index 391195def..381d8d82d 100644 --- a/id/server/auth/src/main/webapp/index.html +++ b/id/server/auth/src/main/webapp/index.html @@ -1,102 +1,91 @@ - - - - - MOA-ID 2.1.x - - - - - - - - - -
      Logo BKA Logo EGIZ
      -
      -

      MOA-ID 2.1.2

      -
      -

      Inhalt

      -
        -
      1. Allgemeines -
          -
        1. Externe Services
        2. -
        -
      2. -
      3. MOA-ID-Auth -
          -
        1. Ablauf einer Anmeldung
        2. -
        -
      4. -
      5. MOA-ID-Configuration
      6. -
      -
      -

      1 Allgemeines

      -

      Das Module MOA-ID-Auth kann von Anwendungen zur Identifizierung und Authentifizierung im Rahmen eines Anmeldeprozesses an einer Online-Applikation verwendet werden. Die Konfiguration des Modules MOA-ID-Auth erfolgt mit Hilfe des Zusatzmodules MOA-ID-Configuration welches eine web-basierte Konfigurationsschnittstelle zur Verfügung stellt.

      -

      Das nachfolgende Blockdiagramm zeigt Struktur von MOA-ID und gibt eine kurze Beschreibung der einzelnen Komponenten.

      -

      Architektur MOA-ID

      -

       

      -

      MOA-ID besteht aus folgenden Kernkomponenten:

      -
        -
      1. CORE LOGIC: Diese Komponente ist die zentrale Logik zur Steuerung der einzelnen Prozesse innerhalb MOA-ID 2.x.
      2. -
      3. Protocol Adapter: Stellt die in MOA-ID 2.x unterstützten Authentifizierungsprotokolle für die Anbindung von Service Providern zur Verfügung.
      4. -
      5. Auth Sources: Stellt die von MOA-ID 2.x unterstützten Identifikationsmechanismen und Single Sign-On Management Funktionen zur Verfügung. Dies sind die österreichische Bürgerkarte oder Handy-Signatur, die Anmeldung ausländischer Personen mit Hilfe des STORK Protokoll oder mittels Single Sign-On von einem weiteren vertrauenswürdigen Identity Provider (Interfederation). Dieses Modul beinhaltet somit alle jene Funktionen welche für den Authentifizierungs- oder Abmeldeprocess erforderlich sind.
      6. -
      7. Template Generator: Der Template Generator erzeugt für Service Provider die entsprechenden Login-Masken für die Integration in die eigene Web-Applikation.
      8. -
      9. SSO Module: Das Single Sign-On (SSO) Modul verwaltet die zusätzlichen Operationen die sich aus der Umsetzung von SSO ergeben. Dies umfasst im Besonderen das SSO Session-Management.
      10. -
      11. Statistic Module: Dieses Modul dient zur Generierung von anonymisierten Statistikdaten aus den Anmeldeinformationen.
      12. -
      13. Monitoring & Testing Module: Dieses Modul implementiert Methoden mit deren Hilfe einzelne funktionale Bereiche aus MOA-ID-Auth getestet werden können. Somit dient dieses Modul als Schnittstellte zu einem externen Monitoring-Service.
      14. -
      15. Configuration Modul: Dieses Modul stellt die Schnittstelle zur MOA-ID-Auth Konfiguration dar welche in einer Datenbank abgelegt wird.
      16. -
      17. Konfigurationstool: Oberfläche, mit deren Hilfe MOA-ID konfiguriert werden kann. Dies umfasst sowohl allgemeine Konfigurationsteile als auch die Konfiguration der einzelnen bei MOA-ID-Auth registrierten Online-Applikationen. Service Provider können sich am Konfigurationstool mittels Bürgerkarte oder Handy-Signatur anmelden und ihre Online-Applikationen verwalten.
      18. -
      -

      1.1 Externe Services

      -

      Für die Anmeldung in Vertretung und die Anmeldung ausländischer Personen werden zusätzliche externe Services verwendet.

      -

      1.1.1 Online-Vollmachten

      -

      Ab der MOA-ID Release 1.5.0 werden Online-Vollmachten (für Anwendungen aus dem öffentlichen Bereich) unterstützt. Hierzu werden diese Vollmachten über eine Online-Vollmachten-Service ausgewählt. Der Zugang zu diesem Online-Vollmachten Service ist über eine Client-Server Authentifizierung abgesichert. Als Client-Zertifikate werden Zertifikate der Firmen A-Trust bzw. A-CERT, die mit der Verwaltungs- oder Dienstleistereigenschaft versehen sind, akzeptiert.

      -

      1.1.2 Ausländische Bürger

      -

      Ab der MOA-ID Release 1.4.7 ist es möglich, dass sich auch ausländische Bürger mittels MOA-ID einloggen können. Hierzu wird eine Verbindung zu einem sogenannten Stammzahlenregister-Gateway aufgebaut, dass basierend auf den Zertifikatsdaten des ausländischen Bürgers eine Eintragung im Ergänzungsregister für natürliche Personen gemäß E-Government Gesetz §6(5) vornimmt. Somit ist es möglich, dass eine Personenbindung ausgestellt werden kann, die in weitere Folge an MOA-ID weitergeleitet wird. Der Zugang zu diesem Stammzahlenregister-Gateway ist über eine Client-Server Authentifizierung abgesichert. Als Client-Zertifikate werden Zertifikate der Firmen A-Trust bzw. A-CERT, die mit der Verwaltungs- oder Dienstleistereigenschaft versehen sind, akzeptiert.

      -

      2 MOA-ID-Auth

      -

      Das Modul MOA-ID-Auth dient der Identifizierung und Authentifizierung im Rahmen eines Anmeldevorgangs an einer Online-Applikation. Die Identifizierung und Authentifizierung erfolgt mit Bürgerkartem, Handy-Signatur oder für ausändische Personen mittels STORK.

      -

      Die Funktionalität und der Aufbau der Schnittstellen des Modules MOA-ID-Auth in Richtung Online-Applikation wird im Kapitel Protokolle beschriebe. -

      Für den Betrieb von MOA-ID-Auth ist der Einsatz von MOA-Signaturprüfung (MOA-SP) erforderlich.

      -

      2.1 Ablauf einer Anmeldung

      -

      Die nachfolgende Grafik beschreibt den Ablauf eines Abmeldevorgangs an einer Online-Applikation mit Hilfe von MOA-ID-Auth unter Verwendung der Bürgerkarte oder der Handy-Signatur.

      -

      Sequenzdiagramm eines Anmeldevorgangs mit MOA-ID-Auth

      -

       

      -
        -
      1. Der Benutzer verbindet sich zu einem Web-Portal (Service Provider) über das die Online-Applikation erreichtbar ist. Nach der Betätigung eines Login-Buttons wird der Anmeldevorgang ausgelöst.
      2. -
      3. Der Benutzer wird zur Identifizierung und Authentifizierung an MOA-ID-Auth weitergeleitet.
      4. -
      5. MOA-ID-Auth validiert die Authentifizierungsanfrage des Service Providers
      6. -
      7. MOA-ID-Auth bietet dem Benutzer eine Auswahl von verfügbaren Authentifizierungsmethoden (Bürgerkarte, Handy-Signatur, STORK) an.
      8. -
      9. Der Benutzer wählt die gewünschte Authentifizierungsmethode und sendet diese an MOA-ID-Auth.
      10. -
      11. MOA-ID-AUTH erzeugt eine HTML-Seite mit einem <InfoboxReadRequest> zum Auslesen der Personenbindung. Diese HTML-Seite wird an den Browser geschickt.
      12. -
      13. Der Browser schickt den <InfoboxReadRequest> an die ausgewählte Bürgerkartenumgebung unter Verwendung des Security-Layer. Die Bürgerkartenumgebung liest die Personenbindung von der Bürgerkarte und sendet diese an MOA-ID-AUTH. MOA-ID-Auth prüft die Signatur der Personenbindung durch einen Aufruf von MOA-SP.
      14. -
      15. MOA-ID-AUTH erstellt den AUTH-Block. Der AUTH-Block enthält Vor- und Nachname aus der Personenbindung, URL von MOA-ID-AUTH, URL und Geschäftsbereich der Online-Applikation oder im Falle einer SSO Anmeldung die URL und den Geschäftsbereich der MOA-ID-Auth Instanz, die aktuelle Zeit, das aktuelle Datum und einen Zufallswert für diesen Anmeldevorgang. Anschließend wird eine XML Antwortseite, die das Kommando zum Signieren (<CreateXMLSignatureRequest>) des generierten AUTH-Blocks enthält, an die ausgewählte Bürgerkartenumgebung, unter Verwendung des Security-Layers, gesendet.
      16. -
      17. Der Request wird von der Bürgerkartenumgebung verarbeitet. Die signierten Daten werden an MOA-ID-AUTH zurückgesendet.
      18. -
      19. MOA-ID-Auth überprüft den signierten AUTH-Block und generiert Information für weitere Anmeldungen mittels Single Sign-On.
      20. -
      21. MOA-ID-Auth generiert die Anmeldedaten (Assertion) welche folgende Information enthalten: -
          -
        • die bereichsspezifischen Personenkennzeichen (bPK / wbPK)
        • -
        • Vorname, Nachname und Geburtsdatum (optional)
        • -
        • den signierten AUTH-Block (optional)
        • -
        • die Personenbindung (optional)
        • -
        • das Zertifikat mit dem die Signatur erzeugt wurde (optional)
        • -
        • informationen zum Vertreten im Falle einer Anmeldung in Vertretung (optional)
        • -
        • die elektronische Vollmacht im Falle einer Anmeldung in Vertretung (optional)
        • -
        • informationen aus dem STORK Protokoll im Falle einer Anmeldung mittels STORK (optional)
        • -
        -
      22. -
      23. MOA-ID-Auth sendet die Anmeldedaten an den Service-Provider und setzt im Browser des Benutzers ein SSO Session-Tokken welches für weitere Anmeldevorgänge verwendet werden kann.
      24. -
      25. Die Anmeldedaten werden vom Service-Provider verarbeitet und der Benutzer wird vom Service-Provider an die Online-Applikation weitergeleitet.
      26. -
      -

      3 MOA-ID-Configuration

      -

      Das Modul MOA-ID-Configuration stellt eine web-basierte Benutzerschnittstelle zur Konfiguration des Moduls MOA-ID-Auth zur Verfügung, wobei sich die Konfiguration in zwei Teilbereiche unterteilt ist. Eine detailierte Aufstellung der einzelnen Konfigurationspunkte befindet sich im Kapitel Konfiguration.

      -
        -
      1. Allgemeine Konfiguration
        - In diesem Bereich sind alle Basiseinstellungen der MOA-ID-Auth Instanz hinterlegt. Beispiele hierfür sind Single Sign-On, unterstütze Authentifizierungsprotokolle, Informationen zu MOA-ID-Auth, URLs zu externen Services, ... Eine Änderung der Basiseinstellung erfordert besondere Benutzerrechte am Konfigurationstool.
      2. -
      3. Online-Applikationen
        - In diesem Abschnitt erfolgt die Konfiguration der einzelnen bei MOA-ID-Auth registrierten Service-Provider. Hierbei handelt es sich um authentifizierungsprotkollspezifische Einstellungen, Bereich des Service-Providers (öffentlich / Privatwirtschaftlich), Konfiguration der BKU Auswahl, .... Wobei sich die Konfigurationsmöglichkeiten je nachdem welche Benutzerrechten vergeben sind, unterscheiden können.
      4. -
      -

      Zusätzlich unterstützt das Module MOA-ID-Configuration auch eine einfache Bentzerverwaltung mit Rechtevergabe mit deren Hilfe die Verwaltung von Online-Applikatioen an den jeweiligen Service-Provider ausgelagert werden kann. Die Anmeldung am Konfigurationstool erfolgt mittels Bürgerkarte, Handy-Signature oder STORK, wobei optional auch eine Anmeldung mittels Benutzername und Passwort zur Verfügung steht.

      -

       

      - - + + + + + MOA-ID 2.1.x + + + + + + +
      +
      + +

      MOA-ID-AUTH

      +
      +
      +
      +
      +

      Bei MOA-ID-AUTH handelt es sich um ein Modul für die Identifizierung und Authentifizierung bei Onlineapplikationen unter Verwendung der Bürgerkarte. + Hier kann sowohl die Smartcard-Variante (e-Card) als auch die Handysignatur verwendet werden. + Die Konfiguration des Modules MOA-ID-Auth erfolgt mit Hilfe des Zusatzmodules MOA-ID-Configuration welches eine web-basierte Konfigurationsschnittstelle zur Verfügung stellt.

      +
      +
      + +
      +
      + Login +

      Über den Login-Button können Sie sich anschließend bei Ihrer Online-Applikation mit der Bürgerkarte oder der Handysignatur anmelden. Dazu müssen Sie allerdings zuvor die Applikation gemäß Beschreibung konfigurieren.

      +
      +
      + + + \ No newline at end of file diff --git a/id/server/doc/handbook/common/LogoBKA.png b/id/server/doc/handbook/common/LogoBKA.png deleted file mode 100644 index 6a92647fd..000000000 Binary files a/id/server/doc/handbook/common/LogoBKA.png and /dev/null differ -- cgit v1.2.3 From 098357d27cab4a43aa8bd911960e16a1cf69726a Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 16 Jan 2015 11:00:58 +0100 Subject: add HTTP Proxy support to MIS and SZR-GW webservice request methods --- .../validator/parep/client/szrgw/SZRGWClient.java | 3 +- .../id/util/client/mis/simple/MISSimpleClient.java | 3 +- .../commons/utils/HttpClientWithProxySupport.java | 61 ++++++++++++++++++++++ .../apache/commons/httpclient/MOAHttpClient.java | 8 --- pom.xml | 5 ++ 5 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/HttpClientWithProxySupport.java diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java index e1cd59c26..61b26b59a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java @@ -65,6 +65,7 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Text; import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils; +import at.gv.egovernment.moa.id.commons.utils.HttpClientWithProxySupport; import at.gv.egovernment.moa.util.Constants; import at.gv.egovernment.moa.util.DOMUtils; @@ -137,7 +138,7 @@ public class SZRGWClient { if (address == null) { throw new NullPointerException("Address (SZR-gateway ServiceURL) must not be null."); } - HttpClient client = new HttpClient(); + HttpClient client = HttpClientWithProxySupport.getHttpClient(); PostMethod method = new PostMethod(address); method.setRequestHeader("SOAPAction", ""); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java index ab8d19803..24c96a78f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java @@ -71,6 +71,7 @@ import org.xml.sax.SAXException; import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException; import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWSecureSocketFactory; +import at.gv.egovernment.moa.id.commons.utils.HttpClientWithProxySupport; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.DOMUtils; import at.gv.egovernment.moa.util.StringUtils; @@ -301,7 +302,7 @@ public class MISSimpleClient { throw new NullPointerException("Argument request must not be null."); } try { - HttpClient httpclient = new HttpClient(); + HttpClient httpclient = HttpClientWithProxySupport.getHttpClient(); PostMethod post = new PostMethod(webServiceURL); StringRequestEntity re = new StringRequestEntity(DOMUtils.serializeNode(packIntoSOAP(request)),"text/xml", "UTF-8"); post.setRequestEntity(re); diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/HttpClientWithProxySupport.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/HttpClientWithProxySupport.java new file mode 100644 index 000000000..733c03bf0 --- /dev/null +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/HttpClientWithProxySupport.java @@ -0,0 +1,61 @@ +/* + * 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.commons.utils; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.UsernamePasswordCredentials; +import org.apache.commons.httpclient.auth.AuthScope; + +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; + +/** + * @author tlenz + * + */ +public class HttpClientWithProxySupport { + + public static HttpClient getHttpClient() { + HttpClient client = new HttpClient(); + + String host = System.getProperty("http.proxyHost"); //$NON-NLS-1$ + String port = System.getProperty("http.proxyPort"); //$NON-NLS-1$ + if (MiscUtil.isNotEmpty(host) && + MiscUtil.isNotEmpty(port)) { + int p = Integer.parseInt(port); + client.getHostConfiguration().setProxy(host, p); + Logger.info("Initial HTTPClient with proxy usage. " + + "ProxyHost=" + host + + " ProxyPort=" + port); + + String user = System.getProperty("http.proxyUser"); //$NON-NLS-1$ + String pass = System.getProperty("http.proxyPassword"); //$NON-NLS-1$ + if (MiscUtil.isNotEmpty(user) && pass != null) { + client.getState().setProxyCredentials(new AuthScope(host, p), + new UsernamePasswordCredentials(user, pass)); + + } + } + return client; + } +} diff --git a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java index d708c2603..758209193 100644 --- a/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java +++ b/id/server/moa-id-commons/src/main/java/org/apache/commons/httpclient/MOAHttpClient.java @@ -26,16 +26,8 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import org.apache.commons.httpclient.HostConfiguration; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpException; -import org.apache.commons.httpclient.HttpMethod; -import org.apache.commons.httpclient.HttpMethodDirector; -import org.apache.commons.httpclient.HttpState; -import org.apache.commons.httpclient.URI; import org.apache.commons.httpclient.protocol.Protocol; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; -import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; import at.gv.egovernment.moa.id.commons.ex.MOAHttpProtocolSocketFactoryException; diff --git a/pom.xml b/pom.xml index d783ebc95..6d5b531c1 100644 --- a/pom.xml +++ b/pom.xml @@ -217,6 +217,11 @@ commons-httpclient 3.1 + + org.apache.httpcomponents + httpclient + 4.3.6 + dav4j dav4j -- cgit v1.2.3 From 3c795bdf9d27eadb48dc8d55573128f6b1edb030 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 16 Jan 2015 11:15:38 +0100 Subject: add configuration parameter to deactivate PVP metadata schema validation --- .../moa/id/config/auth/AuthConfigurationProvider.java | 5 +++++ .../pvp2x/verification/metadata/SchemaValidationFilter.java | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java index a67badf49..43ec87b12 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java @@ -1047,6 +1047,11 @@ public class AuthConfigurationProvider extends ConfigurationProvider { return !Boolean.valueOf(prop); } + public boolean isPVPSchemaValidationActive() { + String prop = props.getProperty("protocols.pvp2.schemavalidation", "true"); + return !Boolean.valueOf(prop); + } + /** * Retruns the STORK Configuration * @return STORK Configuration diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/SchemaValidationFilter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/SchemaValidationFilter.java index 403b68524..382adb108 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/SchemaValidationFilter.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/SchemaValidationFilter.java @@ -36,6 +36,8 @@ import org.opensaml.common.xml.SAMLSchemaBuilder; import org.xml.sax.SAXException; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.logging.Logger; /** @@ -47,7 +49,12 @@ public class SchemaValidationFilter implements MetadataFilter { private boolean isActive = true; public SchemaValidationFilter() { - + try { + isActive = AuthConfigurationProvider.getInstance().isPVPSchemaValidationActive(); + + } catch (ConfigurationException e) { + e.printStackTrace(); + } } /** -- cgit v1.2.3 From e6e2bbf9a6e4df5e714ab10babae013317bf8422 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 16 Jan 2015 15:11:48 +0100 Subject: Add dti-process-engine support. --- id/server/auth/pom.xml | 10 ++++++++ .../src/main/webapp/WEB-INF/applicationContext.xml | 29 ++++++++++++++++++++++ id/server/idserverlib/pom.xml | 10 ++++++++ .../moa/id/auth/servlet/AuthServlet.java | 4 ++- .../processes/DefaultAuthentication.process.xml | 15 +++++++++++ pom.xml | 10 ++++++++ 6 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml create mode 100644 id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 7db6ce648..529737820 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -188,6 +188,16 @@ provided + + org.springframework + spring-webmvc + + + commons-logging + commons-logging + + + org.slf4j jcl-over-slf4j diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml new file mode 100644 index 000000000..b340133c7 --- /dev/null +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index fc48d87ac..ba06ce142 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -15,6 +15,7 @@ ${basedir}/../../../repository + 0.0.1-SNAPSHOT @@ -147,11 +148,13 @@ javax.mail mail + xalan-bin-dist @@ -396,6 +399,13 @@ + + + com.datentechnik.process-engine + dti-process-engine-spring-web + ${com.datentechnik.process-engine.version} + + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java index e5b2c598c..eb480e37c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java @@ -67,6 +67,8 @@ import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; +import com.datentechnik.process_engine.springweb.AbstractAuthSourceServlet; + import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger; import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; @@ -88,7 +90,7 @@ import at.gv.egovernment.moa.util.URLDecoder; * @author Paul Ivancsics * @version $Id$ */ -public class AuthServlet extends HttpServlet implements MOAIDAuthConstants { +public class AuthServlet extends AbstractAuthSourceServlet implements MOAIDAuthConstants { /** * diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml new file mode 100644 index 000000000..a2b25e24e --- /dev/null +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index c5973a4ab..9a77ada22 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,9 @@ 2.0.4-SNAPSHOT 1.1.5-SNAPSHOT 2.0.3-SNAPSHOT + + 4.1.4.RELEASE + @@ -545,6 +548,13 @@ 2.7.2 runtime + + + org.springframework + spring-webmvc + ${org.springframework.version} + + -- cgit v1.2.3 From b69370ec35821527832e2337c39486aec32f469a Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Mon, 19 Jan 2015 08:25:08 +0100 Subject: Add javax.servlet:javax.servlet-api dependency. --- id/pom.xml | 11 +++++++++++ id/server/idserverlib/pom.xml | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/id/pom.xml b/id/pom.xml index 0753a7805..6b296e84a 100644 --- a/id/pom.xml +++ b/id/pom.xml @@ -77,5 +77,16 @@ + + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index ba06ce142..530e00d74 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -370,6 +370,12 @@ google-oauth-client-jetty 1.19.0 test + + + org.mortbay.jetty + servlet-api + + @@ -405,6 +411,11 @@ dti-process-engine-spring-web ${com.datentechnik.process-engine.version} + + javax.servlet + javax.servlet-api + provided + -- cgit v1.2.3 From 27ad3fcb9c078e74b3c183d5aa197d1e95eae2ee Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Mon, 19 Jan 2015 08:27:34 +0100 Subject: Fix wrong usage of servlet-api method. --- .../java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java index a4c5c938f..e3b7524ae 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java @@ -279,7 +279,7 @@ public class DispatcherServlet extends AuthServlet{ //create interfederated MOASession String sessionID = AuthenticationSessionStoreage.createInterfederatedSession(protocolRequest, true, ssoId); - req.getParameterMap().put(PARAM_SESSIONID, sessionID); + req.getParameterMap().put(PARAM_SESSIONID, new String[]{ sessionID }); Logger.info("PreProcessing of SSO interfederation response complete. "); -- cgit v1.2.3 From ff3495293eff7c1a6eebd105bf79d23879d8d830 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 19 Jan 2015 12:07:32 +0100 Subject: Fix problem with PVP schemavalidation flag --- .../at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java index 43ec87b12..dae5ffcef 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java @@ -1049,7 +1049,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider { public boolean isPVPSchemaValidationActive() { String prop = props.getProperty("protocols.pvp2.schemavalidation", "true"); - return !Boolean.valueOf(prop); + return Boolean.valueOf(prop); } /** -- cgit v1.2.3 From 38ae8cb883ab73603f490d62b4cac38c51ac43e1 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 19 Jan 2015 12:10:48 +0100 Subject: update libraries -> joda-time 2.7 -> slf4j 2.7.10 -> struts2 2.3.20 -> commons-codec 1.10 -> hibernate 4.3.8.Final -> mySQL-connector 5.1.34 -> opensaml 2.6.4 -> xmltooling 2.6.4 --- common/pom.xml | 13 ++++++------- id/ConfigWebTool/pom.xml | 4 ++-- id/server/idserverlib/pom.xml | 2 +- id/server/moa-id-commons/pom.xml | 14 +++++++++----- id/server/stork2-saml-engine/pom.xml | 2 +- pom.xml | 10 +++++----- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 3d790d29b..e702c5e66 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -67,12 +67,12 @@ joda-time joda-time - 2.4 + 2.7 org.slf4j slf4j-api - 1.7.7 + 1.7.10 diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 2ca351e81..21286585e 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -46,17 +46,17 @@ org.hibernate hibernate-core - 4.3.6.Final + 4.3.8.Final org.hibernate hibernate-c3p0 - 4.3.6.Final + 4.3.8.Final org.hibernate hibernate-entitymanager - 4.3.6.Final + 4.3.8.Final @@ -64,10 +64,14 @@ commons-lang3 3.3.2 - + commons-httpclient commons-httpclient + MOA moa-common @@ -118,7 +122,7 @@ mysql mysql-connector-java - 5.1.33 + 5.1.34 diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 30f2bff7c..21449b522 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -124,7 +124,7 @@ xerces xercesImpl - 2.11.0 + test diff --git a/pom.xml b/pom.xml index 6d5b531c1..ef0b95c8a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,11 +11,11 @@ ${basedir}/repository UTF-8 - 2.0.1 - 2.1.2.2 + 2.0.2 + 2.1.2.3 2.0.0 2.0.3 - 1.1.5 + 1.1.5.1 2.0.2 @@ -145,12 +145,12 @@ org.opensaml opensaml - 2.6.3 + 2.6.4 org.opensaml xmltooling - 1.4.3 + 1.4.4 -- cgit v1.2.3 From a1bb34634bf4f30fc565109358eb51bd1111dc21 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 21 Jan 2015 08:50:58 +0100 Subject: Add "DefaultAuthentication" process (AT, no mandates, no stork) (MOAID-59). - Fix oa web.xml, switch to servlet 3.0. - moa-id-auth web.xml -- Add CharacterEncodingFilter for UTF-8 encoding. -- Add ProcessEngineSignalServlet. - Fix invalid template_*.html. - Add TODO[branch] annotations in order to indicates potential process flow branches. - Add some missing Javadoc. - Add property processInstandId to AuthenticationSession. - Add process engine support. - Fix HttpServlet init issues. - Set VerifyAuthenticationBlockServlet and VerifyIdentityLinkServlet deprecated. --- id/oa/src/main/webapp/WEB-INF/web.xml | 4 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 + id/server/auth/src/main/webapp/WEB-INF/web.xml | 30 ++ .../auth/src/main/webapp/template_handyBKU.html | 2 +- .../auth/src/main/webapp/template_localBKU.html | 2 +- .../auth/src/main/webapp/template_onlineBKU.html | 2 +- .../moa/id/auth/AuthenticationServer.java | 5 + .../auth/builder/StartAuthenticationBuilder.java | 11 + .../moa/id/auth/data/AuthenticationSession.java | 20 +- .../moa/id/auth/servlet/AuthServlet.java | 43 ++- .../servlet/GenerateIFrameTemplateServlet.java | 60 ++- .../auth/servlet/ProcessEngineSignalServlet.java | 60 +++ .../servlet/VerifyAuthenticationBlockServlet.java | 8 + .../id/auth/servlet/VerifyIdentityLinkServlet.java | 6 + .../moa/id/auth/tasks/AbstractAuthServletTask.java | 402 +++++++++++++++++++++ .../id/auth/tasks/CreateIdentityLinkFormTask.java | 85 +++++ .../auth/tasks/VerifyAuthenticationBlockTask.java | 255 +++++++++++++ .../moa/id/auth/tasks/VerifyIdentityLinkTask.java | 203 +++++++++++ .../moa/id/moduls/AuthenticationManager.java | 177 ++++----- .../processes/DefaultAuthentication.process.xml | 12 +- .../resources/properties/id_messages_de.properties | 4 +- id/server/stork2-commons/.gitignore | 1 + 22 files changed, 1265 insertions(+), 129 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java diff --git a/id/oa/src/main/webapp/WEB-INF/web.xml b/id/oa/src/main/webapp/WEB-INF/web.xml index d40f156cd..a42985c95 100644 --- a/id/oa/src/main/webapp/WEB-INF/web.xml +++ b/id/oa/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,6 @@ + - - - Sample OA MOA PVP2.1 Sample OA diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index b340133c7..0f9f05baa 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -25,5 +25,7 @@ + + diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index fb3888a3e..477cce57b 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -10,6 +10,23 @@ org.springframework.web.context.ContextLoaderListener + + characterEncodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + characterEncodingFilter + /* + + requestContextFilter @@ -20,6 +37,7 @@ /* + + ProcessEngineSignal /VerifyIdentityLink @@ -229,7 +256,10 @@ --> + + ProcessEngineSignal /VerifyAuthBlock - - - + + + + + + + + + diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties index 8fda4566c..232f53559 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties @@ -266,4 +266,6 @@ oauth20.09=Zertifikat fuer JSON Web-Token ist falsch konfiguriert. Fehler bei "{ slo.00=Sie konnten erfolgreich von allen Online-Applikation abgemeldet werden. slo.01=Sie konnten NICHT erfolgreich von allen Online-Applikationen abgemeldet werden\!
      Bitte schlie\u00DFen Sie aus sicherheitsgr\u00FCnden Ihren Browser. -slo.02=Es wurde keine aktive SSO Session gefunden oder Sie sind bei keiner Online-Applikation angemeldet. \ No newline at end of file +slo.02=Es wurde keine aktive SSO Session gefunden oder Sie sind bei keiner Online-Applikation angemeldet. + +process.01=Fehler beim Ausf\u00FChren des Prozesses. diff --git a/id/server/stork2-commons/.gitignore b/id/server/stork2-commons/.gitignore index ea8c4bf7f..a9036d427 100644 --- a/id/server/stork2-commons/.gitignore +++ b/id/server/stork2-commons/.gitignore @@ -1 +1,2 @@ /target +/stork-commons.log* -- cgit v1.2.3 From ad40ae9233c5f2a32c983962d655e686af546677 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 22 Jan 2015 12:13:07 +0100 Subject: Add mandate process support (MOAID-60). - Refactor moa-id auth web.xml -- Group the servlets with their corresponding mappings. -- Replace servlets for mappings "/GetMISSessionID", "/VerifyAuthBlock", "/VerifyCertificate" and "/VerifyIdentityLink". -- Remove disabled declarations. - Replace link http://jigsaw.w3.org/css-validator/images/vcss-blue with https://... within the internal templates (loginFormFull.html, sendAssertionFormFull.html, ...). - Set classes deprecated: GetMISSessionIDServlet, VerifyCertificateServlet - ProcessEngineSignalServlet: make GET delegate to PUT - Replace some "implements MOAIDAuthConstants" with "import static MOAIDAuthConstants.*". - Add detailed Javadoc to *Task.java. - Update DefaultAuthentication.process.xml for mandate - Add GetMISSessionIDTask and VerifyCertificateTask. - Add adapter class for iaik.IAIKRuntimeException in order to satisfy some library's bogus dependendies. --- id/server/auth/src/main/webapp/WEB-INF/web.xml | 272 +++++------------- .../htmlTemplates/loginFormFull.html | 2 +- .../htmlTemplates/sendAssertionFormFull.html | 2 +- .../conf/moa-id/htmlTemplates/loginFormFull.html | 2 +- .../htmlTemplates/sendAssertionFormFull.html | 2 +- .../conf/moa-id/htmlTemplates/slo_template.html | 2 +- id/server/doc/htmlTemplates/BKU-selection.html | 2 +- id/server/doc/htmlTemplates/sendAssertion.html | 2 +- .../id/auth/servlet/GetMISSessionIDServlet.java | 7 +- .../auth/servlet/ProcessEngineSignalServlet.java | 39 ++- .../id/auth/servlet/VerifyCertificateServlet.java | 9 +- .../moa/id/auth/tasks/AbstractAuthServletTask.java | 68 ++--- .../id/auth/tasks/CreateIdentityLinkFormTask.java | 36 +++ .../moa/id/auth/tasks/GetMISSessionIDTask.java | 182 ++++++++++++ .../auth/tasks/VerifyAuthenticationBlockTask.java | 56 ++-- .../moa/id/auth/tasks/VerifyCertificateTask.java | 166 +++++++++++ .../moa/id/auth/tasks/VerifyIdentityLinkTask.java | 319 +++++++++++---------- .../protocols/pvp2x/exceptions/loginFormFull.html | 2 +- .../src/main/java/iaik/IAIKRuntimeException.java | 18 ++ .../processes/DefaultAuthentication.process.xml | 23 +- .../resources/templates/loginFormFull.html | 2 +- .../resources/templates/sendAssertionFormFull.html | 2 +- .../resources/templates/slo_template.html | 2 +- 23 files changed, 769 insertions(+), 448 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java create mode 100644 id/server/idserverlib/src/main/java/iaik/IAIKRuntimeException.java diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 477cce57b..1dd3b7a40 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -36,41 +36,67 @@ requestContextFilter /* + + + UrlRewriteFilter + org.tuckey.web.filters.urlrewrite.UrlRewriteFilter + + + UrlRewriteFilter + /* + - - Generate BKU Request template GenerateIframeTemplate GenerateIframeTemplate at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet + + GenerateIframeTemplate + /GenerateIframeTemplate + + RedirectServlet RedirectServlet at.gv.egovernment.moa.id.auth.servlet.RedirectServlet + + RedirectServlet + /RedirectServlet + + MonitoringServlet MonitoringServlet at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet + + MonitoringServlet + /MonitoringServlet + + SSOSendAssertionServlet SSOSendAssertionServlet at.gv.egovernment.moa.id.auth.servlet.SSOSendAssertionServlet - + + + SSOSendAssertionServlet + /SSOSendAssertionServlet + + SSO LogOut LogOut LogOut at.gv.egovernment.moa.id.auth.servlet.LogOutServlet + + LogOut + /LogOut + IDP Single LogOut Service @@ -78,25 +104,10 @@ IDPSLO at.gv.egovernment.moa.id.auth.servlet.IDPSingleLogOutServlet - - - Verify identity link coming from security layer - VerifyIdentityLink - VerifyIdentityLink - at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet - - - Verify the certificate coming from security layer - VerifyCertificate - VerifyCertificate - at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet - - - Get the MIS session ID coming from security layer - GetMISSessionID - GetMISSessionID - at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet - + + IDPSLO + /idpSingleLogout + Gets the foreign eID from security layer @@ -104,223 +115,84 @@ GetForeignID at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet - - - Verify AUTH block coming from security layer - VerifyAuthBlock - VerifyAuthBlock - at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet - - + + GetForeignID + /GetForeignID + + Apache-Axis Servlet AxisServlet org.apache.axis.transport.http.AxisServlet + + AxisServlet + /services/* + - - - Servlet receiving STORK SAML Response Messages from - different C-PEPS + Servlet receiving STORK SAML Response Messages from different C-PEPS PEPSConnectorServlet PEPSConnectorServlet - - at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet + at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet + + PEPSConnectorServlet + /PEPSConnector + + - Servlet receiving STORK SAML Response Messages from - different C-PEPS + Servlet receiving STORK SAML Response Messages from different C-PEPS PEPSConnectorWithLocalSigningServlet PEPSConnectorWithLocalSigningServlet - - at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet + at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet - - + + PEPSConnectorWithLocalSigningServlet + /PEPSConnectorWithLocalSigning + + Dispatcher Servlet DispatcherServlet at.gv.egovernment.moa.id.entrypoints.DispatcherServlet 1 - - - - at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet - at.gv.egovernment.moa.id.protocols.saml1.GetArtifactServlet - + + DispatcherServlet + /dispatcher + - Resumes a suspended process engine task. + Resumes a suspended process task. ProcessEngineSignal ProcessEngineSignal at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet - - - - - DispatcherServlet - /dispatcher - - - - - - - - - - - GenerateIframeTemplate - /GenerateIframeTemplate - - - RedirectServlet - /RedirectServlet - - - MonitoringServlet - /MonitoringServlet - - SSOSendAssertionServlet - /SSOSendAssertionServlet - - - LogOut - /LogOut - - - IDPSLO - /idpSingleLogout - - - ProcessEngineSignal - /VerifyIdentityLink - - - VerifyCertificate - /VerifyCertificate - - - GetMISSessionID /GetMISSessionID - - - GetForeignID - /GetForeignID - - - - - - - ProcessEngineSignal /VerifyAuthBlock + /VerifyCertificate + /VerifyIdentityLink - - - AxisServlet - /services/* - - - PEPSConnectorServlet - /PEPSConnector - - - PEPSConnectorWithLocalSigningServlet - /PEPSConnectorWithLocalSigning - - - - - - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - - - - UrlRewriteFilter - /* - - 5 + 500 /errorpage.jsp - + BASIC UserDatabase - - The role that is required to log in to the moa Application - + The role that is required to log in to the moa Application moa-admin +
      diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html index ef070b8eb..d0af6401b 100644 --- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html +++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html @@ -837,7 +837,7 @@ src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide!
      diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html index b80d654cc..1a3e683de 100644 --- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html +++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html @@ -608,7 +608,7 @@ CSS ist valide!
      diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html index f19cc5320..5b534fca3 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html @@ -837,7 +837,7 @@ src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide!
      diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html index b80d654cc..1a3e683de 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html @@ -608,7 +608,7 @@ CSS ist valide! diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html index 6cefe4054..9a621998c 100644 --- a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html +++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html @@ -450,7 +450,7 @@ src="$contextpath/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide! diff --git a/id/server/doc/htmlTemplates/BKU-selection.html b/id/server/doc/htmlTemplates/BKU-selection.html index ef070b8eb..d0af6401b 100644 --- a/id/server/doc/htmlTemplates/BKU-selection.html +++ b/id/server/doc/htmlTemplates/BKU-selection.html @@ -837,7 +837,7 @@ src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide! diff --git a/id/server/doc/htmlTemplates/sendAssertion.html b/id/server/doc/htmlTemplates/sendAssertion.html index b80d654cc..1a3e683de 100644 --- a/id/server/doc/htmlTemplates/sendAssertion.html +++ b/id/server/doc/htmlTemplates/sendAssertion.html @@ -608,7 +608,7 @@ CSS ist valide! diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java index 20c32a3ec..dd5253e77 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java @@ -67,6 +67,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.tasks.GetMISSessionIDTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.config.ConnectionParameter; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; @@ -83,7 +84,7 @@ import at.gv.egovernment.moa.util.DOMUtils; /** * Servlet requested for getting the foreign eID provided by the security layer * implementation. Utilizes the {@link AuthenticationServer}. - * + * @deprecated Use {@link GetMISSessionIDTask} instead. */ public class GetMISSessionIDServlet extends AuthServlet { @@ -136,6 +137,10 @@ public class GetMISSessionIDServlet extends AuthServlet { Logger.debug("POST GetMISSessionIDServlet"); + if (System.currentTimeMillis() > 0) { + throw new IllegalStateException(getClass().getName() + " should not be called any more."); + } + resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES, MOAIDAuthConstants.HEADER_VALUE_EXPIRES); resp.setHeader(MOAIDAuthConstants.HEADER_PRAGMA, diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java index 1ea8631c6..849ccf5db 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java @@ -17,19 +17,46 @@ import at.gv.egovernment.moa.id.util.ParamValidatorUtils; import com.datentechnik.process_engine.ProcessInstance; +/** + * Servlet that resumes a suspended process (in case of asynchronous tasks). + * + * @author tknall + * + */ public class ProcessEngineSignalServlet extends AuthServlet { private static final long serialVersionUID = 1L; + /** + * Sets response headers that prevent caching (code taken from {@link AuthServlet}). + * + * @param resp + * The HttpServletResponse. + */ + private void setNoCachingHeaders(HttpServletResponse resp) { + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + } + + /** + * Processes a GET request, delegating the call to {@link #doPost(HttpServletRequest, HttpServletResponse)}. + */ + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + this.doPost(req, resp); + } + + /** + * Resumes the current process instance that has been suspended due to an asynchronous task. The process instance is + * retrieved from the MOA session referred to by the request parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}. + */ @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES, MOAIDAuthConstants.HEADER_VALUE_EXPIRES); - resp.setHeader(MOAIDAuthConstants.HEADER_PRAGMA, MOAIDAuthConstants.HEADER_VALUE_PRAGMA); - resp.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE); - + setNoCachingHeaders(resp); try { // check parameter @@ -44,7 +71,7 @@ public class ProcessEngineSignalServlet extends AuthServlet { if (session.getProcessInstanceId() == null) { throw new IllegalStateException("MOA session does not provide process instance id."); } - + // wake up next task ProcessInstance pi = getProcessEngine().getProcessInstance(session.getProcessInstanceId()); getProcessEngine().signal(pi); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java index a3397f561..36e219a97 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java @@ -65,6 +65,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.tasks.VerifyCertificateTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; @@ -77,6 +78,7 @@ import at.gv.egovernment.moa.spss.util.CertificateUtils; * Servlet requested for getting the foreign eID * provided by the security layer implementation. * Utilizes the {@link AuthenticationServer}. + * @deprecated Use {@link VerifyCertificateTask} instead. * */ public class VerifyCertificateServlet extends AuthServlet { @@ -124,6 +126,9 @@ public class VerifyCertificateServlet extends AuthServlet { protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + if (System.currentTimeMillis() > 0) { + throw new IllegalStateException(getClass().getName() + " should not be called any more."); + } Logger.debug("POST VerifyCertificateServlet"); resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES,MOAIDAuthConstants.HEADER_VALUE_EXPIRES); @@ -180,7 +185,8 @@ public class VerifyCertificateServlet extends AuthServlet { throw new MOAIDException("session store error", null); } - ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyCertificate"); + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyCertificate"); + } else { @@ -210,7 +216,6 @@ public class VerifyCertificateServlet extends AuthServlet { ServletUtils.writeCreateXMLSignatureRequest(resp, session, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); - Logger.debug("Send CreateXMLSignatureRequest to BKU"); } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java index d43e8cf68..d5b869777 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java @@ -1,5 +1,7 @@ package at.gv.egovernment.moa.id.auth.tasks; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -9,7 +11,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; @@ -25,10 +26,10 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.lang3.ArrayUtils; import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger; -import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.servlet.AuthServlet; import at.gv.egovernment.moa.id.config.ConfigurationException; import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; @@ -36,11 +37,17 @@ import at.gv.egovernment.moa.id.storage.IExceptionStore; import at.gv.egovernment.moa.id.util.ServletUtils; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; -import at.gv.egovernment.moa.util.URLDecoder; import com.datentechnik.process_engine.springweb.AbstractSpringWebSupportedTask; -public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask implements MOAIDAuthConstants { +/** + * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing + * etc.).

      The code has been taken from {@link AuthServlet}. + * + * @author tknall + * + */ +public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask { protected static final String ERROR_CODE_PARAM = "errorid"; @@ -75,14 +82,10 @@ public abstract class AbstractAuthServletTask extends AbstractSpringWebSupported .getRequestDispatcher("/errorpage-auth.jsp"); try { - resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES, - MOAIDAuthConstants.HEADER_VALUE_EXPIRES); - resp.setHeader(MOAIDAuthConstants.HEADER_PRAGMA, - MOAIDAuthConstants.HEADER_VALUE_PRAGMA); - resp.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, - MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, - MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE); + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); dispatcher.forward(req, resp); } catch (ServletException e) { @@ -179,15 +182,7 @@ public abstract class AbstractAuthServletTask extends AbstractSpringWebSupported RequestDispatcher dispatcher = context .getRequestDispatcher("/errorpage-auth.jsp"); try { - resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES, - MOAIDAuthConstants.HEADER_VALUE_EXPIRES); - resp.setHeader(MOAIDAuthConstants.HEADER_PRAGMA, - MOAIDAuthConstants.HEADER_VALUE_PRAGMA); - resp.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, - MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, - MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE); - + setNoCachingHeaders(resp); dispatcher.forward(req, resp); } catch (ServletException e) { Logger.error(e); @@ -324,32 +319,17 @@ public abstract class AbstractAuthServletTask extends AbstractSpringWebSupported return bout.toString(); } - - -// public void contextDestroyed(ServletContextEvent arg0) { -// Security.removeProvider((new IAIK()).getName()); -// Security.removeProvider((new ECCProvider()).getName()); -// } - /** - * Set response headers to avoid caching + * Sets response headers that prevent caching (code taken from {@link AuthServlet}). * - * @param request - * HttpServletRequest - * @param response - * HttpServletResponse + * @param resp + * The HttpServletResponse. */ - protected void setNoCachingHeadersInHttpRespone(HttpServletRequest request, - HttpServletResponse response) { - response.setHeader(MOAIDAuthConstants.HEADER_EXPIRES, - MOAIDAuthConstants.HEADER_VALUE_EXPIRES); - response.setHeader(MOAIDAuthConstants.HEADER_PRAGMA, - MOAIDAuthConstants.HEADER_VALUE_PRAGMA); - response.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, - MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL); - response.addHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL, - MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE); - + private void setNoCachingHeaders(HttpServletResponse resp) { + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); } /** diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java index 4c87bb689..70afd477d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java @@ -1,5 +1,7 @@ package at.gv.egovernment.moa.id.auth.tasks; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + import java.io.PrintWriter; import javax.servlet.http.HttpServletRequest; @@ -8,6 +10,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang3.ObjectUtils; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; @@ -22,6 +25,39 @@ import at.gv.egovernment.moa.util.StringUtils; import com.datentechnik.process_engine.api.ExecutionContext; +/** + * Creates a http form including an embedded {@code InfoBoxReadRequest} for reading the identity link.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Removes ExecutionContext property {@link MOAIDAuthConstants#PARAM_SESSIONID}.
      • + *
      • Creates the http form mentioned above.
      • + *
      • Returns the http form via HttpServletResponse.
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID} or
      • + *
      • ExecutionContext property {@link MOAIDAuthConstants#PARAM_SESSIONID} (in case of legacy authentication without CCE selection, where the moa session is not provided by request parameter).
      • + *
      + * Result: + *
        + *
      • The identity link form via HttpServletResponse.
      • + *
      + * Possible branches: + *
        + *
      • In case of STORK authentication + *
          + *
        • Creates STORK auth SAML request.
        • + *
        • Creates and returns a form for submitting the SAML request to the CPEPS (post binding).
        • + *
        • Returns the form via HttpServletResponse.
        • + *
        + *
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ public class CreateIdentityLinkFormTask extends AbstractAuthServletTask { @Override diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java new file mode 100644 index 000000000..40e33ae43 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java @@ -0,0 +1,182 @@ +package at.gv.egovernment.moa.id.auth.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import iaik.pki.PKIException; + +import java.security.GeneralSecurityException; +import java.util.List; + +import javax.net.ssl.SSLSocketFactory; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.parsers.ParserConfigurationException; + +import org.apache.commons.lang.StringEscapeUtils; +import org.xml.sax.SAXException; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.ConnectionParameter; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.SSLUtils; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Retrieves a mandate from the online mandate issuing service.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Retrieves the mandate referenced within the moa session from the online (external) mandate issuing service.
      • + *
      • Verifies the mandate.
      • + *
      • Puts mandate into moa session.
      • + *
      • Redirects back to {@code /dispatcher} in order to finalize the authentication.
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      + * Result: + *
        + *
      • Mandate put into moa session.
      • + *
      • Redirect to {@code /dispatcher}.
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class GetMISSessionIDTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + Logger.debug("POST GetMISSessionIDServlet"); + + String sessionID = req.getParameter(PARAM_SESSIONID); + + // escape parameter strings + sessionID = StringEscapeUtils.escapeHtml(sessionID); + + AuthenticationSession session = null; + String pendingRequestID = null; + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) + throw new WrongParametersException("VerifyCertificate", + PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + session = AuthenticationServer.getSession(sessionID); + + //change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + String misSessionID = session.getMISSessionID(); + + AuthConfigurationProvider authConf = AuthConfigurationProvider + .getInstance(); + ConnectionParameter connectionParameters = authConf + .getOnlineMandatesConnectionParameter(); + SSLSocketFactory sslFactory = SSLUtils.getSSLSocketFactory( + AuthConfigurationProvider.getInstance(), + connectionParameters); + + List list = MISSimpleClient.sendGetMandatesRequest( + connectionParameters.getUrl(), misSessionID, sslFactory); + + if (list == null || list.size() == 0) { + Logger.error("Keine Vollmacht gefunden."); + throw new AuthenticationException("auth.15", null); + } + + // for now: list contains only one element + MISMandate mandate = (MISMandate) list.get(0); + + // TODO[tlenz]: UTF-8 ? + String sMandate = new String(mandate.getMandate()); + if (sMandate == null || sMandate.compareToIgnoreCase("") == 0) { + Logger.error("Mandate is empty."); + throw new AuthenticationException("auth.15", + new Object[] { GET_MIS_SESSIONID }); + } + + //check if it is a parsable XML + byte[] byteMandate = mandate.getMandate(); + // TODO[tlenz]: UTF-8 ? + String stringMandate = new String(byteMandate); + DOMUtils.parseDocument(stringMandate, false, + null, null).getDocumentElement(); + + // extract RepresentationType + AuthenticationServer.getInstance().verifyMandate(session, mandate); + + session.setMISMandate(mandate); + session.setAuthenticatedUsed(false); + session.setAuthenticated(true); + + //set QAA Level four in case of card authentifcation + session.setQAALevel(PVPConstants.STORK_QAA_1_4); + + String oldsessionID = session.getSessionID(); + + //Session is implicite stored in changeSessionID!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.info("Changed MOASession " + oldsessionID + " to Session " + newMOASessionID); + Logger.info("Daten angelegt zu MOASession " + newMOASessionID); + + String redirectURL = new DataURLBuilder().buildDataURL( + session.getAuthURL(), + ModulUtils.buildAuthURL(session.getModul(), + session.getAction(), pendingRequestID), newMOASessionID); + redirectURL = resp.encodeRedirectURL(redirectURL); + + // TODO[branch]: Final step back to /dispatcher + + resp.setContentType("text/html"); + resp.setStatus(302); + resp.addHeader("Location", redirectURL); + Logger.debug("REDIRECT TO: " + redirectURL); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (GeneralSecurityException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (PKIException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (SAXException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (ParserConfigurationException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("MISMandateValidation has an interal Error.", e); + + } + finally { + ConfigurationDBUtils.closeSession(); + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java index ff1bc8cd1..24fea05c9 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java @@ -38,30 +38,44 @@ import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.DOMUtils; import com.datentechnik.process_engine.api.ExecutionContext; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +/** + * Verifies the signed authentication block (provided as {@code CreateXMLSignatureResponse}).

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Takes the {@code CreateXMLSignatureResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
      • + *
      • Verifies the {@code CreateXMLSignatureResponse}.
      • + *
      • Updates moa session.
      • + *
      • Redirects back to {@code /dispatcher} in order to finalize the authentication.
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
      • + *
      + * Result: + *
        + *
      • Authentication data put into moa session.
      • + *
      • Redirect to {@code /dispatcher}.
      • + *
      + * Possible branches: + *
        + *
      • In case of mandate mode + *
          + *
        • Creates a mandate session at the external mandate issuing service.
        • + *
        • Redirects the user's browser to the online mandate issuing service GUI.
        • + *
        + *
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask { - /** - * Verifies the signed authentication block and redirects the browser - * to the online application requested, adding a parameter needed for - * retrieving the authentication data. - *
      - * Request parameters: - *
        - *
      • MOASessionID: ID of associated authentication session
      • - *
      • XMLResponse: <CreateXMLSignatureResponse>
      • - *
      - * Response: - *
        - *
      • Status: 302
      • - *
      • Header "Location": URL of the online application requested, with - * parameters "Target"(only if the online application is - * a public service) and "SAMLArtifact" added
      • - *
      • Error status: 500 - *
      - * @see AuthenticationServer#verifyAuthenticationBlock - * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse) - */ @Override public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) throws Exception { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java new file mode 100644 index 000000000..979e64888 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java @@ -0,0 +1,166 @@ +package at.gv.egovernment.moa.id.auth.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.lang.StringEscapeUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.util.CertificateUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Parses the certificate from {@code InfoBoxReadResponse} (via POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}), creates the auth block to be signed and returns a {@code CreateXMLSignatureRequest} for auth block signature.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Retrieves the certificate via {@code InfoBoxReadResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
      • + *
      • Verifies the certificate.
      • + *
      • Creates the auth block to be signed using information from the certificate (Organwalter, foreign citizen.
      • + *
      • Puts it in a {@code CreateXMLSignatureRequest}.
      • + *
      • Updates moa session.
      • + *
      • Responds with {@code CreateXMLSignatureRequest}.
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code InfoBoxReadResponse}.
      • + *
      + * Result: + *
        + *
      • {@code CreateXMLSignatureRequest} send as HttpServletResponse (for CCE).
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class VerifyCertificateTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet + + Logger.debug("POST VerifyCertificateServlet"); + + String pendingRequestID = null; + + Map parameters; + try + { + parameters = getParameters(req); + } catch (FileUploadException e) + { + Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); + throw new IOException(e.getMessage()); + } + String sessionID = req.getParameter(PARAM_SESSIONID); + + // escape parameter strings + sessionID = StringEscapeUtils.escapeHtml(sessionID); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = null; + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) + throw new WrongParametersException("VerifyCertificate", PARAM_SESSIONID, "auth.12"); + + session = AuthenticationServer.getSession(sessionID); + + //change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + X509Certificate cert = AuthenticationServer.getInstance().getCertificate(sessionID, parameters); + if (cert == null) { + Logger.error("Certificate could not be read."); + throw new AuthenticationException("auth.14", null); + } + + boolean useMandate = session.getUseMandate(); + + + if (useMandate) { + + // verify certificate for OrganWalter + String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyCertificate(session, cert); + + try { + AuthenticationSessionStoreage.storeSession(session); + } catch (MOADatabaseException e) { + throw new MOAIDException("session store error", null); + } + + // TODO[branch]: Mandate; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyCertificate"); + + } + else { + + + String countrycode = CertificateUtils.getIssuerCountry(cert); + if (countrycode != null) { + if (countrycode.compareToIgnoreCase("AT") == 0) { + Logger.error("Certificate issuer country code is \"AT\". Login not support in foreign identities mode."); + throw new AuthenticationException("auth.22", null); + } + } + + // Foreign Identities Modus + String createXMLSignatureRequest = AuthenticationServer.getInstance().createXMLSignatureRequestForeignID(session, cert); + // build dataurl (to the GetForeignIDSerlvet) + String dataurl = + new DataURLBuilder().buildDataURL( + session.getAuthURL(), + REQ_GET_FOREIGN_ID, + session.getSessionID()); + + try { + AuthenticationSessionStoreage.storeSession(session); + } catch (MOADatabaseException e) { + throw new MOAIDException("session store error", null); + } + + // TODO[branch]: Foreign citizen; respond with CXSR for authblock signature, dataURL "/GetForeignID" + ServletUtils.writeCreateXMLSignatureRequest(resp, session, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); + + Logger.debug("Send CreateXMLSignatureRequest to BKU"); + } + } + catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("CertificateValidation has an interal Error.", e); + } + + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java index ec12643ec..c24e42b3a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java @@ -1,5 +1,7 @@ package at.gv.egovernment.moa.id.auth.tasks; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + import java.io.IOException; import java.util.Map; @@ -28,176 +30,179 @@ import at.gv.egovernment.moa.logging.Logger; import com.datentechnik.process_engine.api.ExecutionContext; +/** + * Verifies the identity link and prepares auth block signature if identity link provided, or triggers reading the subject's certificate if not provided.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Parses the identity link retrieves as {@code InfoBoxReadResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
      • + *
      • Verifies the identity link.
      • + *
      • Creates the auth block to be signed.
      • + *
      • Updates moa session.
      • + *
      • Creates and returns a {@code CreateXMLSignatureRequest} via HttpServletResponse.
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code InfoBoxReadResponse}.
      • + *
      + * Result: + *
        + *
      • Identity link put into moa session.
      • + *
      • Returns {@code CreateXMLSignatureRequest} via HttpServletResponse (for CCE).
      • + *
      + * Possible branches: + *
        + *
      • In case of foreign citizen or in case of mandate + *
          + *
        • Create {@code InfoBoxReadRequest} for reading the subjects certificate.
        • + *
        • Set DataURL {@code /VerifyCertificate}.
        • + *
        • Respond with {@code InfoBoxReadRequest}.
        • + *
        + *
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ public class VerifyIdentityLinkTask extends AbstractAuthServletTask { - /** - * Verifies the identity link and responds with a new - * CreateXMLSignatureRequest or a new - * InfoboxReadRequest (in case of a foreign eID card). - *
      - * Request parameters: - *
        - *
      • MOASessionID: ID of associated authentication session
      • - *
      • XMLResponse: <InfoboxReadResponse>
      • - *
      - * Response: - *
        - *
      • Content type: "text/xml"
      • - *
      • Content: see return value of {@link AuthenticationServer#verifyIdentityLink}
      • - *
      • Error status: 500 - *
      - * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest, HttpServletResponse) - */ @Override public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) throws Exception { - + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet - Logger.debug("POST VerifyIdentityLink"); - - Map parameters; - String pendingRequestID = null; - - try - { - parameters = getParameters(req); - - } catch (Exception e) - { - Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); - throw new IOException(e.getMessage()); - } - String sessionID = req.getParameter(PARAM_SESSIONID); - - // escape parameter strings + Logger.debug("POST VerifyIdentityLink"); + + Map parameters; + String pendingRequestID = null; + + try { + parameters = getParameters(req); + } catch (Exception e) { + Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); + throw new IOException(e.getMessage()); + } + String sessionID = req.getParameter(PARAM_SESSIONID); + + // escape parameter strings sessionID = StringEscapeUtils.escapeHtml(sessionID); - + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES,MOAIDAuthConstants.HEADER_VALUE_EXPIRES); - resp.setHeader(MOAIDAuthConstants.HEADER_PRAGMA,MOAIDAuthConstants.HEADER_VALUE_PRAGMA); - resp.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL,MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL,MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE); - - - try { - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) - throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); - - - AuthenticationSession session = AuthenticationServer.getSession(sessionID); - - //change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - - String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters); - - Logger.debug(createXMLSignatureRequestOrRedirect); - - - if (createXMLSignatureRequestOrRedirect == null) { - // no identity link found - - boolean useMandate = session.getUseMandate(); - if (useMandate) { - Logger.error("Online-Mandate Mode for foreign citizencs not supported."); - throw new AuthenticationException("auth.13", null); - } - // TODO[branch]: Foreign citizen; respond with IRR for certificates, dataURL = "/VerifyCertificate" - - try { - - Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); - - // create the InfoboxReadRequest to get the certificate - String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); - - // build dataurl (to the VerifyCertificateSerlvet) - String dataurl = - new DataURLBuilder().buildDataURL( - session.getAuthURL(), - REQ_VERIFY_CERTIFICATE, - session.getSessionID()); - - ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); - - - } - catch(Exception e) { - handleError(null, e, req, resp, pendingRequestID); - } - - } - else { - boolean useMandate = session.getUseMandate(); - - if (useMandate) { // Mandate modus - - // TODO[branch]: Mandate; respond with IRR for certificates, dataURL = "/VerifyCertificate" - - // read certificate and set dataurl to - Logger.debug("Send InfoboxReadRequest to BKU to get signer certificate."); - - - String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); - - // build dataurl (to the GetForeignIDSerlvet) - String dataurl = - new DataURLBuilder().buildDataURL( - session.getAuthURL(), - REQ_VERIFY_CERTIFICATE, - session.getSessionID()); - - //Logger.debug("ContentType set to: application/x-www-form-urlencoded (ServletUtils)"); - //ServletUtils.writeCreateXMLSignatureRequestURLEncoded(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); - - Logger.debug("ContentType set to: text/xml;charset=UTF-8 (ServletUtils)"); - ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); - - } - else { - Logger.info("Normal"); - - // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance() - .getOnlineApplicationParameter(session.getPublicOAURLPrefix()); - AuthConfigurationProvider authConf = AuthConfigurationProvider - .getInstance(); - - createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance() - .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, - authConf, oaParam); - - ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink"); - } - } - + + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) + throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + // change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(session, + parameters); + + Logger.debug(createXMLSignatureRequestOrRedirect); + + if (createXMLSignatureRequestOrRedirect == null) { + // no identity link found + + boolean useMandate = session.getUseMandate(); + if (useMandate) { + Logger.error("Online-Mandate Mode for foreign citizencs not supported."); + throw new AuthenticationException("auth.13", null); + } + // TODO[branch]: Foreign citizen; respond with IRR for certificates, dataURL = "/VerifyCertificate" + + try { + + Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); + + // create the InfoboxReadRequest to get the certificate + String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); + + // build dataurl (to the VerifyCertificateSerlvet) + String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, + session.getSessionID()); + + ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, + AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + + } catch (Exception e) { + handleError(null, e, req, resp, pendingRequestID); + } + + } else { + boolean useMandate = session.getUseMandate(); + + if (useMandate) { // Mandate modus + + // TODO[branch]: Mandate; respond with IRR for certificates, dataURL = "/VerifyCertificate" + + // read certificate and set dataurl to + Logger.debug("Send InfoboxReadRequest to BKU to get signer certificate."); + + String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); + + // build dataurl (to the GetForeignIDSerlvet) + String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, + session.getSessionID()); + + // Logger.debug("ContentType set to: application/x-www-form-urlencoded (ServletUtils)"); + // ServletUtils.writeCreateXMLSignatureRequestURLEncoded(resp, session, infoboxReadRequest, + // AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + + Logger.debug("ContentType set to: text/xml;charset=UTF-8 (ServletUtils)"); + ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, + AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + + } else { + Logger.info("Normal"); + + // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL + // "/VerifyAuthBlock" + + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + session.getPublicOAURLPrefix()); + AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); + + createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance() + .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); + + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, + createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, + "VerifyIdentityLink"); + } + } + try { AuthenticationSessionStoreage.storeSession(session); - + } catch (MOADatabaseException e) { Logger.info("No valid MOA session found. Authentification process is abourted."); throw new AuthenticationException("auth.20", null); } - } - catch (ParseException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("IdentityLinkValidation has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - - - + } catch (ParseException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("IdentityLinkValidation has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + } 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 index 3eff06daf..5ae76ed96 100644 --- 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 @@ -842,7 +842,7 @@ input { src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide! diff --git a/id/server/idserverlib/src/main/java/iaik/IAIKRuntimeException.java b/id/server/idserverlib/src/main/java/iaik/IAIKRuntimeException.java new file mode 100644 index 000000000..968d3491d --- /dev/null +++ b/id/server/idserverlib/src/main/java/iaik/IAIKRuntimeException.java @@ -0,0 +1,18 @@ +package iaik; + +/** + * Adapter class providing {@code iaik.RuntimeException} for libraries that have not been updated in order to consider + * the fact that the class {@code IAIKRuntimeException} has been moved. + * + * @author tknall + * + */ +public class IAIKRuntimeException extends iaik.server.modules.IAIKRuntimeException { + + private static final long serialVersionUID = 1L; + + public IAIKRuntimeException(String reason, Throwable wrapped, String uniqueIdentifier) { + super(reason, wrapped, uniqueIdentifier); + } + +} diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index dd27d8a01..8ac58bd4b 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -5,16 +5,27 @@ - National authentication with Austrian Citizen Card and mobile signature. - Legacy authentication for foreign citizens using MOCCA supported signature cards. --> + + + + + - - + + - - - - + + + + + + + + + + diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html index 7e2ddc491..e293d8456 100644 --- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html +++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html @@ -837,7 +837,7 @@ src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide! diff --git a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html index e75bef70c..033a574b9 100644 --- a/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html +++ b/id/server/idserverlib/src/main/resources/resources/templates/sendAssertionFormFull.html @@ -545,7 +545,7 @@ button:hover,button:focus,button:active,.sendButton:hover,.sendButton:focus,.sen src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide! diff --git a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html index b241e85cf..8976b2bd6 100644 --- a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html +++ b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html @@ -436,7 +436,7 @@ src="$contextpath/img/valid-html5-blue.png" alt="HTML5 ist valide!" /> CSS ist valide! -- cgit v1.2.3 From 3a00ce9f1f9589f1e97ecd78154f024146ef83d0 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 22 Jan 2015 15:18:51 +0100 Subject: Refactor VerifyIdentityLinkTask. - Prevent redundant code. - Store moa session before sending response. - Update javadoc for AuthenticationServer --- .../moa/id/auth/AuthenticationServer.java | 27 +++-- .../moa/id/auth/tasks/VerifyIdentityLinkTask.java | 134 ++++++++------------- 2 files changed, 61 insertions(+), 100 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index 0b4b6b4af..b412b9964 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -311,27 +311,28 @@ public class AuthenticationServer implements MOAIDAuthConstants { } /** - * Processes an <InfoboxReadResponse> sent by the - * security layer implementation.
      + * Processes an <InfoboxReadResponse> sent by the security layer implementation.
      *
        *
      • Validates given <InfoboxReadResponse>
      • - *
      • Parses identity link enclosed in - * <InfoboxReadResponse>
      • + *
      • Parses identity link enclosed in <InfoboxReadResponse>
      • *
      • Verifies identity link by calling the MOA SP component
      • *
      • Checks certificate authority of identity link
      • *
      • Stores identity link in the session
      • *
      • Verifies all additional infoboxes returned from the BKU
      • *
      • Creates an authentication block to be signed by the user
      • - *
      • Creates and returns a <CreateXMLSignatureRequest> - * containg the authentication block, meant to be returned to the security - * layer implementation
      • + *
      • Creates and returns a <CreateXMLSignatureRequest> containg the authentication block, meant + * to be returned to the security layer implementation
      • *
      - * - * @param sessionID ID of associated authentication session data - * @param infoboxReadResponseParameters The parameters from the response returned from the BKU - * including the <InfoboxReadResponse> - * @return String representation of the - * <CreateXMLSignatureRequest> + * + * @param sessionID + * ID of associated authentication session data + * @param infoboxReadResponseParameters + * The parameters from the response returned from the BKU including the + * <InfoboxReadResponse> + * @return String "found!" in case the identity link could be retrieved and successfully validated, {@code null} in + * case the identity link could not be retrieved (indicates that the card did not contain an identity link + * which might indicate a foreign identity). Note that failing to parse or failing to validate the identity + * link results in an Exception being thrown. * @throws BKUException */ public String verifyIdentityLink(AuthenticationSession session, diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java index c24e42b3a..09dd9e1f7 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java @@ -20,7 +20,6 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; @@ -76,6 +75,11 @@ public class VerifyIdentityLinkTask extends AbstractAuthServletTask { Logger.debug("POST VerifyIdentityLink"); + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + Map parameters; String pendingRequestID = null; @@ -85,111 +89,67 @@ public class VerifyIdentityLinkTask extends AbstractAuthServletTask { Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); throw new IOException(e.getMessage()); } - String sessionID = req.getParameter(PARAM_SESSIONID); - - // escape parameter strings - sessionID = StringEscapeUtils.escapeHtml(sessionID); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); - resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); - resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); - + try { + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); + } + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); AuthenticationSession session = AuthenticationServer.getSession(sessionID); // change MOASessionID sessionID = AuthenticationSessionStoreage.changeSessionID(session); - String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(session, - parameters); - - Logger.debug(createXMLSignatureRequestOrRedirect); - - if (createXMLSignatureRequestOrRedirect == null) { - // no identity link found - - boolean useMandate = session.getUseMandate(); - if (useMandate) { - Logger.error("Online-Mandate Mode for foreign citizencs not supported."); - throw new AuthenticationException("auth.13", null); - } - // TODO[branch]: Foreign citizen; respond with IRR for certificates, dataURL = "/VerifyCertificate" - - try { - - Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); - - // create the InfoboxReadRequest to get the certificate - String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); - - // build dataurl (to the VerifyCertificateSerlvet) - String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, - session.getSessionID()); + boolean identityLinkFound = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters) != null; + boolean useMandate = session.getUseMandate(); + + if (!identityLinkFound && useMandate) { + Logger.error("Online-Mandate Mode for foreign citizencs not supported."); + throw new AuthenticationException("auth.13", null); + } + + if (!identityLinkFound || useMandate) { + + // TODO[branch]: Foreign citizen or mandate mode; respond with IRR for certificates, dataURL = "/VerifyCertificate" + Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); - ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, - AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + // create the InfoboxReadRequest to get the certificate + String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); - } catch (Exception e) { - handleError(null, e, req, resp, pendingRequestID); - } + // build dataurl (to the VerifyCertificateSerlvet) + String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, + session.getSessionID()); + AuthenticationSessionStoreage.storeSession(session); + + ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, + AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); } else { - boolean useMandate = session.getUseMandate(); - - if (useMandate) { // Mandate modus - - // TODO[branch]: Mandate; respond with IRR for certificates, dataURL = "/VerifyCertificate" - - // read certificate and set dataurl to - Logger.debug("Send InfoboxReadRequest to BKU to get signer certificate."); - - String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); + + Logger.info("Normal"); - // build dataurl (to the GetForeignIDSerlvet) - String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, - session.getSessionID()); + // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - // Logger.debug("ContentType set to: application/x-www-form-urlencoded (ServletUtils)"); - // ServletUtils.writeCreateXMLSignatureRequestURLEncoded(resp, session, infoboxReadRequest, - // AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + session.getPublicOAURLPrefix()); + AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); - Logger.debug("ContentType set to: text/xml;charset=UTF-8 (ServletUtils)"); - ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, - AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + String createXMLSignatureRequest = AuthenticationServer.getInstance() + .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); - } else { - Logger.info("Normal"); - - // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL - // "/VerifyAuthBlock" - - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - session.getPublicOAURLPrefix()); - AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); - - createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance() - .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); - - ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, - createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, - "VerifyIdentityLink"); - } - } - - try { AuthenticationSessionStoreage.storeSession(session); - - } catch (MOADatabaseException e) { - Logger.info("No valid MOA session found. Authentification process is abourted."); - throw new AuthenticationException("auth.20", null); + + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, + createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, + "VerifyIdentityLink"); } + } catch (ParseException ex) { handleError(null, ex, req, resp, pendingRequestID); -- cgit v1.2.3 From 745272fe66f04fee6976e6a187e308bb7a5987a1 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 23 Jan 2015 11:22:07 +0100 Subject: Add foreign identity process support (MOAID-61). - moa-id auth web.xml: Replace servlet mapping "/GetForeignID". - Fix some javadoc of AuthenticationServer. - Set GetForeignIDServlet deprecated. - Remove redundant code across several classes. - VerifyIdentityLinkTask: Separate identity link verification from subsequent (a) creation of CreateXMLSignatureRequest (ProcessIdentityLinkTask) and (b) creation of InfoBoxReadRequest (CertificateReadRequestTask). --- id/server/auth/src/main/webapp/WEB-INF/web.xml | 12 +- .../moa/id/auth/AuthenticationServer.java | 47 +----- .../moa/id/auth/servlet/GetForeignIDServlet.java | 6 + .../id/auth/servlet/VerifyCertificateServlet.java | 2 +- .../id/auth/servlet/VerifyIdentityLinkServlet.java | 6 +- .../moa/id/auth/tasks/AbstractAuthServletTask.java | 2 +- .../id/auth/tasks/CertificateReadRequestTask.java | 102 ++++++++++++ .../moa/id/auth/tasks/GetForeignIDTask.java | 183 +++++++++++++++++++++ .../moa/id/auth/tasks/ProcessIdentityLinkTask.java | 103 ++++++++++++ .../moa/id/auth/tasks/VerifyCertificateTask.java | 3 +- .../moa/id/auth/tasks/VerifyIdentityLinkTask.java | 80 +-------- .../gv/egovernment/moa/id/util/ServletUtils.java | 3 +- .../processes/DefaultAuthentication.process.xml | 15 +- 13 files changed, 424 insertions(+), 140 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 1dd3b7a40..4548e05d9 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -108,17 +108,6 @@ IDPSLO /idpSingleLogout - - - Gets the foreign eID from security layer - GetForeignID - GetForeignID - at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet - - - GetForeignID - /GetForeignID - Apache-Axis Servlet @@ -172,6 +161,7 @@ ProcessEngineSignal /GetMISSessionID + /GetForeignID /VerifyAuthBlock /VerifyCertificate /VerifyIdentityLink diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index b412b9964..fb67d078e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -1363,17 +1363,16 @@ public class AuthenticationServer implements MOAIDAuthConstants { /** * Gets the foreign authentication data.
      *
        - *
      • Creates authentication data
      • + *
      • Creates authentication data
      • *
      • Creates a corresponding SAML artifact
      • *
      • Stores authentication data in the authentication data store indexed * by the SAML artifact
      • *
      • Deletes authentication session
      • - *
      • Returns the SAML artifact, encoded BASE64
      • + *
      • Returns the SAML artifact, encoded BASE64
      • *
      * * @param sessionID session ID of the running authentication session - * @return SAML artifact needed for retrieving authentication data, encoded - * BASE64 + * @return String "new Session" */ public String getForeignAuthenticationData(AuthenticationSession session) throws AuthenticationException, BuildException, ParseException, @@ -1382,46 +1381,6 @@ public class AuthenticationServer implements MOAIDAuthConstants { if (session == null) throw new AuthenticationException("auth.10", new Object[]{ REQ_VERIFY_AUTH_BLOCK, PARAM_SESSIONID}); - - // // post processing of the infoboxes - // Iterator iter = session.getInfoboxValidatorIterator(); - // boolean formpending = false; - // if (iter != null) { - // while (!formpending && iter.hasNext()) { - // Vector infoboxValidatorVector = (Vector) iter.next(); - // String identifier = (String) infoboxValidatorVector.get(0); - // String friendlyName = (String) infoboxValidatorVector.get(1); - // InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector - // .get(2); - // InfoboxValidationResult infoboxValidationResult = null; - // try { - // infoboxValidationResult = infoboxvalidator.validate(session - // .getIdentityLink().getSamlAssertion()); - // } catch (ValidateException e) { - // Logger.error("Error validating " + identifier + " infobox:" - // + e.getMessage()); - // throw new ValidateException("validator.44", - // new Object[]{friendlyName}); - // } - // if (!infoboxValidationResult.isValid()) { - // Logger.info("Validation of " + identifier - // + " infobox failed."); - // throw new ValidateException("validator.40", new Object[]{ - // friendlyName, - // infoboxValidationResult.getErrorMessage()}); - // } - // String form = infoboxvalidator.getForm(); - // if (ParepUtils.isEmpty(form)) { - // AddAdditionalSAMLAttributes( - // session, - // infoboxValidationResult.getExtendedSamlAttributes(), - // identifier, friendlyName); - // } else { - // return "Redirect to Input Processor"; - // } - // } - // } - VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponse(); X509Certificate cert = session.getSignerCertificate(); vsresp.setX509certificate(cert); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java index bbc704f22..f8b0dbdab 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java @@ -71,6 +71,7 @@ import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser; import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; +import at.gv.egovernment.moa.id.auth.tasks.GetForeignIDTask; import at.gv.egovernment.moa.id.client.SZRGWClientException; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.moduls.ModulUtils; @@ -85,6 +86,7 @@ import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse; * Servlet requested for getting the foreign eID * provided by the security layer implementation. * Utilizes the {@link AuthenticationServer}. + * @deprecated Use {@link GetForeignIDTask} instead. * */ public class GetForeignIDServlet extends AuthServlet { @@ -134,6 +136,10 @@ public class GetForeignIDServlet extends AuthServlet { Logger.debug("POST GetForeignIDServlet"); + if (System.currentTimeMillis() > 0) { + throw new IllegalStateException(getClass().getName() + " should not be called any more."); + } + resp.setHeader(MOAIDAuthConstants.HEADER_EXPIRES,MOAIDAuthConstants.HEADER_VALUE_EXPIRES); resp.setHeader(MOAIDAuthConstants.HEADER_PRAGMA,MOAIDAuthConstants.HEADER_VALUE_PRAGMA); resp.setHeader(MOAIDAuthConstants.HEADER_CACHE_CONTROL,MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java index 36e219a97..77e401899 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java @@ -214,7 +214,7 @@ public class VerifyCertificateServlet extends AuthServlet { throw new MOAIDException("session store error", null); } - ServletUtils.writeCreateXMLSignatureRequest(resp, session, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); + ServletUtils.writeCreateXMLSignatureRequest(resp, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); Logger.debug("Send CreateXMLSignatureRequest to BKU"); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java index 3fcdfe150..e94273881 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java @@ -53,7 +53,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.lang.StringEscapeUtils; import at.gv.egovernment.moa.id.auth.AuthenticationServer; @@ -67,7 +66,6 @@ import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.auth.tasks.VerifyIdentityLinkTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; @@ -207,7 +205,7 @@ public class VerifyIdentityLinkServlet extends AuthServlet { session.getSessionID()); - ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + ServletUtils.writeCreateXMLSignatureRequest(resp, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); } @@ -237,7 +235,7 @@ public class VerifyIdentityLinkServlet extends AuthServlet { //ServletUtils.writeCreateXMLSignatureRequestURLEncoded(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); Logger.debug("ContentType set to: text/xml;charset=UTF-8 (ServletUtils)"); - ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + ServletUtils.writeCreateXMLSignatureRequest(resp, infoboxReadRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); } else { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java index d5b869777..7351933c1 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java @@ -325,7 +325,7 @@ public abstract class AbstractAuthServletTask extends AbstractSpringWebSupported * @param resp * The HttpServletResponse. */ - private void setNoCachingHeaders(HttpServletResponse resp) { + public void setNoCachingHeaders(HttpServletResponse resp) { resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java new file mode 100644 index 000000000..da8a3d997 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java @@ -0,0 +1,102 @@ +package at.gv.egovernment.moa.id.auth.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.BooleanUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.
      • + *
      • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code {/VerifyCertificate}
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      + * Result: + *
        + *
      • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code {/VerifyCertificate}
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class CertificateReadRequestTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + // TODO[branch]: Foreign citizen or mandate mode; respond with IRR for certificates, dataURL = "/VerifyCertificate" + Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); + + setNoCachingHeaders(resp); + + String pendingRequestID = null; + + try { + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("CertificateReadRequestTask", PARAM_SESSIONID, "auth.12"); + } + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + boolean useMandate = session.getUseMandate(); + boolean identityLinkFound = BooleanUtils.isTrue((Boolean) executionContext.get("identityLinkFound")); + + if (!identityLinkFound && useMandate) { + Logger.error("Online-Mandate Mode for foreign citizencs not supported."); + throw new AuthenticationException("auth.13", null); + } + + // change MOASessionID + AuthenticationSessionStoreage.changeSessionID(session); + + // create the InfoboxReadRequest to get the certificate + String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); + + // build dataurl (to the VerifyCertificateSerlvet) + String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, + session.getSessionID()); + + ServletUtils.writeCreateXMLSignatureRequest(resp, infoboxReadRequest, + AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + } finally { + ConfigurationDBUtils.closeSession(); + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java new file mode 100644 index 000000000..602ad527b --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java @@ -0,0 +1,183 @@ +package at.gv.egovernment.moa.id.auth.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.TransformerException; + +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.lang.StringEscapeUtils; +import org.w3c.dom.Element; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.ParseException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser; +import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; +import at.gv.egovernment.moa.id.client.SZRGWClientException; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils; +import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Evaluates the {@code CreateXMLSignatureResponse}, extracts signature and certificate and asks the SZR Gateway for an identity link.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Parses the CreateXMLSignatureResponse retrieved from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
      • + *
      • Extracts signature and signer certificate.
      • + *
      • Send request to SZR Gateway in order to get an identity link.
      • + *
      • Updates moa session (sets identity link, QAA level 4, authentication data and foreigner flag).
      • + *
      • Redirects back to {@code /dispatcher} in order to finalize authentication.
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
      • + *
      + * Result: + *
        + *
      • Identity link, QAA level 4 and foreigner flag put into moa session.
      • + *
      • Redirect to {@code /dispatcher}.
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class GetForeignIDTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + Logger.debug("POST GetForeignIDServlet"); + + setNoCachingHeaders(resp); + + Map parameters; + + try { + parameters = getParameters(req); + } catch (FileUploadException e) { + Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); + throw new IOException(e.getMessage()); + } + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + String pendingRequestID = null; + String redirectURL = null; + AuthenticationSession session = null; + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("GetForeignID", PARAM_SESSIONID, "auth.12"); + } + String xmlCreateXMLSignatureResponse = (String) parameters.get(PARAM_XMLRESPONSE); + if (!ParamValidatorUtils.isValidXMLDocument(xmlCreateXMLSignatureResponse)) { + throw new WrongParametersException("GetForeignID", PARAM_XMLRESPONSE, "auth.12"); + } + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + session = AuthenticationServer.getSession(sessionID); + + // change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.debug(xmlCreateXMLSignatureResponse); + + CreateXMLSignatureResponse csresp = new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse) + .parseResponseDsig(); + + try { + String serializedAssertion = DOMUtils.serializeNode(csresp.getDsigSignature()); + session.setAuthBlock(serializedAssertion); + + } catch (TransformerException e) { + throw new ParseException("parser.04", new Object[] { REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE }); + + } catch (IOException e) { + throw new ParseException("parser.04", new Object[] { REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE }); + + } + + Element signature = csresp.getDsigSignature(); + + try { + session.setSignerCertificate(AuthenticationServer.getCertificateFromXML(signature)); + } catch (CertificateException e) { + Logger.error("Could not extract certificate from CreateXMLSignatureResponse"); + throw new MOAIDException("auth.14", null); + } + + // make SZR request to the identity link + CreateIdentityLinkResponse response = AuthenticationServer.getInstance().getIdentityLink(signature); + + if (null != response.getErrorResponse()) { + // TODO fix exception parameter + throw new SZRGWClientException("service.08", (String) response.getErrorResponse().getErrorCode(), + (String) response.getErrorResponse().getInfo()); + } else { + IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream( + response.getIdentityLink())); + IdentityLink identitylink = ilParser.parseIdentityLink(); + session.setIdentityLink(identitylink); + + // set QAA Level four in case of card authentifcation + session.setQAALevel(PVPConstants.STORK_QAA_1_4); + + AuthenticationServer.getInstance().getForeignAuthenticationData(session); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.info("Changed MOASession " + sessionID + " to Session " + newMOASessionID); + Logger.info("Daten angelegt zu MOASession " + newMOASessionID); + + redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), + ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = resp.encodeRedirectURL(redirectURL); + + // TODO[branch]: Final step back to /dispatcher + + try { + AuthenticationSessionStoreage.storeSession(session); + } catch (MOADatabaseException e) { + throw new MOAIDException("Session store error", null); + } + + resp.setContentType("text/html"); + resp.setStatus(302); + resp.addHeader("Location", redirectURL); + Logger.debug("REDIRECT TO: " + redirectURL); + } + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("GetForeignIDServlet has an interal Error.", e); + + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java new file mode 100644 index 000000000..34ef9b134 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java @@ -0,0 +1,103 @@ +package at.gv.egovernment.moa.id.auth.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates {@code CreateXMLSignatureRequest} for auth block signature.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Creates {@code CreateXMLSignatureRequest} for auth block signature.
      • + *
      • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      + * Result: + *
        + *
      • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class ProcessIdentityLinkTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet + + Logger.debug("Process IdentityLink"); + + setNoCachingHeaders(resp); + + String pendingRequestID = null; + + try { + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); + } + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + // change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.info("Normal"); + + // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" + + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + session.getPublicOAURLPrefix()); + AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); + + String createXMLSignatureRequest = AuthenticationServer.getInstance() + .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); + + AuthenticationSessionStoreage.storeSession(session); + + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, + createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, + "VerifyIdentityLink"); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("IdentityLinkValidation has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java index 979e64888..ddea4c414 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java @@ -101,7 +101,6 @@ public class VerifyCertificateTask extends AbstractAuthServletTask { boolean useMandate = session.getUseMandate(); - if (useMandate) { // verify certificate for OrganWalter @@ -144,7 +143,7 @@ public class VerifyCertificateTask extends AbstractAuthServletTask { } // TODO[branch]: Foreign citizen; respond with CXSR for authblock signature, dataURL "/GetForeignID" - ServletUtils.writeCreateXMLSignatureRequest(resp, session, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); + ServletUtils.writeCreateXMLSignatureRequest(resp, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); Logger.debug("Send CreateXMLSignatureRequest to BKU"); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java index 09dd9e1f7..5b21cd29c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java @@ -12,33 +12,26 @@ import org.apache.commons.lang.StringEscapeUtils; import at.gv.egovernment.moa.id.auth.AuthenticationServer; import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.ServletUtils; import at.gv.egovernment.moa.logging.Logger; import com.datentechnik.process_engine.api.ExecutionContext; /** - * Verifies the identity link and prepares auth block signature if identity link provided, or triggers reading the subject's certificate if not provided.

      + * Verifies the identity link.

      * In detail: *

        *
      • Renames the moa session id.
      • - *
      • Parses the identity link retrieves as {@code InfoBoxReadResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
      • + *
      • Parses the identity link retrieved as {@code InfoBoxReadResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
      • *
      • Verifies the identity link.
      • - *
      • Creates the auth block to be signed.
      • *
      • Updates moa session.
      • - *
      • Creates and returns a {@code CreateXMLSignatureRequest} via HttpServletResponse.
      • + *
      • Puts boolean flag {@code identityLinkFound} into {@code ExecutionContext}.
      • *
      * Expects: *
        @@ -48,17 +41,7 @@ import com.datentechnik.process_engine.api.ExecutionContext; * Result: *
          *
        • Identity link put into moa session.
        • - *
        • Returns {@code CreateXMLSignatureRequest} via HttpServletResponse (for CCE).
        • - *
        - * Possible branches: - *
          - *
        • In case of foreign citizen or in case of mandate - *
            - *
          • Create {@code InfoBoxReadRequest} for reading the subjects certificate.
          • - *
          • Set DataURL {@code /VerifyCertificate}.
          • - *
          • Respond with {@code InfoBoxReadRequest}.
          • - *
          - *
        • + *
        • Boolean flag {@code identityLinkFound} into {@code ExecutionContext}.
        • *
        * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. * @author tknall @@ -75,10 +58,7 @@ public class VerifyIdentityLinkTask extends AbstractAuthServletTask { Logger.debug("POST VerifyIdentityLink"); - resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); - resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); - resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + setNoCachingHeaders(resp); Map parameters; String pendingRequestID = null; @@ -93,62 +73,18 @@ public class VerifyIdentityLinkTask extends AbstractAuthServletTask { try { String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - // check parameter if (!ParamValidatorUtils.isValidSessionID(sessionID)) { throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); } - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); AuthenticationSession session = AuthenticationServer.getSession(sessionID); - // change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - boolean identityLinkFound = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters) != null; - boolean useMandate = session.getUseMandate(); - - if (!identityLinkFound && useMandate) { - Logger.error("Online-Mandate Mode for foreign citizencs not supported."); - throw new AuthenticationException("auth.13", null); - } - - if (!identityLinkFound || useMandate) { - - // TODO[branch]: Foreign citizen or mandate mode; respond with IRR for certificates, dataURL = "/VerifyCertificate" - Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); - - // create the InfoboxReadRequest to get the certificate - String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); - - // build dataurl (to the VerifyCertificateSerlvet) - String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, - session.getSessionID()); - - AuthenticationSessionStoreage.storeSession(session); - - ServletUtils.writeCreateXMLSignatureRequest(resp, session, infoboxReadRequest, - AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); - } else { - - Logger.info("Normal"); - - // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - session.getPublicOAURLPrefix()); - AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); - - String createXMLSignatureRequest = AuthenticationServer.getInstance() - .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); - - AuthenticationSessionStoreage.storeSession(session); - - ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, - createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, - "VerifyIdentityLink"); - } + AuthenticationSessionStoreage.storeSession(session); + + executionContext.put("identityLinkFound", identityLinkFound); } catch (ParseException ex) { handleError(null, ex, req, resp, pendingRequestID); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java index 56e59a4aa..3dbc0ab7b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ServletUtils.java @@ -113,14 +113,13 @@ public class ServletUtils { * depending on the requests starting text. * * @param resp The httpServletResponse - * @param session The current AuthenticationSession * @param createXMLSignatureRequestOrRedirect The request * @param servletGoal The servlet to which the redirect should happen * @param servletName The servlet name for debug purposes * @throws MOAIDException * @throws IOException */ - public static void writeCreateXMLSignatureRequest(HttpServletResponse resp, AuthenticationSession session, String createXMLSignatureRequestOrRedirect, String servletGoal, String servletName, String dataURL) + public static void writeCreateXMLSignatureRequest(HttpServletResponse resp, String createXMLSignatureRequestOrRedirect, String servletGoal, String servletName, String dataURL) throws MOAIDException, IOException { diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index 8ac58bd4b..f3555df2a 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -10,6 +10,9 @@ + + + @@ -17,15 +20,21 @@ - - + + - + + + + + + + -- cgit v1.2.3 From 1505989670e61f59fdba20c9e57b121389fb338d Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 23 Jan 2015 11:43:10 +0100 Subject: Fix typo in process description. --- .../resources/resources/processes/DefaultAuthentication.process.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index f3555df2a..967b41735 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -28,7 +28,7 @@ - + -- cgit v1.2.3 From bbd89ecac39989210f2572b41f5050cc2885be40 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 23 Jan 2015 13:07:47 +0100 Subject: update versions --- id/server/stork2-commons/pom.xml | 6 ++---- id/server/stork2-saml-engine/pom.xml | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 43a02ae5d..926651b04 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -41,7 +41,6 @@ log4j log4j - 1.2.17 javax.jms @@ -65,7 +64,6 @@ org.opensaml opensaml - ${opensaml.version} org.slf4j @@ -130,8 +128,8 @@ maven-compiler-plugin 3.1 - 1.7 - 1.7 + 1.6 + 1.6 UTF-8 diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index a13a036a0..f28f2c9a4 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -60,7 +60,6 @@ org.opensaml opensaml - ${opensaml.version} org.slf4j @@ -92,8 +91,7 @@ org.opensaml xmltooling - 1.4.3 - + org.slf4j -- cgit v1.2.3 From a38072d6c778d27a1ed3cf265ff7d3a6b7e38825 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 23 Jan 2015 13:08:22 +0100 Subject: exclude iaik_jce_eval_signed --- spss/server/serverws/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index bbfb3c443..b90026252 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -109,6 +109,10 @@ iaik_pki_module iaik + + iaik_jce_eval_signed + iaik + -- cgit v1.2.3 From 5ac35ee4134c6d01213e9ec47b6428eb22ba96cc Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 23 Jan 2015 13:09:08 +0100 Subject: update handbook und default configuration --- .../data/deploy/conf/moa-id/moa-id.properties | 6 ++++ id/server/doc/handbook/config/config.html | 32 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) 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 9d1e931e9..a160ea1ff 100644 --- a/id/server/data/deploy/conf/moa-id/moa-id.properties +++ b/id/server/data/deploy/conf/moa-id/moa-id.properties @@ -13,6 +13,7 @@ ##For Testing configuration.validation.certificate.QC.ignore=false protocols.pvp2.assertion.encryption.active=false +protocols.pvp2.schemavalidation=true ##General MOA-ID 2.0 operations #MOA-ID 2.0 session information encryption key (PassPhrase) @@ -43,6 +44,11 @@ service.foreignidentities.acceptedServerCertificates= service.foreignidentities.clientKeyStore=keys/.... service.foreignidentities.clientKeyStorePassword= +##STORK 2 +stork.fakeIdL.active=false +stork.fakeIdL.countries= +stork.fakeIdL.keygroup= + ##Protocol configuration## #PVP2 diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html index 1a584e0b3..a4278034e 100644 --- a/id/server/doc/handbook/config/config.html +++ b/id/server/doc/handbook/config/config.html @@ -900,6 +900,12 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet

      Deaktiviert die QC Prüfung von Signaturzertifikaten. Da manche Testzertifikate oder Testkarten keine QC Erweiterung aufweisen und somit eine Anmeldung mit diesen Zertifikaten nicht möglich ist, kann die QC Prüfung je Instanz deaktiviert werden.

      Defaultwert: false

      + + protocols.pvp2.schemavalidation + true / false +

      Mit diesem Parameter kann die Schemavalidierung für PVP Metadaten deaktiviert werden.

      + Defaultwert: true + protocols.pvp2.assertion.encryption.active true / false @@ -1031,6 +1037,32 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet

       

      Hinweis: Detaillierte Informationen zu den einzelnen PVP spezifischen Konfigurationsparametern finden Sie in der entsprechenden PVP Spezifikation.

      +
      2.2.2.6 STORK 2
      +

      Dieses Abschnitt beschreibt Konfigurationswerte welche nur für den Testbetrieb von STORK 2 erforderlich sind.

      + + + + + + + + + + + + + + + + + + + + + +
      NameBeispielwertBeschreibung
      stork.fakeIdL.activetrue / false

      Im Produktivbetrieb ist eine Anmeldung nur für jene Länder mittels STORK 2 möglich welche in der Gleichwertigkeitsverordnung aufgelistet sind. Um einen Testbetrieb mit weiteren Ländern zu ermöglichen bietet das Modul MOA-ID-Auth die Möglichkeit zur Ausstellung eines Fake-Identititlink, welcher im Testbetrieb für die Anmeldung an einer österreichischen Test Online Applikation verwendet werden kann.

      +

      Hinweis: Diese Funktion ist standardmäßig deaktiviert. Eine Aktivierung ist nur im Testbetrieb für STORK 2 empfohlen.

      stork.fakeIdL.countriesDE,CHKürzel jener Länder für welche ein Fake-Identitilink ausgestellt werden soll.
      stork.fakeIdL.keygroupIDL_signingMOA-SS Schlüsselgruppe, welche für die Signatur des Fake-Identitilinks verwendet werden soll.
      +

       

      2.3 Konfiguration des Loggings

      Die Module MOA-ID-Auth und MOA-ID-Configuration verwendet als Framework für Logging-Information die Open Source Software log4j. Die Konfiguration der Logging-Information erfolgt nicht direkt durch die einzelnen Module, sondern über eine eigene Konfigurationsdatei, die der Java Virtual Machine durch eine System Property mitgeteilt wird. Der Name der System Property lautet log4j.configuration; als Wert der System Property ist eine URL anzugeben, die auf die log4j-Konfigurationsdatei verweist, z.B.

      log4j.configuration=file:/C:/Programme/apache/tomcat-4.1.30/conf/moa-id/log4j.properties
      -- cgit v1.2.3 From dcb6d398987af78f3e345f9e3577f2a1e581fdb9 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Mon, 26 Jan 2015 10:10:44 +0100 Subject: Perform refactoring. - Rename ProcessIdentityLinkTask to PrepareAuthBlockSignatureTask. --- .../auth/tasks/PrepareAuthBlockSignatureTask.java | 103 +++++++++++++++++++++ .../moa/id/auth/tasks/ProcessIdentityLinkTask.java | 103 --------------------- .../processes/DefaultAuthentication.process.xml | 41 ++++---- 3 files changed, 124 insertions(+), 123 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java new file mode 100644 index 000000000..30777198c --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java @@ -0,0 +1,103 @@ +package at.gv.egovernment.moa.id.auth.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates {@code CreateXMLSignatureRequest} for auth block signature.

      + * In detail: + *

        + *
      • Renames the moa session id.
      • + *
      • Creates {@code CreateXMLSignatureRequest} for auth block signature.
      • + *
      • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
      • + *
      + * Expects: + *
        + *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • + *
      + * Result: + *
        + *
      • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
      • + *
      + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. + * @author tknall + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class PrepareAuthBlockSignatureTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet + + Logger.debug("Process IdentityLink"); + + setNoCachingHeaders(resp); + + String pendingRequestID = null; + + try { + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); + } + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + // change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.info("Normal"); + + // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" + + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + session.getPublicOAURLPrefix()); + AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); + + String createXMLSignatureRequest = AuthenticationServer.getInstance() + .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); + + AuthenticationSessionStoreage.storeSession(session); + + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, + createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, + "VerifyIdentityLink"); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("IdentityLinkValidation has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java deleted file mode 100644 index 34ef9b134..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/ProcessIdentityLinkTask.java +++ /dev/null @@ -1,103 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringEscapeUtils; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.ServletUtils; -import at.gv.egovernment.moa.logging.Logger; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Creates {@code CreateXMLSignatureRequest} for auth block signature.

      - * In detail: - *

        - *
      • Renames the moa session id.
      • - *
      • Creates {@code CreateXMLSignatureRequest} for auth block signature.
      • - *
      • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
      • - *
      - * Expects: - *
        - *
      • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
      • - *
      - * Result: - *
        - *
      • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
      • - *
      - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. - * @author tknall - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class ProcessIdentityLinkTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet - - Logger.debug("Process IdentityLink"); - - setNoCachingHeaders(resp); - - String pendingRequestID = null; - - try { - - String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) { - throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); - } - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - AuthenticationSession session = AuthenticationServer.getSession(sessionID); - - // change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - - Logger.info("Normal"); - - // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - session.getPublicOAURLPrefix()); - AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); - - String createXMLSignatureRequest = AuthenticationServer.getInstance() - .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); - - AuthenticationSessionStoreage.storeSession(session); - - ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, - createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, - "VerifyIdentityLink"); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("IdentityLinkValidation has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index 967b41735..20830fc35 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -5,36 +5,37 @@ - National authentication with Austrian Citizen Card and mobile signature. - Legacy authentication for foreign citizens using MOCCA supported signature cards. --> - - - - - - - - + + + + + + + + - + - + - - + + - + - + + - - + + - - + + - - + + -- cgit v1.2.3 From 47be89a98ec08d7321b95a2d9908687aef5f03e6 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Mon, 26 Jan 2015 13:29:04 +0100 Subject: Add some comments to DefaultAuthentication.process.xml. --- .../resources/resources/processes/DefaultAuthentication.process.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index 20830fc35..170959406 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -24,9 +24,10 @@ + - + -- cgit v1.2.3 From 8982f3f9beda6d3ff6926bc2aa43942576ba31dc Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Mon, 26 Jan 2015 13:47:28 +0100 Subject: Fix Javadoc, remove disabled code. - Partly fix javadoc of AuthenticationServer. - Remove disabled code from AuthenticationServer. --- .../moa/id/auth/AuthenticationServer.java | 6 ++-- .../auth/tasks/VerifyAuthenticationBlockTask.java | 32 ++++------------------ 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index fb67d078e..c33e5c735 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -1096,14 +1096,14 @@ public class AuthenticationServer implements MOAIDAuthConstants { *
    3. Stores authentication data in the authentication data store indexed * by the SAML artifact
    4. *
    5. Deletes authentication session
    6. - *
    7. Returns the SAML artifact, encoded BASE64
    8. + *
    9. Returns the SAML artifact, encoded BASE64
      New id of the authenticated MOA session or {@code null} in case of mandate mode (???)
    10. * * * @param sessionID session ID of the running authentication session * @param xmlCreateXMLSignatureReadResponse String representation of the * <CreateXMLSignatureResponse> - * @return SAML artifact needed for retrieving authentication data, encoded - * BASE64 + * @return SAML artifact needed for retrieving authentication data, encoded + * BASE64
      New id of the authenticated MOA session or {@code null} in case of mandate mode (???) * @throws BKUException */ public String verifyAuthenticationBlock(AuthenticationSession session, diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java index 24fea05c9..2bc0bb8ad 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java @@ -116,11 +116,9 @@ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask { //change MOASessionID sessionID = AuthenticationSessionStoreage.changeSessionID(session); - String samlArtifactBase64 = AuthenticationServer.getInstance().verifyAuthenticationBlock(session, createXMLSignatureResponse); + String authenticatedMOASessionId = AuthenticationServer.getInstance().verifyAuthenticationBlock(session, createXMLSignatureResponse); - - - if (samlArtifactBase64 == null) { + if (authenticatedMOASessionId == null) { //mandate Mode AuthConfigurationProvider authConf= AuthConfigurationProvider.getInstance(); @@ -156,11 +154,6 @@ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask { throw new AuthenticationException("config.21", new Object[] { GET_MIS_SESSIONID}); } -// String profilesArray[] = profiles.split(","); -// for(int i = 0; i < profilesArray.length; i++) { -// profilesArray[i] = profilesArray[i].trim(); -// } - String oaFriendlyName = oaParam.getFriendlyName(); String mandateReferenceValue = session.getMandateReferenceValue(); byte[] cert = session.getEncodedSignerCertificate(); @@ -212,24 +205,9 @@ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask { Logger.debug("REDIRECT TO: " + redirectURL); } else { - if (!samlArtifactBase64.equals("Redirect to Input Processor")) { - /*redirectURL = session.getOAURLRequested(); - if (!session.getBusinessService()) { - redirectURL = addURLParameter(redirectURL, PARAM_TARGET, URLEncoder.encode(session.getTarget(), "UTF-8")); - - } - redirectURL = addURLParameter(redirectURL, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8")); - redirectURL = resp.encodeRedirectURL(redirectURL);*/ - - // TODO[branch]: Final step back to /dispatcher - - redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), - ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), samlArtifactBase64); - - } else { - // TODO[tlenz]: Should not be needed any more (respective code in AuthenticationServer has been disabled) - redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, session.getSessionID()); - } + // TODO[branch]: Final step back to /dispatcher + redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), + ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), authenticatedMOASessionId); resp.setContentType("text/html"); resp.setStatus(302); -- cgit v1.2.3 From e32765da563770ca209943fe14b84cc71c2d2aac Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Mon, 26 Jan 2015 17:50:23 +0100 Subject: Add comments to DefaultAuthentication.process.xml. --- .../main/resources/resources/processes/DefaultAuthentication.process.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index 170959406..48c9ee56c 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -14,6 +14,7 @@ + -- cgit v1.2.3 From 92a879913faceb6f8392048768953846cf7a4e86 Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Tue, 27 Jan 2015 16:18:00 +0100 Subject: initial version of ModuleRegistry and ModuleAuth --- .../id/moduls/modulregistration/AuthModule.java | 40 ++++++++++++++++++++++ .../modulregistration/ModuleRegistration.java | 29 ++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java new file mode 100644 index 000000000..6ee18c0ab --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java @@ -0,0 +1,40 @@ +package at.gv.egovernment.moa.id.moduls.modulregistration; + +import com.datentechnik.process_engine.api.ExecutionContext; +import com.datentechnik.process_engine.model.ProcessDefinition; + +/** + * Defines the module capabilities. + */ +public interface AuthModule { + + /** + * Returns the priority of the module. The priority defines the place in the + * order of modules. The module with a highest priority is asked first, if + * it has a process which can do an authentication. + * + * @return the priority of the module. + */ + int getPriority(); + + /** + * Checks if the module has a process, which is able to do an authentication + * with the given {@link ExecutionContext}. + * + * @param context + * an ExecutionContext for a process. + * @return the process-ID of a process which is able to work with the given + * ExecutionContext, or {@code null}. + */ + String selectProcess(ExecutionContext context); + + /** + * Returns the an Array of {@link ProcessDefinition}s of the processes + * included in this module. + * + * @return an array of resource uris of the processes included in this + * module. + */ + String[] getProcessDefinitions(); + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java new file mode 100644 index 000000000..fc352742d --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java @@ -0,0 +1,29 @@ +package at.gv.egovernment.moa.id.moduls.modulregistration; + +import com.datentechnik.process_engine.api.ExecutionContext; + +public class ModuleRegistration { + + private static ModuleRegistration instance; + + public static ModuleRegistration getInstance() { + if (instance == null) { + instance = new ModuleRegistration(); + } + return instance; + } + + private ModuleRegistration() { + initRegistry(); + } + + private void initRegistry() { + // TODO: use ServiceLoader and Spring to find all modules + } + + public String selectProcess(ExecutionContext context) { + // TODO: implement + return null; + } + +} -- cgit v1.2.3 From b187c1470167335ad6142b9b8b730e106348a8f8 Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Wed, 28 Jan 2015 10:31:33 +0100 Subject: implement ModuleRegistry, implement standard moaid process, start ModuleRegistry at moa-id startup, fix typo in package name --- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../id/moduls/moduleregistration/AuthModule.java | 40 ++++++ .../moduls/moduleregistration/AuthModuleImpl.java | 23 ++++ .../moduleregistration/ModuleRegistration.java | 140 +++++++++++++++++++++ .../id/moduls/modulregistration/AuthModule.java | 40 ------ .../modulregistration/ModuleRegistration.java | 29 ----- ...ment.moa.id.moduls.modulregistration.AuthModule | 2 + 7 files changed, 206 insertions(+), 70 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java create mode 100644 id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index 0f9f05baa..a4a06d24a 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -27,5 +27,5 @@ - + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java new file mode 100644 index 000000000..35273cd2b --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java @@ -0,0 +1,40 @@ +package at.gv.egovernment.moa.id.moduls.moduleregistration; + +import com.datentechnik.process_engine.api.ExecutionContext; +import com.datentechnik.process_engine.model.ProcessDefinition; + +/** + * Defines the module capabilities. + */ +public interface AuthModule { + + /** + * Returns the priority of the module. The priority defines the place in the + * order of modules. The module with a highest priority is asked first, if + * it has a process which can do an authentication. + * + * @return the priority of the module. + */ + int getPriority(); + + /** + * Checks if the module has a process, which is able to perform an authentication + * with the given {@link ExecutionContext}. + * + * @param context + * an ExecutionContext for a process. + * @return the process-ID of a process which is able to work with the given + * ExecutionContext, or {@code null}. + */ + String selectProcess(ExecutionContext context); + + /** + * Returns the an Array of {@link ProcessDefinition}s of the processes + * included in this module. + * + * @return an array of resource uris of the processes included in this + * module. + */ + String[] getProcessDefinitions(); + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java new file mode 100644 index 000000000..cbe5c5932 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java @@ -0,0 +1,23 @@ +package at.gv.egovernment.moa.id.moduls.moduleregistration; + +import com.datentechnik.process_engine.api.ExecutionContext; + +public class AuthModuleImpl implements AuthModule { + + @Override + public int getPriority() { + // neutral priority between Integer.MIN_VALUE and Integer.MAX_VALUE + return 0; + } + + @Override + public String selectProcess(ExecutionContext context) { + return context.get("ccc") == null ? "DefaultAuthentication" : null; + } + + @Override + public String[] getProcessDefinitions() { + return new String[] { "DefaultAuthentication" }; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java new file mode 100644 index 000000000..522e5c7eb --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java @@ -0,0 +1,140 @@ +package at.gv.egovernment.moa.id.moduls.moduleregistration; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; + +import javax.annotation.PostConstruct; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.core.io.Resource; + +import com.datentechnik.process_engine.ProcessEngine; +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * This class handles registering modules. The modules are detected either with + * the ServiceLoader mechanism or via Spring. All detected modules are ranked + * according to their priority. + */ +public class ModuleRegistration { + + private static ModuleRegistration instance = new ModuleRegistration(); + + private List orderedModules = new ArrayList<>(); + + @Autowired + private ApplicationContext ctx; + + @Autowired + ProcessEngine processEngine; + + private Logger log = LoggerFactory.getLogger(getClass()); + + public static ModuleRegistration getInstance() { + return instance; + } + + private ModuleRegistration() { + } + + @PostConstruct + private void init() { + // load modules via the ServiceLoader + initServiceLoaderModules(); + + // load modules via Spring + initSpringModules(); + + // order modules according to their priority + orderModules(); + } + + /** + * Discovers modules which use the ServiceLoader mechanism. + */ + private void initServiceLoaderModules() { + log.debug("Discovering modules which use the ServiceLoader mechanism."); + ServiceLoader loader = ServiceLoader.load(AuthModule.class); + Iterator modules = loader.iterator(); + while (modules.hasNext()) { + AuthModule module = modules.next(); + registerResourceUris(module); + orderedModules.add(module); + } + } + + /** + * Discovers modules which use Spring. + */ + private void initSpringModules() { + log.debug("Discovering Spring modules."); + Map modules = ctx.getBeansOfType(AuthModule.class); + for (AuthModule module : modules.values()) { + registerResourceUris(module); + orderedModules.add(module); + } + } + + /** + * Registers the resource uris for the module. + * + * @param module + * the module. + */ + private void registerResourceUris(AuthModule module) { + for (String uri : module.getProcessDefinitions()) { + Resource resource = ctx.getResource(uri); + if (resource.exists()) { + log.debug("Registering process definition resource url: '{}'.", resource); + // TODO: register resource with the process engine + // processEngine.registerResourceUri(resource); + } else { + log.info("Resource url: '{}' does NOT exist.", resource); + } + } + } + + /** + * Order the modules in descending order according to their priority. + */ + private void orderModules() { + Collections.sort(orderedModules, new Comparator() { + @Override + public int compare(AuthModule thisAuthModule, AuthModule otherAuthModule) { + int thisOrder = thisAuthModule.getPriority(); + int otherOrder = otherAuthModule.getPriority(); + return (thisOrder < otherOrder ? -1 : (thisOrder == otherOrder ? 0 : 1)); + } + }); + log.debug("Modules are ordered in descending order, according to their priority."); + } + + /** + * Returns the process id of the first process, in the highest ranked + * module, which is able to work with the given execution context. + * + * @param context + * the {@link ExecutionContext}. + * @return the process id or {@code null} + */ + public String selectProcess(ExecutionContext context) { + for (AuthModule module : orderedModules) { + String id = module.selectProcess(context); + if (StringUtils.isNotEmpty(id)) { + log.debug("Process with id '{}' selected, for context '{}'.", id, context); + return id; + } + } + log.info("No process is able to handle context '{}'.", context); + return null; + } +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java deleted file mode 100644 index 6ee18c0ab..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/AuthModule.java +++ /dev/null @@ -1,40 +0,0 @@ -package at.gv.egovernment.moa.id.moduls.modulregistration; - -import com.datentechnik.process_engine.api.ExecutionContext; -import com.datentechnik.process_engine.model.ProcessDefinition; - -/** - * Defines the module capabilities. - */ -public interface AuthModule { - - /** - * Returns the priority of the module. The priority defines the place in the - * order of modules. The module with a highest priority is asked first, if - * it has a process which can do an authentication. - * - * @return the priority of the module. - */ - int getPriority(); - - /** - * Checks if the module has a process, which is able to do an authentication - * with the given {@link ExecutionContext}. - * - * @param context - * an ExecutionContext for a process. - * @return the process-ID of a process which is able to work with the given - * ExecutionContext, or {@code null}. - */ - String selectProcess(ExecutionContext context); - - /** - * Returns the an Array of {@link ProcessDefinition}s of the processes - * included in this module. - * - * @return an array of resource uris of the processes included in this - * module. - */ - String[] getProcessDefinitions(); - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java deleted file mode 100644 index fc352742d..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/modulregistration/ModuleRegistration.java +++ /dev/null @@ -1,29 +0,0 @@ -package at.gv.egovernment.moa.id.moduls.modulregistration; - -import com.datentechnik.process_engine.api.ExecutionContext; - -public class ModuleRegistration { - - private static ModuleRegistration instance; - - public static ModuleRegistration getInstance() { - if (instance == null) { - instance = new ModuleRegistration(); - } - return instance; - } - - private ModuleRegistration() { - initRegistry(); - } - - private void initRegistry() { - // TODO: use ServiceLoader and Spring to find all modules - } - - public String selectProcess(ExecutionContext context) { - // TODO: implement - return null; - } - -} diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule new file mode 100644 index 000000000..0d7e98006 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule @@ -0,0 +1,2 @@ +# The default moaid process +at.gv.egovernment.moa.id.moduls.modulregistration.AuthModuleImpl \ No newline at end of file -- cgit v1.2.3 From aa216fc322265515a67e5218e33700e95b7788d3 Mon Sep 17 00:00:00 2001 From: Christian Wagner Date: Wed, 28 Jan 2015 11:08:26 +0100 Subject: add automated process selection --- .../moa/id/moduls/AuthenticationManager.java | 34 ++++++++++++++-------- .../moduleregistration/ModuleRegistration.java | 16 +++++++--- .../resources/properties/id_messages_de.properties | 1 + 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java index 0c481d94e..1a0c11aa1 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java @@ -76,6 +76,7 @@ import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.data.SLOInformationContainer; import at.gv.egovernment.moa.id.data.SLOInformationImpl; +import at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration; import at.gv.egovernment.moa.id.protocols.pvp2x.PVPTargetConfiguration; import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IEncoder; import at.gv.egovernment.moa.id.protocols.pvp2x.binding.PostBinding; @@ -94,9 +95,11 @@ import at.gv.egovernment.moa.id.util.Random; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; +import com.datentechnik.process_engine.ExecutionContextImpl; import com.datentechnik.process_engine.ProcessEngine; import com.datentechnik.process_engine.ProcessExecutionException; import com.datentechnik.process_engine.ProcessInstance; +import com.datentechnik.process_engine.api.ExecutionContext; public class AuthenticationManager implements MOAIDAuthConstants { @@ -544,13 +547,26 @@ public class AuthenticationManager implements MOAIDAuthConstants { Logger.info("Start Authentication Module: " + moasession.getModul() + " Action: " + moasession.getAction()); - + // create execution context + ExecutionContext executionContext = new ExecutionContextImpl(); + executionContext.put("ccc", moasession.getCcc()); + executionContext.put("useMandate", moasession.getUseMandate()); + executionContext.put("bkuURL", moasession.getBkuURL()); + executionContext.put(PARAM_SESSIONID, moasession.getSessionID()); + // create process instance - // TODO[MOAID-49]: Automatically selection of process - ProcessInstance pi = processEngine.createProcessInstance("DefaultAuthentication"); - // keep process instance id in moa session - moasession.setProcessInstanceId(pi.getId()); - + String processDefinitionId = ModuleRegistration.getInstance().selectProcess(executionContext); + + if (processDefinitionId == null) { + Logger.warn("No suitable process found for SessionID " + moasession.getSessionID() ); + throw new MOAIDException("process.02",new Object[] { + moasession.getSessionID()}); + } + + ProcessInstance pi = processEngine.createProcessInstance(processDefinitionId, executionContext); + // keep process instance id in moa session + moasession.setProcessInstanceId(pi.getId()); + // make sure moa session has been persisted before running the process try { AuthenticationSessionStoreage.storeSession(moasession); @@ -560,12 +576,6 @@ public class AuthenticationManager implements MOAIDAuthConstants { moasession.getSessionID()}); } - // set execution context - pi.getExecutionContext().put("ccc", moasession.getCcc()); - pi.getExecutionContext().put("useMandate", moasession.getUseMandate()); - pi.getExecutionContext().put("bkuURL", moasession.getBkuURL()); - pi.getExecutionContext().put(PARAM_SESSIONID, moasession.getSessionID()); - // start process processEngine.start(pi); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java index 522e5c7eb..b90e0d94f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java @@ -1,5 +1,7 @@ package at.gv.egovernment.moa.id.moduls.moduleregistration; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; +import com.datentechnik.process_engine.ProcessDefinitionParserException; import com.datentechnik.process_engine.ProcessEngine; import com.datentechnik.process_engine.api.ExecutionContext; @@ -94,11 +97,16 @@ public class ModuleRegistration { for (String uri : module.getProcessDefinitions()) { Resource resource = ctx.getResource(uri); if (resource.exists()) { - log.debug("Registering process definition resource url: '{}'.", resource); - // TODO: register resource with the process engine - // processEngine.registerResourceUri(resource); + log.debug("Registering process definition resource uri: '{}'.", resource); + try (InputStream processDefinitionInputStream = resource.getInputStream()) { + processEngine.registerProcessDefinition(processDefinitionInputStream); + } catch (IOException e) { + log.info("Resource uri: '{}' could NOT be read.", resource); + } catch (ProcessDefinitionParserException e) { + log.warn("Error while parsing process definition in '{}'", resource); + } } else { - log.info("Resource url: '{}' does NOT exist.", resource); + log.info("Resource uri: '{}' does NOT exist.", resource); } } } diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties index 232f53559..5dff986c2 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties @@ -269,3 +269,4 @@ slo.01=Sie konnten NICHT erfolgreich von allen Online-Applikationen abgemeldet w slo.02=Es wurde keine aktive SSO Session gefunden oder Sie sind bei keiner Online-Applikation angemeldet. process.01=Fehler beim Ausf\u00FChren des Prozesses. +process.02=Fehler beim Erstellen eines geeigneten Prozesses f\u00FCr die SessionID {0}. -- cgit v1.2.3 From 7ae32988fcf9e4407b4bcae7831772338da55a8f Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Wed, 28 Jan 2015 11:52:10 +0100 Subject: switch to automated process selection --- .../servlet/GenerateIFrameTemplateServlet.java | 29 +++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java index 430936e97..6e817e2a5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java @@ -41,12 +41,15 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.FileUtils; import at.gv.egovernment.moa.util.MiscUtil; +import com.datentechnik.process_engine.ExecutionContextImpl; import com.datentechnik.process_engine.ProcessInstance; +import com.datentechnik.process_engine.api.ExecutionContext; public class GenerateIFrameTemplateServlet extends AuthServlet { @@ -144,16 +147,24 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { moasession.getAction(), req); } - + + ExecutionContext ec = new ExecutionContextImpl(); + // set execution context + ec.put("ccc", moasession.getCcc()); + ec.put("useMandate", moasession.getUseMandate()); + ec.put("bkuURL", moasession.getBkuURL()); + // select and create process instance - // TODO[MOAID-49]: Automatically selection of process - ProcessInstance pi = getProcessEngine().createProcessInstance("DefaultAuthentication"); - // keep process instance id in moa session - moasession.setProcessInstanceId(pi.getId()); - // set execution context - pi.getExecutionContext().put("ccc", moasession.getCcc()); - pi.getExecutionContext().put("useMandate", moasession.getUseMandate()); - pi.getExecutionContext().put("bkuURL", moasession.getBkuURL()); + String processDefinitionId = ModuleRegistration.getInstance().selectProcess(ec); + ProcessInstance pi = getProcessEngine().createProcessInstance(processDefinitionId, ec); + + if (processDefinitionId == null) { + Logger.warn("No suitable process found for SessionID " + moasession.getSessionID()); + throw new MOAIDException("process.02", new Object[] { moasession.getSessionID() }); + } + + // keep process instance id in moa session + moasession.setProcessInstanceId(pi.getId()); // make sure moa session has been persisted before running the process try { -- cgit v1.2.3 From d45b41a740a6267c78a6ea27b7617c3d317db837 Mon Sep 17 00:00:00 2001 From: Christian Wagner Date: Thu, 29 Jan 2015 08:18:00 +0100 Subject: integrate process engine from project 'dti-process-engine' - INCOMPLETE! - commit neccessary in order to avoid blocking the development process additional small fix due to earlier package renaming --- .../src/main/webapp/WEB-INF/applicationContext.xml | 6 +- id/server/idserverlib/pom.xml | 5 - .../moa/id/process/ExecutionContextImpl.java | 79 ++++ .../process/ExpressionEvaluationContextImpl.java | 44 ++ .../moa/id/process/ProcessDefinitionParser.java | 224 ++++++++++ .../process/ProcessDefinitionParserException.java | 35 ++ .../egovernment/moa/id/process/ProcessEngine.java | 113 +++++ .../moa/id/process/ProcessEngineImpl.java | 304 +++++++++++++ .../moa/id/process/ProcessExecutionException.java | 36 ++ .../moa/id/process/ProcessInstance.java | 166 +++++++ .../moa/id/process/ProcessInstanceState.java | 30 ++ .../moa/id/process/api/ExecutionContext.java | 63 +++ .../process/api/ExpressionEvaluationContext.java | 23 + .../moa/id/process/api/ExpressionEvaluator.java | 25 ++ .../at/gv/egovernment/moa/id/process/api/Task.java | 21 + .../egovernment/moa/id/process/model/EndEvent.java | 42 ++ .../moa/id/process/model/ProcessDefinition.java | 158 +++++++ .../moa/id/process/model/ProcessNode.java | 69 +++ .../moa/id/process/model/StartEvent.java | 45 ++ .../egovernment/moa/id/process/model/TaskInfo.java | 94 ++++ .../moa/id/process/model/Transition.java | 136 ++++++ .../process/spring/SpringExpressionEvaluator.java | 61 +++ .../springweb/AbstractAuthSourceServlet.java | 116 +++++ .../springweb/AbstractSpringWebSupportedTask.java | 73 +++ .../moa/id/process/support/SecureRandomHolder.java | 35 ++ ...ent.moa.id.moduls.moduleregistration.AuthModule | 2 + ...ment.moa.id.moduls.modulregistration.AuthModule | 2 - .../moa/id/process/ProcessDefinition.xsd | 53 +++ ...mpleProcessDefinitionForSAML1Authentication.xml | 54 +++ .../SampleProcessDefinitionWithExpression1.xml | 19 + ...ingExpressionAwareProcessEngineTest-context.xml | 30 ++ .../test/SpringExpressionEvaluatorTest-context.xml | 14 + .../test/task/IdentityLink_Max_Mustermann.xml | 52 +++ .../id/process/spring/test/task/SAML1Assertion.xml | 487 +++++++++++++++++++++ .../process/spring/test/task/SignedAuthBlock.xml | 179 ++++++++ 35 files changed, 2886 insertions(+), 9 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParserException.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessExecutionException.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstanceState.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExecutionContext.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluator.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/Task.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/EndEvent.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/StartEvent.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/support/SecureRandomHolder.java create mode 100644 id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule delete mode 100644 id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule create mode 100644 id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index a4a06d24a..ce8fe8971 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -9,16 +9,18 @@ - + + @@ -27,5 +29,5 @@ - + diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 530e00d74..0b3319111 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -406,11 +406,6 @@ - - com.datentechnik.process-engine - dti-process-engine-spring-web - ${com.datentechnik.process-engine.version} - javax.servlet javax.servlet-api diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java new file mode 100644 index 000000000..87ee57a24 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java @@ -0,0 +1,79 @@ +package at.gv.egovernment.moa.id.process; + +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * ExecutionContext implementation, related to a certain process instance. + * + * @author tknall + * + */ +public class ExecutionContextImpl implements ExecutionContext { + + private static final long serialVersionUID = 1L; + + private Map ctxData = Collections.synchronizedMap(new HashMap()); + + private String processInstanceId; + + /** + * Creates a new instance. + */ + public ExecutionContextImpl() { + } + + /** + * Creates a new instance and associated it with a certain process instance. + */ + public ExecutionContextImpl(String processInstanceId) { + this.processInstanceId = processInstanceId; + } + + @Override + public void setProcessInstanceId(String processInstanceId) { + this.processInstanceId = processInstanceId; + } + + @Override + public String getProcessInstanceId() { + return processInstanceId; + } + + @Override + public Serializable get(String key) { + return ctxData.get(key); + } + + @Override + public Serializable remove(String key) { + return ctxData.remove(key); + } + + @Override + public void put(String key, Serializable object) { + ctxData.put(key, object); + } + + @Override + public Set keySet() { + return Collections.unmodifiableSet(ctxData.keySet()); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("ExecutionContextImpl ["); + builder.append("id=").append(processInstanceId); + builder.append(", variables="); + builder.append(ctxData.keySet()); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java new file mode 100644 index 000000000..acc10449f --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java @@ -0,0 +1,44 @@ +package at.gv.egovernment.moa.id.process; + +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import com.datentechnik.process_engine.api.ExecutionContext; +import com.datentechnik.process_engine.api.ExpressionEvaluationContext; + +/** + * Context implementation used for expression evaluation only. + * + * @author tknall + * + */ +public class ExpressionEvaluationContextImpl implements ExpressionEvaluationContext { + + private static final long serialVersionUID = 1L; + + private Map ctxData; + + /** + * Creates a new instance and initializes it with data from a given process instance. + * + * @param processInstance + * The process instance. + */ + ExpressionEvaluationContextImpl(ProcessInstance processInstance) { + ExecutionContext executionContext = processInstance.getExecutionContext(); + Set keys = executionContext.keySet(); + ctxData = Collections.synchronizedMap(new HashMap(keys.size())); + for (String key : keys) { + ctxData.put(key, executionContext.get(key)); + } + } + + @Override + public Map getCtx() { + return Collections.unmodifiableMap(ctxData); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java new file mode 100644 index 000000000..b38bb7aa0 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java @@ -0,0 +1,224 @@ +package at.gv.egovernment.moa.id.process; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; + +import javax.xml.XMLConstants; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; +import javax.xml.stream.util.EventReaderDelegate; +import javax.xml.transform.stax.StAXSource; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.SAXException; + +import com.datentechnik.process_engine.model.EndEvent; +import com.datentechnik.process_engine.model.ProcessDefinition; +import com.datentechnik.process_engine.model.ProcessNode; +import com.datentechnik.process_engine.model.StartEvent; +import com.datentechnik.process_engine.model.TaskInfo; +import com.datentechnik.process_engine.model.Transition; + +/** + * Parses an XML representation of a process definition as defined by the respective XML schema. + *

      transitionElements = new ArrayList<>(); + final List startEvents = new ArrayList<>(); + + reader = new EventReaderDelegate(reader) { + + @Override + public XMLEvent nextEvent() throws XMLStreamException { + XMLEvent event = super.nextEvent(); + + switch (event.getEventType()) { + case XMLStreamConstants.START_ELEMENT: + StartElement element = event.asStartElement(); + QName qname = element.getName(); + + if (NS.equals(qname.getNamespaceURI())) { + log.trace("Found process description element '{}'.", qname.getLocalPart()); + Attribute id = element.getAttributeByName(new QName("id")); + + switch (qname.getLocalPart()) { + case "ProcessDefinition": + if (id != null) { + pd.setId(id.getValue()); + } + break; + case "StartEvent": + StartEvent startEvent = new StartEvent(); + if (id != null) { + startEvent.setId(id.getValue()); + } + startEvents.add(startEvent); + break; + case "EndEvent": + EndEvent endEvent = new EndEvent(); + if (id != null) { + endEvent.setId(id.getValue()); + pd.getEndEvents().put(id.getValue(), endEvent); + } + break; + case "Transition": + transitionElements.add(element); + break; + case "Task": + TaskInfo taskInfo = new TaskInfo(); + if (id != null) { + taskInfo.setId(id.getValue()); + pd.getTaskInfos().put(id.getValue(), taskInfo); + } + Attribute async = element.getAttributeByName(new QName("async")); + if (async != null) { + taskInfo.setAsync(Boolean.valueOf(async.getValue())); + } + Attribute implementingClass = element.getAttributeByName(new QName("class")); + if (implementingClass != null) { + taskInfo.setTaskImplementingClass(implementingClass.getValue()); + } + break; + } + + } + + break; + } + + return event; + } + + }; + + // validator is not thread-safe + Validator validator = LazyProcessDefinitionSchemaHolder.PD_SCHEMA_INSTANCE.newValidator(); + validator.validate(new StAXSource(reader)); + log.trace("Process definition successfully schema validated."); + + // perform some basic checks + log.trace("Building model and performing some plausibility checks."); + if (startEvents.size() != 1) { + throw new ProcessDefinitionParserException("A ProcessDefinition must contain exactly one single StartEvent."); + } + pd.setStartEvent(startEvents.get(0)); + + // link transitions + Iterator transitions = transitionElements.iterator(); + while (transitions.hasNext()) { + StartElement element = transitions.next(); + Transition transition = new Transition(); + Attribute id = element.getAttributeByName(new QName("id")); + if (id != null) { + transition.setId(id.getValue()); + } + Attribute conditionExpression = element.getAttributeByName(new QName("conditionExpression")); + if (conditionExpression != null) { + transition.setConditionExpression(conditionExpression.getValue()); + } + Attribute from = element.getAttributeByName(new QName("from")); + if (from != null) { + ProcessNode fromNode = pd.getProcessNode(from.getValue()); + if (fromNode == null) { + throw new ProcessDefinitionParserException("Transition's 'from'-attribute refers to a non-existing event or task '" + from.getValue() + '.'); + } + if (fromNode instanceof EndEvent) { + throw new ProcessDefinitionParserException("Transition cannot start from end event."); + } + transition.setFrom(fromNode); + fromNode.getOutgoingTransitions().add(transition); + } + Attribute to = element.getAttributeByName(new QName("to")); + if (to != null) { + ProcessNode toNode = pd.getProcessNode(to.getValue()); + if (toNode == null) { + throw new ProcessDefinitionParserException("Transition's 'to'-attribute refers to a non-existing event or task '" + to.getValue() + '.'); + } + transition.setTo(toNode); + toNode.getIncomingTransitions().add(transition); + } + if (transition.getConditionExpression() == null && Objects.equals(transition.getFrom(), transition.getTo())) { + throw new ProcessDefinitionParserException("Transition's 'from' equals its 'to'. Since no 'conditionExpression' has been set this will cause a loop."); + } + } + log.debug("Process definition '{}' successfully parsed.", pd.getId()); + return pd; + + } catch (ProcessDefinitionParserException e) { + throw e; + } catch (XMLStreamException|IOException e) { + throw new ProcessDefinitionParserException("Unable to read process definition from inputstream.", e); + } catch (SAXException e) { + throw new ProcessDefinitionParserException("Schema validation of process description failed.", e); + } catch (Exception e) { + throw new ProcessDefinitionParserException("Internal error creating process definition from inputstream.", e); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (XMLStreamException e) { + // error freeing resources + } + } + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParserException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParserException.java new file mode 100644 index 000000000..0c214750d --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParserException.java @@ -0,0 +1,35 @@ +package at.gv.egovernment.moa.id.process; + +/** + * Exception thrown in case of error parsing a process definition. + * + * @author tknall + * + */ +public class ProcessDefinitionParserException extends Exception { + + private static final long serialVersionUID = 1L; + + /** + * Creates a new parser exception providing a {@code message} describing the reason and the {@code cause}. + * + * @param message + * The message. + * @param cause + * The cause. + */ + public ProcessDefinitionParserException(String message, Throwable cause) { + super(message, cause); + } + + /** + * Creates a new parser exception providing a {@code message} describing the reason. + * + * @param message + * The message. + */ + public ProcessDefinitionParserException(String message) { + super(message); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java new file mode 100644 index 000000000..b4135ee41 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java @@ -0,0 +1,113 @@ +package at.gv.egovernment.moa.id.process; + + +import java.io.InputStream; +import java.io.Serializable; + +import com.datentechnik.process_engine.api.ExecutionContext; +import com.datentechnik.process_engine.model.ProcessDefinition; + +/** + * Process engine providing means for starting and resuming processes. + * + * @author tknall + */ +public interface ProcessEngine { + + /** + * Registers a new process definition. Note that existing definitions with the same identifier will be replaced. + * + * @param processDefinition + * The process definition to be registered. + */ + void registerProcessDefinition(ProcessDefinition processDefinition); + + /** + * Registers a new process definition given as {@link InputStream}. Note that existing definitions with the same identifier will be replaced. + * + * @param processDefinitionInputStream The input stream to the definition to be registered. + * @throws ProcessDefinitionParserException Thrown in case of an error parsing the process definition. + */ + void registerProcessDefinition(InputStream processDefinitionInputStream) throws ProcessDefinitionParserException; + + /** + * Creates a process instance according to the referenced process definition. + *

      + * Note that the method returns a process instance which will be needed in order to start a process or to continue + * process execution after asynchronous task execution (refer to {@link #start(ProcessInstance)} and + * {@link #signal(ProcessInstance)} for further information). + * + * @param processDefinitionId + * The identifier of the respective process definition. + * @param executionContext The execution context (may be {@code null}). + * @return The newly created process instance (never {@code null}). + * @throws ProcessExecutionException + * Thrown in case of error, e.g. when a {@code processDefinitionId} is referenced that does not exist. + */ + ProcessInstance createProcessInstance(String processDefinitionId, ExecutionContext executionContext) throws ProcessExecutionException; + + /** + * Creates a process instance according to the referenced process definition. + *

      + * Note that the method returns a process instance which will be needed in order to start a process or to continue + * process execution after asynchronous task execution (refer to {@link #start(ProcessInstance)} and + * {@link #signal(ProcessInstance)} for further information). + * + * @param processDefinitionId + * The identifier of the respective process definition. + * @return The newly created process instance (never {@code null}). + * @throws ProcessExecutionException + * Thrown in case of error, e.g. when a {@code processDefinitionId} is referenced that does not exist. + */ + ProcessInstance createProcessInstance(String processDefinitionId) throws ProcessExecutionException; + + /** + * Returns the process instance with a given {@code processInstanceId}. + * + * @param processInstanceId + * The process instance id. + * @return The process instance (never {@code null}). + * @throws IllegalArgumentException + * In case the process instance does not/no longer exist. + */ + ProcessInstance getProcessInstance(String processInstanceId); + + /** + * Starts the process using the given {@code processInstance}. + * + * @param processInstance + * The process instance. + * @throws ProcessExecutionException + * Thrown in case of error. + */ + void start(ProcessInstance processInstance) throws ProcessExecutionException; + + /** + * Resumes process execution after an asynchronous task has been executed. + * + * @param processInstance + * The process instance. + * @throws ProcessExecutionException + * Thrown in case of error. + */ + void signal(ProcessInstance processInstance) throws ProcessExecutionException; + + /** + * Performs cleanup, removing all process instances that have not been used for a certain time. + * + * @see #setProcessInstanceMaxIdleTimeSeconds(long) + */ + void cleanup(); + + /** + * Returns the first process instance with a process context containing some {@code value} stored under key {@code key}. + * + * @param key + * The key. + * @param value + * The value that needs to match. + * @return The process instance or {@code null} in case no process instance was found. + */ + ProcessInstance findProcessInstanceWith(String key, Serializable value); + +} \ No newline at end of file diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java new file mode 100644 index 000000000..8f9d73b3d --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java @@ -0,0 +1,304 @@ +package at.gv.egovernment.moa.id.process; + +import java.io.InputStream; +import java.io.Serializable; +import java.util.Date; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.MDC; + +import com.datentechnik.process_engine.api.ExecutionContext; +import com.datentechnik.process_engine.api.ExpressionEvaluationContext; +import com.datentechnik.process_engine.api.ExpressionEvaluator; +import com.datentechnik.process_engine.api.Task; +import com.datentechnik.process_engine.model.EndEvent; +import com.datentechnik.process_engine.model.ProcessDefinition; +import com.datentechnik.process_engine.model.ProcessNode; +import com.datentechnik.process_engine.model.StartEvent; +import com.datentechnik.process_engine.model.TaskInfo; +import com.datentechnik.process_engine.model.Transition; + +/** + * Process engine implementation allowing starting and continuing processes as well as providing means for cleanup actions. + * @author tknall + * + */ +public class ProcessEngineImpl implements ProcessEngine { + + private Logger log = LoggerFactory.getLogger(getClass()); + + private ProcessDefinitionParser pdp = new ProcessDefinitionParser(); + + private Map processDefinitions = new ConcurrentHashMap(); + private Map processInstances = new ConcurrentHashMap(); + + private final static String MDC_CTX_PI_NAME = "processInstanceId"; + private final static String MDC_CTX_TASK_NAME = "taskId"; + + private static final long DEFAULT_PROCESS_INSTANCE_MAX_AGE_SECONDS = 3600; + private long processInstanceIdleTimeSeconds = DEFAULT_PROCESS_INSTANCE_MAX_AGE_SECONDS; + private ExpressionEvaluator transitionConditionExpressionEvaluator; + + @Override + public void registerProcessDefinition(ProcessDefinition processDefinition) { + log.info("Registering process definition '{}'.", processDefinition.getId()); + processDefinitions.put(processDefinition.getId(), processDefinition); + } + + @Override + public void registerProcessDefinition(InputStream processDefinitionInputStream) throws ProcessDefinitionParserException{ + registerProcessDefinition(pdp.parse(processDefinitionInputStream)); + } + + /** + * Sets the process definitions. + * + * @param processDefinitions + * The process definitions. + * @throws IllegalArgumentException + * In case the process definitions contain definitions with the same identifier. + */ + public void setProcessDefinitions(Iterable processDefinitions) { + this.processDefinitions.clear(); + for (ProcessDefinition pd : processDefinitions) { + if (this.processDefinitions.containsKey(pd.getId())) { + throw new IllegalArgumentException("Duplicate process definition identifier '" + pd.getId() + "'."); + } + registerProcessDefinition(pd); + } + } + + /** + * Defines the time frame in seconds an idle process instance will be managed by the process engine. A process + * instance with an idle time larger than the given time will be removed. + *

      + * Note that {@link #cleanup()} needs to be called in order to remove expired process instances. + * + * @param processInstanceMaxIdleTimeSeconds + * The maximum idle time in seconds. + */ + public void setProcessInstanceMaxIdleTimeSeconds(long processInstanceMaxIdleTimeSeconds) { + this.processInstanceIdleTimeSeconds = processInstanceMaxIdleTimeSeconds; + } + + /** + * Sets an expression evaluator that should be used to process transition condition expressions. + * @param transitionConditionExpressionEvaluator The expression evaluator. + */ + public void setTransitionConditionExpressionEvaluator( + ExpressionEvaluator transitionConditionExpressionEvaluator) { + this.transitionConditionExpressionEvaluator = transitionConditionExpressionEvaluator; + } + + + @Override + public ProcessInstance createProcessInstance(String processDefinitionId, ExecutionContext executionContext) throws ProcessExecutionException { + // look for respective process definition + ProcessDefinition pd = processDefinitions.get(processDefinitionId); + if (pd == null) { + throw new ProcessExecutionException("Unable to find process definition for process '" + processDefinitionId + "'."); + } + // create and keep process instance + ProcessInstance pi = new ProcessInstance(pd, executionContext); + log.info("Creating process instance from process definition '{}': {}", processDefinitionId, pi.getId()); + processInstances.put(pi.getId(), pi); + return pi; + } + + @Override + public ProcessInstance createProcessInstance(String processDefinitionId) throws ProcessExecutionException { + return createProcessInstance(processDefinitionId, null); + } + + @Override + public void start(ProcessInstance pi) throws ProcessExecutionException { + MDC.put(MDC_CTX_PI_NAME, pi.getId()); + try { + if (!ProcessInstanceState.NOT_STARTED.equals(pi.getState())) { + throw new ProcessExecutionException("Process instance '" + pi.getId() + "' has already been started (current state is " + pi.getState() + ")."); + } + log.info("Starting process instance '{}'.", pi.getId()); + // execute process + pi.setState(ProcessInstanceState.STARTED); + execute(pi); + } finally { + MDC.remove(MDC_CTX_PI_NAME); + } + } + + @Override + public void signal(ProcessInstance pi) throws ProcessExecutionException { + MDC.put(MDC_CTX_PI_NAME, pi.getId()); + try { + if (!ProcessInstanceState.SUSPENDED.equals(pi.getState())) { + throw new ProcessExecutionException("Process instance '" + pi.getId() + "' has not been suspended (current state is " + pi.getState() + ")."); + } + log.info("Waking up process instance '{}'.", pi.getId()); + pi.setState(ProcessInstanceState.STARTED); + execute(pi); + } finally { + MDC.remove(MDC_CTX_PI_NAME); + } + } + + @Override + public synchronized void cleanup() { + log.trace("Cleanup job started."); + Iterator> it = processInstances.entrySet().iterator(); + while (it.hasNext()) { + Entry entry = it.next(); + ProcessInstance pi = entry.getValue(); + log.trace("Checking process instance {}.", pi); + long ageMillis = new Date().getTime() - pi.getLru().getTime(); + if (ageMillis > processInstanceIdleTimeSeconds * 1000) { + log.info("Removing process instance '{}'.", pi.getId()); + processInstances.remove(entry.getKey()); + } + } + log.trace("Cleanup job completed."); + } + + /** + * Instantates a task implementation given by a {@link TaskInfo}. + * @param ti The task info. + * @return A Task implementation or {@code null} if the task info does not reference any task implementing classes. + * @throws ProcessExecutionException Thrown in case of error (when the referenced class does not implement {@link Task} for instance). + */ + private Task createTaskInstance(TaskInfo ti) throws ProcessExecutionException { + String clazz = StringUtils.trimToNull(ti.getTaskImplementingClass()); + Task task = null; + + if (clazz != null) { + log.debug("Instantiating task implementing class '{}'.", clazz); + Class instanceClass = null; + try { + instanceClass = Class.forName(clazz, true, Thread.currentThread().getContextClassLoader()); + } catch (Exception e) { + throw new ProcessExecutionException("Unable to get class '" + clazz + "' associated with task '" + ti.getId() + "' .", e); + } + if (!Task.class.isAssignableFrom(instanceClass)) { + throw new ProcessExecutionException("Class '" + clazz + "' associated with task '" + ti.getId() + "' is not assignable to " + Task.class.getName() + "."); + } + try { + task = (Task) instanceClass.newInstance(); + } catch (Exception e) { + throw new ProcessExecutionException("Unable to instantiate class '" + clazz + "' associated with task '" + ti.getId() + "' .", e); + } + } + + return task; + } + + /** + * Starts/executes a given process instance. + * @param pi The process instance. + * @throws ProcessExecutionException Thrown in case of error. + */ + private void execute(final ProcessInstance pi) throws ProcessExecutionException { + if (ProcessInstanceState.ENDED.equals(pi.getState())) { + throw new ProcessExecutionException("Process for instance '" + pi.getId() + "' has already been ended."); + } + ProcessDefinition pd = pi.getProcessDefinition(); + ProcessNode processNode = pd.getProcessNode(pi.getNextId()); + log.debug("Processing node '{}'.", processNode.getId()); + + // distinguish process node types StartEvent, TaskInfo and EndEvent + + if (processNode instanceof TaskInfo) { + // TaskInfo types need to be executed + TaskInfo ti = (TaskInfo) processNode; + MDC.put(MDC_CTX_TASK_NAME, ti.getId()); + try { + log.info("Processing task '{}'.", ti.getId()); + Task task = createTaskInstance(ti); + if (task != null) { + try { + log.info("Executing task implementation for task '{}'.", ti.getId()); + log.debug("Execution context before task execution: {}", pi.getExecutionContext().keySet()); + task.execute(pi.getExecutionContext()); + log.info("Returned from execution of task '{}'.", ti.getId()); + log.debug("Execution context after task execution: {}", pi.getExecutionContext().keySet()); + } catch (Throwable t) { + throw new ProcessExecutionException("Error executing task '" + ti.getId() + "'.", t); + } + } else { + log.debug("No task implementing class set."); + } + } finally { + MDC.remove(MDC_CTX_TASK_NAME); + } + + } else if (processNode instanceof EndEvent) { + log.info("Finishing process instance '{}'.", pi.getId()); + processInstances.remove(pi.getId()); + pi.setState(ProcessInstanceState.ENDED); + log.debug("Final process context: {}", pi.getExecutionContext().keySet()); + return; + } + + final ExpressionEvaluationContext expressionContext = new ExpressionEvaluationContextImpl(pi); + + // traverse pointer + Transition t = CollectionUtils.find(processNode.getOutgoingTransitions(), new Predicate() { + @Override + public boolean evaluate(Transition transition) { + if (transitionConditionExpressionEvaluator != null && transition.getConditionExpression() != null) { + log.trace("Evaluating transition expression '{}'.", transition.getConditionExpression()); + return transitionConditionExpressionEvaluator.evaluate(expressionContext, transition.getConditionExpression()); + } + return true; + } + }); + if (t == null) { + throw new ProcessExecutionException("No valid transition starting from process node '" + processNode.getId()+ "'."); + } + log.trace("Found suitable transition: {}", t); + // update pointer + log.trace("Shifting process token from '{}' to '{}'.", pi.getNextId(), t.getTo().getId()); + pi.setNextId(t.getTo().getId()); + + // inspect current task + if (t.getTo() instanceof TaskInfo && (((TaskInfo) t.getTo()).isAsync())) { + // immediately return in case of asynchonous task + log.info("Suspending process instance '{}' for asynchronous task '{}'.", pi.getId(), t.getTo().getId()); + pi.setState(ProcessInstanceState.SUSPENDED); + return; + } + + // continue execution in case of StartEvent or Task + if (processNode instanceof StartEvent || processNode instanceof TaskInfo) { + execute(pi); + } + } + + @Override + public ProcessInstance getProcessInstance(String processInstanceId) { + ProcessInstance processInstance = processInstances.get(processInstanceId); + if (processInstance == null) { + throw new IllegalArgumentException("The process instance '" + processInstanceId + "' does not/no longer exist."); + } + return processInstance; + } + + @Override + public ProcessInstance findProcessInstanceWith(String key, Serializable value) { + Iterator it = processInstances.values().iterator(); + while (it.hasNext()) { + ProcessInstance pi = it.next(); + if (Objects.equals(pi.getExecutionContext().get(key), value)) { + return pi; + } + } + return null; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessExecutionException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessExecutionException.java new file mode 100644 index 000000000..821bbe6dc --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessExecutionException.java @@ -0,0 +1,36 @@ +package at.gv.egovernment.moa.id.process; + +/** + * Indicates a problem when executing a process. + * + * @author tknall + * + */ +public class ProcessExecutionException extends Exception { + + private static final long serialVersionUID = 1L; + + /** + * Creates a new process execution exception providing a {@code message} describing the reason and the respective + * {@code cause}. + * + * @param message + * The message. + * @param cause + * The cause. + */ + public ProcessExecutionException(String message, Throwable cause) { + super(message, cause); + } + + /** + * Creates a new process execution exception providing a {@code message} describing the reason. + * + * @param message + * The message. + */ + public ProcessExecutionException(String message) { + super(message); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java new file mode 100644 index 000000000..0899426ca --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java @@ -0,0 +1,166 @@ +package at.gv.egovernment.moa.id.process; + +import java.io.Serializable; +import java.util.Date; + +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; +import com.datentechnik.process_engine.model.ProcessDefinition; +import com.datentechnik.process_engine.support.SecureRandomHolder; + +/** + * Represents a process being executed. The process instance provides information about the process and its state. + * + * @author tknall + * + */ +public class ProcessInstance implements Serializable { + + private static final long serialVersionUID = 1L; + private static final int RND_ID_LENGTH = 22; + + private ProcessDefinition processDefinition; + private String nextId; + private Date lru; + private ExecutionContext executionContext; + private ProcessInstanceState state = ProcessInstanceState.NOT_STARTED; + + /** + * Creates a new process instance, based on a given process definition.

      + * An execution context will be created internally. + * + * @param processDefinition + * The process definition. + */ + ProcessInstance(ProcessDefinition processDefinition) { + this(processDefinition, null); + } + + /** + * Creates a new process instance, based on a given process definition and a + * given execution context. If the given execution context is {@code null} a new execution context will be created.

      + * The process instance id of the execution context will automatically be set (and overwritten if already set). + * + * @param processDefinition + * The process definition. + * @param executionContext + * The execution context (may be {@code null}). If {@code null} a new execution context will be created internally. + */ + ProcessInstance(ProcessDefinition processDefinition, ExecutionContext executionContext) { + this.processDefinition = processDefinition; + nextId = processDefinition.getStartEvent().getId(); + String pdIdLocalPart = RandomStringUtils.random(RND_ID_LENGTH, 0, 0, true, true, null, + SecureRandomHolder.getInstance()); + if (executionContext == null) { + executionContext = new ExecutionContextImpl(); + } + executionContext.setProcessInstanceId(this.processDefinition.getId() + "-" + pdIdLocalPart); + this.executionContext = executionContext; + touch(); + } + + /** + * Returns the underlying process definition. + * + * @return The underlying process definition. + */ + ProcessDefinition getProcessDefinition() { + touch(); + return processDefinition; + } + + /** + * Returns the id of the process node to be executed next. + * + * @return The process node pointer indicating the process node to be executed next. + */ + public String getNextId() { + touch(); + return nextId; + } + + /** + * Sets the internal pointer to the process node to be executed next. + * + * @param nextId + * The process node id to be executed next. + */ + void setNextId(String nextId) { + touch(); + this.nextId = nextId; + } + + /** + * Returns the current state of the process instance. + * + * @return The current state. + */ + public ProcessInstanceState getState() { + touch(); + return state; + } + + /** + * Sets the current state of the process instance. + * + * @param state + * The current state. + */ + void setState(ProcessInstanceState state) { + touch(); + this.state = state; + } + + public String getId() { + touch(); + return executionContext.getProcessInstanceId(); + } + + /** + * Updates the last recently used date of the process instance. + */ + private void touch() { + lru = new Date(); + } + + /** + * Returns the date the process instance has been accessed last. + * + * @return The last recently used date. + */ + Date getLru() { + return lru; + } + + /** + * Returns the associated execution context. + * @return The execution context (never {@code null}). + */ + public ExecutionContext getExecutionContext() { + touch(); + return executionContext; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("ProcessInstance ["); + builder.append("id=").append(executionContext.getProcessInstanceId()); + builder.append(", idle since=").append( + DurationFormatUtils.formatDurationWords(new Date().getTime() - this.lru.getTime(), true, true)); + if (processDefinition != null) { + builder.append(", processDefinition.id="); + builder.append(processDefinition.getId()); + } + if (nextId != null) { + builder.append(", nextId="); + builder.append(nextId); + } + builder.append(", executionContext=").append(executionContext); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstanceState.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstanceState.java new file mode 100644 index 000000000..2765283a0 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstanceState.java @@ -0,0 +1,30 @@ +package at.gv.egovernment.moa.id.process; + +/** + * Represents a certain process instance state. + * @author tknall + * + */ +public enum ProcessInstanceState { + + /** + * Indicates that the process with this process instance has not yet been started. + */ + NOT_STARTED, + + /** + * Indicates that the process is currently running. + */ + STARTED, + + /** + * Indicates that the process has been suspended until being waken up by someonce calling {@code signal}. + */ + SUSPENDED, + + /** + * Indicates that the process has been completed. + */ + ENDED + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExecutionContext.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExecutionContext.java new file mode 100644 index 000000000..4a9dfc336 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExecutionContext.java @@ -0,0 +1,63 @@ +package at.gv.egovernment.moa.id.process.api; + +import java.io.Serializable; +import java.util.Set; + +/** + * Encapsulates data needed for or provided by task execution. + * + * @author tknall + * + */ +public interface ExecutionContext extends Serializable { + + /** + * Returns the identifier of underlying process instance. + * + * @return The identifier of the process instance. + */ + String getProcessInstanceId(); + + /** + * Sets the identifier of underlying process instance. + * + * @param processInstanceId + * The identifier of the process instance. + */ + void setProcessInstanceId(String processInstanceId); + + /** + * Stores a serializable object using {@code key}. + * + * @param key + * The key under that the {@code object} should be stored. + * @param object The object to be stored. + */ + void put(String key, Serializable object); + + /** + * Returns an serializable object stored within this process context using {@code key}. + * + * @param key + * The key that has been used to store the serializable object (may be {@code null}). + * @return The object or {@code null} in case the key does not relate to a stored object or the stored object itself + * was {@code null}. + */ + Serializable get(String key); + + /** + * Removes the object stored using {@code key}. + * @param key + * The key that has been used to store the serializable object (may be {@code null}). + * @return The object that has been removed or {@code null} there was no object stored using {@code key}. + */ + Serializable remove(String key); + + /** + * Returns an unmodifiable set containing the stored keys. + * + * @return The keyset (never {@code null}). + */ + Set keySet(); + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java new file mode 100644 index 000000000..bb3b267cf --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java @@ -0,0 +1,23 @@ +package at.gv.egovernment.moa.id.process.api; + +import java.io.Serializable; +import java.util.Map; + +import com.datentechnik.process_engine.model.Transition; + +/** + * Context used for evaluation of condition expressions set for {@linkplain Transition Transitions}. + * + * @author tknall + * + */ +public interface ExpressionEvaluationContext extends Serializable { + + /** + * Returns the context data map used for expression evaluation. + * + * @return An unmodifiable map (never {@code null}). + */ + Map getCtx(); + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluator.java new file mode 100644 index 000000000..fe0743201 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluator.java @@ -0,0 +1,25 @@ +package at.gv.egovernment.moa.id.process.api; + +/** + * Evaluates a given {@code expression} returning a boolean value. + * + * @author tknall + */ +public interface ExpressionEvaluator { + + /** + * Evaluates a given {@code expression} returning a boolean value. + * + * @param expressionContext + * The context which can be used for evaluation of the expression. + * @param expression + * The expression resulting in a boolean (must not be {@code null}). + * @return A boolean value. + * @throws IllegalArgumentException + * In case of an invalid {@code expression}. + * @throws NullPointerException + * In case of a {@code null} expression. + */ + boolean evaluate(ExpressionEvaluationContext expressionContext, String expression); + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/Task.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/Task.java new file mode 100644 index 000000000..6401b1d5d --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/Task.java @@ -0,0 +1,21 @@ +package at.gv.egovernment.moa.id.process.api; + + +/** + * Represents a single task to be performed upon process execution. + * + * @author tknall + * + */ +public interface Task { + + /** + * Executes this task. + * + * @param executionContext + * Provides execution related information. + * @throws Exception An exception upon task execution. + */ + void execute(ExecutionContext executionContext) throws Exception; + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/EndEvent.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/EndEvent.java new file mode 100644 index 000000000..49fb082ea --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/EndEvent.java @@ -0,0 +1,42 @@ +package at.gv.egovernment.moa.id.process.model; + +import java.io.Serializable; + +import org.apache.commons.collections4.CollectionUtils; + +/** + * Represents an end event. Process execution terminates when an end event is reached. + * + * @author tknall + */ +public class EndEvent extends ProcessNode implements Serializable { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("EndEvent ["); + if (getId() != null) { + builder.append("id="); + builder.append(getId()); + } + if (CollectionUtils.isNotEmpty(getIncomingTransitions())) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("incomingTransitions="); + builder.append(getIncomingTransitions()); + } + if (CollectionUtils.isNotEmpty(getOutgoingTransitions())) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("outgoingTransitions="); + builder.append(getOutgoingTransitions()); + } + builder.append("]"); + return builder.toString(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java new file mode 100644 index 000000000..19e78b0e6 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java @@ -0,0 +1,158 @@ +package at.gv.egovernment.moa.id.process.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; + +import com.datentechnik.process_engine.ProcessDefinitionParser; + +/** + * Represents a single process definition containing + *

        + *
      • a {@link StartEvent},
      • + *
      • one or more {@linkplain TaskInfo Tasks},
      • + *
      • one or more {@linkplain EndEvent EndEvents} and
      • + *
      • some {@linkplain Transition Transitions} linking StartEvents, Tasks and EndEvents. + *
      + * + * @author tknall + * + */ +public class ProcessDefinition { + + private String id; + private StartEvent startEvent; + private Map taskInfos = new LinkedHashMap<>(); + private Map endEvents = new LinkedHashMap<>(); + + /** + * Returns the unique identifier of the process definition. + * + * @return The unique identifier (never {@code null} if process definition comes from + * {@link ProcessDefinitionParser}). + */ + public String getId() { + return id; + } + + /** + * Sets the unique identifier of the process definition. + * + * @param id + * The unique identifier. + */ + public void setId(String id) { + this.id = id; + } + + /** + * Returns the start event of the process definition. + * + * @return The start event (never {@code null} if process definition comes from {@link ProcessDefinitionParser}). + */ + public StartEvent getStartEvent() { + return startEvent; + } + + /** + * Sets the start event of the process definition. + * + * @param startEvent + * The start event. + */ + public void setStartEvent(StartEvent startEvent) { + this.startEvent = startEvent; + } + + /** + * Returns a map containing the tasks of the process definition. + * + * @return The tasks (map is never {@code null} if process definition comes from {@link ProcessDefinitionParser}). + */ + public Map getTaskInfos() { + return taskInfos; + } + + /** + * Sets the map containing the tasks. + * + * @param taskInfos + * The map containing the tasks. + */ + public void setTaskInfos(Map taskInfos) { + this.taskInfos = taskInfos; + } + + /** + * Returns a map containing the end events of the process description. + * + * @return The map containing the end events (map is never {@code null} if process definition comes from + * {@link ProcessDefinitionParser}). + */ + public Map getEndEvents() { + return endEvents; + } + + /** + * Sets a map containing the end events of the process description. + * + * @param endEvents + * The map containing the end events. + */ + public void setEndEvents(Map endEvents) { + this.endEvents = endEvents; + } + + /** + * Returns the process node associated with the given {@code id}. + * + * @param id + * The identifier of the process node. + * @return The process node (may be {code null} when no process node with the given {@code id} exists). + */ + public ProcessNode getProcessNode(String id) { + Objects.requireNonNull(id, "Identifier must not be null."); + if (startEvent != null && id.equals(startEvent.getId())) { + return startEvent; + } + TaskInfo task = taskInfos.get(id); + if (task != null) { + return task; + } + return endEvents.get(id); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + if (id != null) { + builder.append("id="); + builder.append(id); + } + if (startEvent != null) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("startEvent="); + builder.append(startEvent); + } + if (taskInfos != null && !taskInfos.isEmpty()) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("tasksInfos="); + builder.append(taskInfos.values()); + } + if (endEvents != null && !endEvents.isEmpty()) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("endEvents="); + builder.append(endEvents.values()); + } + builder.insert(0, "ProcessDefinition ["); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java new file mode 100644 index 000000000..a94d33943 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java @@ -0,0 +1,69 @@ +package at.gv.egovernment.moa.id.process.model; + +import java.util.ArrayList; +import java.util.List; + +import com.datentechnik.process_engine.ProcessDefinitionParser; + +/** + * Represents a {@link StartEvent}, an {@link EndEvent} or a {@linkplain TaskInfo Task}. + * @author tknall + * + */ +public abstract class ProcessNode { + + private String id; + private List outgoingTransitions = new ArrayList<>(); + private List incomingTransitions = new ArrayList<>(); + + /** + * Returns the unique identifier of the process node. + * + * @return The unique identifier (never {@code null} if process node comes from a process definition from + * {@link ProcessDefinitionParser}). + */ + public String getId() { + return id; + } + + /** + * Sets the unique identifier of the process node. + * @param id The unique identifier. + */ + public void setId(String id) { + this.id = id; + } + + /** + * Returns a list of transitions pointing from this process node to another one. + * @return A list of transitions (never {@code null} if process node comes from a process definition from {@link ProcessDefinitionParser}). + */ + public List getOutgoingTransitions() { + return outgoingTransitions; + } + + /** + * Sets the list of transitions pointing from this process node to another one. + * @param outgoingTransitions The list of transitions originating from this process node. + */ + public void setOutgoingTransitions(List outgoingTransitions) { + this.outgoingTransitions = outgoingTransitions; + } + + /** + * Returns a list of transitions pointing from another process node to this one. + * @return A list of transitions (never {@code null} if process node comes from a process definition from {@link ProcessDefinitionParser}). + */ + public List getIncomingTransitions() { + return incomingTransitions; + } + + /** + * Sets the list of transitions pointing from another process node to this one. + * @param incomingTransitions A list of transitions pointing to this process node. + */ + public void setIncomingTransitions(List incomingTransitions) { + this.incomingTransitions = incomingTransitions; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/StartEvent.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/StartEvent.java new file mode 100644 index 000000000..60175e09c --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/StartEvent.java @@ -0,0 +1,45 @@ +package at.gv.egovernment.moa.id.process.model; + +import java.io.Serializable; + +import org.apache.commons.collections4.CollectionUtils; + +/** + * Represents a start event. Each process description contains a single start event. Process execution starts with a + * start event. + * + * @author tknall + * + */ +public class StartEvent extends ProcessNode implements Serializable { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("StartEvent ["); + if (getId() != null) { + builder.append("id="); + builder.append(getId()); + } + if (CollectionUtils.isNotEmpty(getIncomingTransitions())) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("incomingTransitions="); + builder.append(getIncomingTransitions()); + } + if (CollectionUtils.isNotEmpty(getOutgoingTransitions())) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("outgoingTransitions="); + + builder.append(getOutgoingTransitions()); + } + builder.append("]"); + return builder.toString(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java new file mode 100644 index 000000000..b7f13a880 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java @@ -0,0 +1,94 @@ +package at.gv.egovernment.moa.id.process.model; + +import java.io.Serializable; + +import org.apache.commons.collections4.CollectionUtils; + +import com.datentechnik.process_engine.api.Task; + +/** + * Represents information about a single task to be performed upon process execution. + * @author tknall + * + */ +public class TaskInfo extends ProcessNode implements Serializable { + + private static final long serialVersionUID = 1L; + private static final boolean DEFAULT_ASYNC = false; + + private String taskImplementingClass; + private boolean async = DEFAULT_ASYNC; + + /** + * Determines if the task is marked asynchronous ({@code true}) or synchronous ({@code false}). + * @return A flag indicating if the task should be executed asynchronously or synchronously. (Default: {@code false}) + */ + public boolean isAsync() { + return async; + } + + /** + * Marks a task to executed asynchronously ({@code true}) or synchronously ({@code false}). + * @param async The flag. + */ + public void setAsync(boolean async) { + this.async = async; + } + + /** + * Returns the class that implements the actual task (must implement {@link Task}). + * @return The task implementing class. + */ + public String getTaskImplementingClass() { + return taskImplementingClass; + } + + /** + * Sets the class that implements the actual task (must implement {@link Task}). + * @param taskImplementingClass The task implementing class. + */ + public void setTaskImplementingClass(String taskImplementingClass) { + this.taskImplementingClass = taskImplementingClass; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + if (getId() != null) { + builder.append("id="); + builder.append(getId()); + } + if (async != DEFAULT_ASYNC) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("async="); + builder.append(async); + } + if (taskImplementingClass != null) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("taskImplementingClass="); + builder.append(taskImplementingClass); + } + if (CollectionUtils.isNotEmpty(getIncomingTransitions())) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("incomingTransitions="); + builder.append(getIncomingTransitions()); + } + if (CollectionUtils.isNotEmpty(getOutgoingTransitions())) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("outgoingTransitions="); + builder.append(getOutgoingTransitions()); + } + builder.insert(0, "TaskInfo ["); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java new file mode 100644 index 000000000..9d9c44c8c --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java @@ -0,0 +1,136 @@ +package at.gv.egovernment.moa.id.process.model; + +import java.io.Serializable; + +import com.datentechnik.process_engine.ProcessDefinitionParser; + +/** + * Represents a single transition from a {@link StartEvent} or {@linkplain TaskInfo Task} to another + * {@linkplain TaskInfo Task} or {@link EndEvent}. + * + * @author tknall + * + */ +public class Transition implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + private String conditionExpression; + private ProcessNode from; + private ProcessNode to; + + /** + * Returns the process node (effectively a {@link StartEvent} or {@linkplain TaskInfo Task}) the transition is + * pointing from. + * + * @return The transition's source process node (never {@code null} if transition comes from a process definition + * from {@link ProcessDefinitionParser}). + */ + public ProcessNode getFrom() { + return from; + } + + /** + * Sets the process node the transition is pointing from. + * + * @param from + * The transition's source process node. + */ + public void setFrom(ProcessNode from) { + this.from = from; + } + + /** + * Returns the process node (effectively a {@linkplain TaskInfo Task} or {@link EndEvent}) the transition is + * pointing to. + * + * @return The transition's destination process node (never {@code null} if transition comes from a process + * definition from {@link ProcessDefinitionParser}). + */ + public ProcessNode getTo() { + return to; + } + + /** + * Sets the process node the transition is pointing to. + * + * @param to + * The transition's destination process node. + */ + public void setTo(ProcessNode to) { + this.to = to; + } + + /** + * Returns the unique identifier of the transition. + * + * @return The unique identifier (may be {@code null}). + */ + public String getId() { + return id; + } + + /** + * Sets the unique identifier of the transition. + * + * @param id + * The unique identifier. + */ + public void setId(String id) { + this.id = id; + } + + /** + * Returns the condition expression for this transition. + * + * @return The condition expression (may be {@code null}). + */ + public String getConditionExpression() { + return conditionExpression; + } + + /** + * Sets the condition expression for this transition. + * + * @param conditionExpression + * The condition expression. + */ + public void setConditionExpression(String conditionExpression) { + this.conditionExpression = conditionExpression; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + if (id != null) { + builder.append("id="); + builder.append(id); + } + if (from != null) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("from.id="); + builder.append(from.getId()); + } + if (to != null) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("to.id="); + builder.append(to.getId()); + } + if (conditionExpression != null) { + if (builder.length() > 0) { + builder.append(", "); + } + builder.append("conditionExpression="); + builder.append(conditionExpression); + } + builder.insert(0, "Transition ["); + builder.append("]"); + return builder.toString(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java new file mode 100644 index 000000000..1c91cf780 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java @@ -0,0 +1,61 @@ +package at.gv.egovernment.moa.id.process.spring; + +import java.util.Objects; + +import javax.annotation.PostConstruct; + +import org.apache.commons.lang3.BooleanUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.expression.BeanFactoryResolver; +import org.springframework.expression.Expression; +import org.springframework.expression.ExpressionParser; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; + +import com.datentechnik.process_engine.api.ExpressionEvaluationContext; +import com.datentechnik.process_engine.api.ExpressionEvaluator; +import com.datentechnik.process_engine.model.Transition; + +/** + * Expression evaluator for processing {@link Transition} conditions allowing to reference Spring beans from the + * application context. + * + * @author tknall + * + */ +public class SpringExpressionEvaluator implements ExpressionEvaluator { + + private Logger log = LoggerFactory.getLogger(getClass()); + private ExpressionParser parser = new SpelExpressionParser(); + private StandardEvaluationContext evaluationContext = new StandardEvaluationContext(); + + @Autowired(required = false) + private ApplicationContext ctx; + + @PostConstruct + private void init() { + if (ctx != null) { + evaluationContext.setBeanResolver(new BeanFactoryResolver(ctx)); + } + } + + @Override + public boolean evaluate(ExpressionEvaluationContext expressionContext, String expression) { + Objects.requireNonNull(expression, "Expression must not be null."); + log.trace("Evaluating '{}'.", expression); + + Expression expr = parser.parseExpression(expression); + Boolean result = expr.getValue(evaluationContext, expressionContext, Boolean.class); + if (result == null) { + log.warn("Evaluation of '{}' results in null-value.", expression); + } else { + log.debug("Expression '{}' -> {}", expression, result); + } + + return BooleanUtils.isTrue(result); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java new file mode 100644 index 000000000..4b5af854e --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java @@ -0,0 +1,116 @@ +package at.gv.egovernment.moa.id.process.springweb; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.beans.factory.NoUniqueBeanDefinitionException; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +import com.datentechnik.process_engine.ProcessEngine; +import com.datentechnik.process_engine.ProcessInstance; +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Abstract HttpServlet that provides means for retrieving the process engine (Spring Web required) as well as + * retrieving the underlying process instance and execution context evaluating a certain request parameter. + * + * @author tknall + * + */ +public abstract class AbstractAuthSourceServlet extends HttpServlet { + + private static final long serialVersionUID = 1L; + + private ProcessEngine processEngine; + + /** + * Returns the name of the request parameter representing the respective instance id. + *

      Default is {@code processInstanceId}. + * @return The request parameter name. + */ + public String getProcessInstanceIdParameterName() { + return "processInstanceId"; + } + + /** + * Returns the underlying process engine instance. + * + * @return The process engine (never {@code null}). + * @throws NoSuchBeanDefinitionException + * if no {@link ProcessEngine} bean was found. + * @throws NoUniqueBeanDefinitionException + * if more than one {@link ProcessEngine} bean was found. + * @throws BeansException + * if a problem getting the {@link ProcessEngine} bean occurred. + * @throws IllegalStateException + * if the Spring WebApplicationContext was not found, which means that the servlet is used outside a + * Spring web environment. + */ + public synchronized ProcessEngine getProcessEngine() { + if (processEngine == null) { + WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(getServletContext()); + if (ctx == null) { + throw new IllegalStateException( + "Unable to find Spring WebApplicationContext. Servlet needs to be executed within a Spring web environment."); + } + processEngine = ctx.getBean(ProcessEngine.class); + } + return processEngine; + } + + /** + * Retrieves the process instance referenced by the request parameter {@link #getProcessInstanceIdParameterName()}. + * + * @param request + * The HttpServletRequest. + * @return The process instance (never {@code null}). + * @throws NoSuchBeanDefinitionException + * if no {@link ProcessEngine} bean was found. + * @throws NoUniqueBeanDefinitionException + * if more than one {@link ProcessEngine} bean was found. + * @throws BeansException + * if a problem getting the {@link ProcessEngine} bean occurred. + * @throws IllegalStateException + * if the Spring WebApplicationContext was not found, which means that the servlet is used outside a + * Spring web environment. + * @throws IllegalArgumentException + * in case the process instance id referenced by the request parameter + * {@link #getProcessInstanceIdParameterName()} does not exist. + */ + public ProcessInstance getProcessInstance(HttpServletRequest request) { + String processInstanceId = StringUtils.trimToNull(request.getParameter(getProcessInstanceIdParameterName())); + if (processInstanceId == null) { + throw new IllegalArgumentException("Missing request parameter '" + getProcessInstanceIdParameterName() + "'."); + } + return getProcessEngine().getProcessInstance(processInstanceId); + } + + /** + * Retrieves the execution context for the respective process instance referenced by the request parameter + * {@link #getProcessInstanceIdParameterName()}. + * + * @param request + * The HttpServletRequest. + * @return The execution context (never {@code null}). + * @throws NoSuchBeanDefinitionException + * if no {@link ProcessEngine} bean was found. + * @throws NoUniqueBeanDefinitionException + * if more than one {@link ProcessEngine} bean was found. + * @throws BeansException + * if a problem getting the {@link ProcessEngine} bean occurred. + * @throws IllegalStateException + * if the Spring WebApplicationContext was not found, which means that the servlet is used outside a + * Spring web environment. + * @throws IllegalArgumentException + * in case the process instance id referenced by the request parameter + * {@link #getProcessInstanceIdParameterName()} does not exist. + */ + public ExecutionContext getExecutionContext(HttpServletRequest request) { + return getProcessInstance(request).getExecutionContext(); + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java new file mode 100644 index 000000000..1f7fb7690 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java @@ -0,0 +1,73 @@ +package at.gv.egovernment.moa.id.process.springweb; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.filter.RequestContextFilter; + +import com.datentechnik.process_engine.api.ExecutionContext; +import com.datentechnik.process_engine.api.Task; + +/** + * Abstract task implementation providing {@link HttpServletRequest} and {@link HttpServletResponse}. + *

      + * Note that this abstract task requires the Spring (web) framework including a {@link RequestContextFilter} to be set + * within {@code web.xml}. + * + *

      + * ...
      + * <filter>
      + *   <filter-name>requestContextFilter</filter-name>
      + *   <filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
      + * </filter>
      + * <filter-mapping>
      + *   <filter-name>requestContextFilter</filter-name>
      + *   <url-pattern>/*</url-pattern>
      + * </filter-mapping>
      + * ...
      + * 
      + * + * @author tknall + * + */ +public abstract class AbstractSpringWebSupportedTask implements Task { + + /** + * Executes the task providing the underlying {@link ExecutionContext} {@code executionContext} as well as the + * respective {@link HttpServletRequest} and {@link HttpServletResponse}. + * + * @param executionContext + * The execution context (never {@code null}). + * @param request + * The HttpServletRequest (never {@code null}). + * @param response + * The HttpServletResponse (never {@code null}). + * @throws IllegalStateException + * Thrown in case the task is nur being run within the required environment. Refer to javadoc for + * further information. + * @throws Exception + * Thrown in case of error executing the task. + */ + public abstract void execute(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) throws Exception; + + @Override + public void execute(ExecutionContext executionContext) throws Exception { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if (requestAttributes != null && requestAttributes instanceof ServletRequestAttributes) { + HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); + HttpServletResponse response = ((ServletRequestAttributes) requestAttributes).getResponse(); + if (request == null || response == null) { + throw new IllegalStateException( + "Spring's RequestContextHolder did not provide HttpServletResponse. Did you forget to set the required org.springframework.web.filter.RequestContextFilter in your web.xml."); + } + execute(executionContext, request, response); + } else { + throw new IllegalStateException("Task needs to be executed within a Spring web environment."); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/support/SecureRandomHolder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/support/SecureRandomHolder.java new file mode 100644 index 000000000..72677739a --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/support/SecureRandomHolder.java @@ -0,0 +1,35 @@ +package at.gv.egovernment.moa.id.process.support; + +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; + +/** + * Holder for a secure random instance following the initialization on demand holder design pattern. The secure random + * instance is a singleton that is initialized on first usage. + * + * @author tknall + * + */ +public class SecureRandomHolder { + + private SecureRandomHolder() { + } + + private static final SecureRandom SRND_INSTANCE; + static { + try { + SRND_INSTANCE = SecureRandom.getInstance("SHA1PRNG"); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("Unable to instantiate SHA1PRNG.", e); + } + } + + /** + * Returns a secure random generator instance. + * @return The secure random instance. + */ + public static SecureRandom getInstance() { + return SecureRandomHolder.SRND_INSTANCE; + } + +} \ No newline at end of file diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule new file mode 100644 index 000000000..22f39a923 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule @@ -0,0 +1,2 @@ +# The default moaid process +at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModuleImpl \ No newline at end of file diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule deleted file mode 100644 index 0d7e98006..000000000 --- a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule +++ /dev/null @@ -1,2 +0,0 @@ -# The default moaid process -at.gv.egovernment.moa.id.moduls.modulregistration.AuthModuleImpl \ No newline at end of file diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd new file mode 100644 index 000000000..42db4f807 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml new file mode 100644 index 000000000..6525fb0cd --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml new file mode 100644 index 000000000..ef71026ec --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml new file mode 100644 index 000000000..eb62d1ae2 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml new file mode 100644 index 000000000..dadc6bf81 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml new file mode 100644 index 000000000..c68972f13 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml @@ -0,0 +1,52 @@ + + + + + urn:oasis:names:tc:SAML:1.0:cm:sender-vouches + + tqCQEC7+AqGEeeL390V5Jg==urn:publicid:gv.at:baseidMaxMustermann1940-01-01 + + + + + + + + + + + + not(ancestor-or-self::pr:Identification) + + + + + Rmr5vkWXL/PvpoXnbK632QmzYms= + + + + HoPZWYll8aMFpKOlRSwckt5iCQk= + + + + NPpRwVo5/5kf5iHUyaEc7d7So3W4oPgOCYNgnKpgdZfttFkFFN+9oG60w7YvKEYSeTPhP3zp7eaH +ZFapj+naD+wd0y5ELWep9Y+s+qP7fNLrFECHQxQasLWtR4akxlWDpYQ0bvOuepK2ip1EQ6pRlccA +wJ1l4iOWFhfdA9YAg5QLkBqWSwgrNUswhLnDBM+Ot6Gj5g2rpYY7aoAOXvTR8B5Dkg94ASb4u0wv +VPV8+4mjOfP+l6QWLqywzcq3qj/qFZkbujjZbV/fNPDnDD1ff/M6ZfCGO8xzlYfjfEA7cmHuiJf2 +/ey/3nT7vI5XbpBPWChT5Sl4DQysxlfE6e4MZw== + MIIF3TCCBMWgAwIBAgIDByniMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMB4XDTEwMDcyODExMzY0M1oXDTE1MDcyODExMzY0M1owgbYxCzAJBgNVBAYTAkFUMR4wHAYDVQQKDBVEYXRlbnNjaHV0emtvbW1pc3Npb24xIjAgBgNVBAsMGVN0YW1temFobHJlZ2lzdGVyYmVob2VyZGUxLjAsBgNVBAMMJVNpZ25hdHVyc2VydmljZSBEYXRlbnNjaHV0emtvbW1pc3Npb24xFTATBgNVBAUTDDMyNTkyODMyMzk5ODEcMBoGCSqGSIb3DQEJARYNZHNrQGRzay5ndi5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+dBSEBGj2jUXIK1Mp3lVxc/Za+pJMiyKrX3G1ZxgX/ikx7D9scsPYMt473LlAWl9cmCbHbJK+PV2XNNdURLMUCIX+4vUNs2MHeDTQtX8BXjJFpwJYSoaRJQ39FVS/1r5sWcra9Hhdm7w5Gtx/2ukyDX0kdkxawkhP4EQEzi/SI+Fugn+WqgQ1nAdlbxb/dcBw5w1h9b3lmuwUf4z3ooQWUD2DgA/kKd1KejNR43mLUsmvSzevPxT9zs78pOR1OacB7IszTVJPXeOEaaNZHnnB/UeO3g8LEV/3OkXcUgcMkbIIiaBHlll71Pq0COj9kqjXoe7OrRjLY5i3KwOpa6TMCAwEAAaOCAgcwggIDMBMGA1UdIwQMMAqACEkcWDpP6A0DMH8GCCsGAQUFBwEBBHMwcTAnBggrBgEFBQcwAYYbaHR0cDovL29jc3AuYS10cnVzdC5hdC9vY3NwMEYGCCsGAQUFBzAChjpodHRwOi8vd3d3LmEtdHJ1c3QuYXQvY2VydHMvYS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMmEuY3J0MFQGA1UdIARNMEswSQYGKigAEQESMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2NwL2Etc2lnbi1BbXRzc2lnbmF0dXIwgZ4GA1UdHwSBljCBkzCBkKCBjaCBioaBh2xkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMixvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQITAgOnhr0tbowDgYDVR0PAQH/BAQDAgSwMCAGA1UdEQQZMBeBFW1hcmN1cy5oaWxkQGRzay5ndi5hdDAJBgNVHRMEAjAAMA4GByooAAoBBwEEAwEB/zAUBgcqKAAKAQEBBAkMB0JTQi1EU0swDQYJKoZIhvcNAQEFBQADggEBAHTklnvPCH/bJSOlIPbLUEkSGuFHsektSZ8Vr22x/Yv7EzsxoQrJIiz2mQ2gQqFuExdWYxvsowjiSbiis9iUf1c0zscvDS3mIZxGs4M89XHsjHnIyb+Fuwnamw65QrFvM1tNB1ZMjxJ3x+YmHLHdtT3BEBcr3/NCRHd2S0HoBspNz9HVgJaZY1llR7poKBvnAc4g1i+QTvyVb00PtKxR9Lw/9ABInX/1pzpxqrPy7Ib2OP8z6dd3WHmIsCiSHUaj0Dxwwln6fYJjhxZ141SnbovlCLYtrsZLXoi9ljIqX4xO0PwMI2RfNc9cXxTRrRS6rEOvX7PpvgXiDXhp592Yyp4= + + + + + + not(ancestor-or-self::dsig:Signature) + + + + 7IkIdYti2dh3VZQ4Fp+9lPT67cM= + + + + + \ No newline at end of file diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml new file mode 100644 index 000000000..3aeedd590 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml @@ -0,0 +1,487 @@ + + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + + http://reference.e-government.gv.at/namespace/moa/20020822#cm + + + + + https://localhost:18443/moa-id-auth/ + + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + + + https://localhost:48443/mandates/ + + + 1978-04-29 + + + Vollmachtsvertreter + + + MeineTestFirma + + + 123456i + + + + + + + + + + + + + + + Signatur der Anmeldedaten + + + +

      Signatur der Anmeldedaten

      +

      +

      Mit meiner elektronischen Signatur beantrage ich, + + + , geboren am + . + . + , + + in der Rolle als + (OID***= ), + + den Zugang zur gesicherten Anwendung. +

      +

      +

      Datum und Uhrzeit: + . + . + , + : + : + +

      + +

      HPI(**): +

      +
      + +

      wbPK(*): +

      +
      + +
      +

      Ich bin weiters ermächtigt als + von + , geboren am + . + . + + + , + + , in deren Auftrag zu handeln. +

      + +

      wbPK(*) des Vollmachtgebers: +

      +
      +

      + + + +

      +


      + + +

      +


      +
      + +

      +


      +
      + + +
      (*) wbPK: Das wirtschaftsbereichsspezifische Personenkennzeichen wird aus den + jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum + Wirtschaftsunternehmen.
      +
      + +
      (**) HPI: Der eHealth Professional Identifier wird aus den jeweiligen + Stammzahlen der Gesundheitsdiensteanbieterinnen / Gesundheitsdiensteanbieter berechnet und ermöglicht eine eindeutige Zuordnung der + Gesundheitsdiensteanbieterin / des Gesundheitsdiensteanbieters im Gesundheitsbereich.
      +
      + +
      (***) OID: Object Identifier sind standardisierte Objekt-Bezeichner und + beschreiben eindeutig die Rollen des GDA-Token Inhabers.
      +
      + + +
      +
      +
      + +
      + + 0q9QWyqAyyiVNNLu1rIcU+nKsEE= +
      + + + WtB0/ptvoB/r/7+fauSUIBULymg= + +
      + mZt9DuZiDqG81scsf30qjSDdy6vKC2/n034ZZwMUAvfWOXy3+Ubsk5X5CHhz ++lyI + + + MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQG +EwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lz +dGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVh +LXNpZ24tUHJlbWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVt +LVNpZy0wMjAeFw0wNjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJ +BgNVBAYTAkFUMRUwEwYDVQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtu +YWxsMQ8wDQYDVQQqDAZUaG9tYXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTEL +MAkGA1UEDAwCREkwSTATBgcqhkjOPQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ +6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp/NaiOuvrpv2RDVEKQm2tBiajggIP +MIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAnBggrBgEFBQcBAwEB/wQYMBYw +CAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUFBwEBBG8wbTBCBggrBgEF +BQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1QcmVt +aXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRy +dXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4BggrBgEFBQcC +ARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVByZW1p +dW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v +bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEt +VHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2Jq +ZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQI +SNyH29WUoCgwDgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUH +CQExERgPMTk3ODA0MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEF +BQADggEBAFkSCJE0YD4p4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ +ylYn8NQ4mMkD+yCDNtm8m8nr0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6 +uunLH0aFUpAhy+3mDdlH8uhhIQBHwCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkI +egO8OHQDadhgJvW80qspiao2DTac6vVgx4tGvjpdmw1R2pXBYhHD5rkPHlkf +GoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwnW9B8uPWSM5EYPoWJyBOWcKBL +SSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA72/uCFrBzyTk= + + + + + + + + 2008-07-14T15:51:35Z + + + + + inMYWBmAxMHP7mDENjLFaEtv0Zk= + + + CN=a-sign-Premium-Sig-02,OU=a-sign-Premium-Sig-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT + 132292 + + + + + + + + + + application/xhtml+xml + + + + + +
      +
      + + + + + urn:oasis:names:tc:SAML:1.0:cm:sender-vouches + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + Thomas + Knall + + 1978-04-29 + + + + + + + + + + + + + + + + + + + + + sWOqPZzPTn9VvBR5LjuopIWYdh5aGzuX2vMjofhn8bStba1CDW1qkDdlYW4Rs/DfU/I1uqor4Lje +/G3Yzh82yD0MHdzlW8MYUJ8RJe+czbjRUPaSbC/NRqhyF3eKnflxM++sJb2abrUH/9TV0q8P5QRS +uZC/JpAEYpSazysPz/fv8AEnU8oxcTvCiax1jf2GZPmm3qFjPc4qDYNHqfnE8yWYt7kHeqPV/cRw +x3aMGW8mRwQZb7VRFLW5g37nrt9N + AQAB + + + + + + + + + + + + not(ancestor-or-self::pr:Identification) + + + + + b3d/wcQb0Bl0/6GSPsrMxWpdRLA= + + + + eet0q3Thmw6+cbO1fazbEg0556I= + + + +oy55Cq7IyYy7z/TO2a3+m7tjG/ztiKhxhGzVqEYIWIObEOs/GVJDCCI4oe/HS8Fhc4TaXDcZXk4y +qBp4JJ288TeaNjPYkPzp38nWJ4xRatEyo7VaySXy+TqgwiBT5uhxrwkroCr4ZIWwOvt1uR5UBVAf +qk1ii+LPW2WYE3bMpoHfrM9CdFSPzWTRl/0zsEURc64EBPyIdKz+c70DaexeX2E0JVelKcj+jDaJ +mHsFhi/9QoscqPEVA87qv07yhyK5S41+f3HDvpuhYwvQDdOq50sclfsI+g9r473VxiRsOmJ9Ak4/ +k2KP0tgfAQ+h5hRGQUUo5LYPywjg7zPxe8SGGA== + + + + +MIIFZTCCBE2gAwIBAgIDAt4cMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29y +cG9yYXRlLWxpZ2h0LTAzMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0 +LTAzMB4XDTA3MDExOTA5MDY0OFoXDTEyMDExOTA5MDY0OFowgZwxCzAJBgNVBAYT +AkFUMRkwFwYDVQQKDBBCdW5kZXNrYW56bGVyYW10MR4wHAYDVQQLDBVEYXRlbnNj +aHV0emtvbW1pc3Npb24xHTAbBgNVBAMMFERyLiBXYWx0cmF1dCBLb3RzY2h5MRUw +EwYDVQQFEww3MDAyNDc0OTk4MDQxHDAaBgkqhkiG9w0BCQEWDWRza0Bkc2suZ3Yu +YXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfnQUhARo9o1FyCtTK +d5VcXP2WvqSTIsiq19xtWcYF/4pMew/bHLD2DLeO9y5QFpfXJgmx2ySvj1dlzTXV +ESzFAiF/uL1DbNjB3g00LV/AV4yRacCWEqGkSUN/RVUv9a+bFnK2vR4XZu8ORrcf +9rpMg19JHZMWsJIT+BEBM4v0iPhboJ/lqoENZwHZW8W/3XAcOcNYfW95ZrsFH+M9 +6KEFlA9g4AP5CndSnozUeN5i1LJr0s3rz8U/c7O/KTkdTmnAeyLM01ST13jhGmjW +R55wf1Hjt4PCxFf9zpF3FIHDJGyCImgR5ZZe9T6tAjo/ZKo16Huzq0Yy2OYtysDq +WukzAgMBAAGjggGpMIIBpTATBgNVHSMEDDAKgAhBkWkcv63YmDBVBggrBgEFBQcB +AQRJMEcwRQYIKwYBBQUHMAKGOWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9h +LXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAzLmNydDBYBgNVHSAEUTBPME0GByooABEB +BwEwQjBABggrBgEFBQcCARY0aHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3Av +YS1zaWduLWNvcnBvcmF0ZS1saWdodDCBngYDVR0fBIGWMIGTMIGQoIGNoIGKhoGH +bGRhcDovL2xkYXAuYS10cnVzdC5hdC9vdT1hLXNpZ24tY29ycG9yYXRlLWxpZ2h0 +LTAzLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/YmFz +ZT9vYmplY3RjbGFzcz1laWRDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MBEGA1UdDgQK +BAhMCA6eGvS1ujAOBgNVHQ8BAf8EBAMCBLAwCQYDVR0TBAIwADAOBgcqKAAKAQcB +BAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEoIvqPLAg0n2wCS27zTL+hmLi7zSbes +Od4e6pFT1l3cwGfdTkhiHVPnPRaDGLQkS384fAXBrOp6W13X9m2jD9csO6vZhd+T +nERXN1AqayoaecXFyHPykVUTLhn6pMdiSE21mEozfGLUDGMz74lvphEKFAOOCgp1 +o5ZCR09RbGAEbQNNn+ucXJxIa3mYjr1h3AElVbXoeoz12qUpqsNm9znymSkcmcNo +B5Pk6qXXx9UeC/Tj0aTglNkcMOSCFayldzOBaY6+qWKguPdzQUEryhGiNuARQpM5 +KMzvI0rmpc4Gau5HT9rQZHadr++VS8v1k6935uIyyZF9s+gdS5ywnSM= + + + + + + + + + not(ancestor-or-self::dsig:Signature) + + + + JZGwiDzQAtJtnJMeeXyypTrDjwY= + + + + + +
      +
      +
      + + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + Thomas + Knall + + 1978-04-29 + + + + + true + + + https://127.0.0.1:3496/https-security-layer-request + + + MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVhLXNpZ24tUHJl +bWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVtLVNpZy0wMjAeFw0w +NjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJBgNVBAYTAkFUMRUwEwYD +VQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtuYWxsMQ8wDQYDVQQqDAZUaG9t +YXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTELMAkGA1UEDAwCREkwSTATBgcqhkjO +PQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp +/NaiOuvrpv2RDVEKQm2tBiajggIPMIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAn +BggrBgEFBQcBAwEB/wQYMBYwCAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUF +BwEBBG8wbTBCBggrBgEFBQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRz +L2Etc2lnbi1QcmVtaXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8v +b2NzcC5hLXRydXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4Bggr +BgEFBQcCARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVBy +ZW1pdW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v +bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEtVHJ1 +c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xh +c3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQISNyH29WUoCgw +DgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMTk3ODA0 +MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAFkSCJE0YD4p +4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ylYn8NQ4mMkD+yCDNtm8m8nr +0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6uunLH0aFUpAhy+3mDdlH8uhhIQBH +wCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkIegO8OHQDadhgJvW80qspiao2DTac6vVg +x4tGvjpdmw1R2pXBYhHD5rkPHlkfGoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwn +W9B8uPWSM5EYPoWJyBOWcKBLSSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA7 +2/uCFrBzyTk= + + + + + Prokura - MeineTestFirma + http://localhost:58080/omsp/OMSPRequest + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + Thomas + Knall + + 1978-04-29 + + + + + + 123456i + urn:publicid:gv.at:baseid+XFN + + MeineTestFirma + + + + Wien + 2008-07-14 + + + false + + + Der/Die Bevollmächtigte wird zum Prokuristen/Prokuristin bestellt. + + + + + + + + + not(ancestor-or-self::pr:Identification or ancestor-or-self::dsig:Signature) + + + + + + PRRF0sWBgoywztCKWEXafZfhpd0= + + + + NorNorUqPFMA06JfxSJopOq7Qv0= + + + IQMZFc57XZd9LjeiaZqSfzZtWuXhuikAqbKA7pWuDK02DLFSYZPXsGjcvnwNdVaP + + + MIICtjCCAm6gAwIBAgIBATAJBgcqhkjOPQQBMGoxCzAJBgNVBAYTAkFUMQ0wCwYD +VQQHEwRXaWVuMRkwFwYDVQQJExBFc3NsaW5nZ2Fzc2UgNS85MQwwCgYDVQQKEwNB +Q1QxIzAhBgNVBAMTGlZvbGxtYWNodGVuIFNpZ25hdHVyZGllbnN0MB4XDTA4MDcw +ODE1MTk1MFoXDTEyMTIzMTIxNTk1OVowajELMAkGA1UEBhMCQVQxDTALBgNVBAcT +BFdpZW4xGTAXBgNVBAkTEEVzc2xpbmdnYXNzZSA1LzkxDDAKBgNVBAoTA0FDVDEj +MCEGA1UEAxMaVm9sbG1hY2h0ZW4gU2lnbmF0dXJkaWVuc3QwgfMwgbwGByqGSM49 +AgEwgbACAQEwJAYHKoZIzj0BAQIZAP////////////////////7//////////zA0 +BBj////////////////////+//////////wEGGQhBRnlnIDnD6fpq3IkMEn+uN7s +wUa5sQQxBBiNqA6wMJD2fL8g60OhiAD0/wr9gv8QEgcZK5X/yNp4YxAR7WskzdVz ++XehHnlIEQIZAP///////////////5ne+DYUa8mxtNIoMQIBAQMyAAS908G9FD5/ +LLYruwFbp9giXahdQ1FAqKwzohSn9pgsVTQBnvXxU8IWIzhPHs49DZCjazBpMAwG +A1UdEwEB/wQCMAAwHQYDVR0OBBYEFLOSgnkLSJ3l4Ah49rHX/FAV1wWcMBkGA1Ud +IAQSMBAwDgYMKwYBBAGVEgECBAEBMB8GA1UdIwQYMBaAFLOSgnkLSJ3l4Ah49rHX +/FAV1wWcMAkGByqGSM49BAEDNwAwNAIYTTppZzS6wqoLDFcf9frHzf1kMheY04dT +Ahg4Nrb54vE3DTRf9sbO4xs4dTARHSt1ihA= + + + + + + + + not(ancestor-or-self::dsig:Signature) + + + + + + oz6ThHPL3V7RNibfPrDSWVhUgi8= + + + + + + + +
      +
      diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml new file mode 100644 index 000000000..450ba90f3 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + Signatur der Anmeldedaten + + + +

      Signatur der Anmeldedaten

      +

      +

      Mit meiner elektronischen Signatur beantrage ich, + + + , geboren am +. +. +, + +in der Rolle als +(OID***= ), + +den Zugang zur gesicherten Anwendung. +

      +

      +

      Datum und Uhrzeit: +. +. +, +: +: + +

      + +

      HPI(**): +

      +
      + +

      wbPK(*): +

      +
      + +
      +

      Ich bin weiters ermächtigt als +von + , geboren am + . + . + + + , + + , in deren Auftrag zu handeln. +

      + +

      wbPK(*) des Vollmachtgebers: +

      +
      +

      + + + +

      +


      + + +

      +


      +
      + +

      +


      +
      + + +
      (*) wbPK: Das wirtschaftsbereichsspezifische Personenkennzeichen wird aus den +jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum +Wirtschaftsunternehmen.
      +
      + +
      (**) HPI: Der eHealth Professional Identifier wird aus den jeweiligen +Stammzahlen der Gesundheitsdiensteanbieterinnen / Gesundheitsdiensteanbieter berechnet und ermöglicht eine eindeutige Zuordnung der +Gesundheitsdiensteanbieterin / des Gesundheitsdiensteanbieters im Gesundheitsbereich.
      +
      + +
      (***) OID: Object Identifier sind standardisierte Objekt-Bezeichner und +beschreiben eindeutig die Rollen des GDA-Token Inhabers.
      +
      + + +
      +
      +
      + +
      + + 0q9QWyqAyyiVNNLu1rIcU+nKsEE= +
      + + + WtB0/ptvoB/r/7+fauSUIBULymg= + +
      + mZt9DuZiDqG81scsf30qjSDdy6vKC2/n034ZZwMUAvfWOXy3+Ubsk5X5CHhz ++lyI + + + MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQG +EwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lz +dGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVh +LXNpZ24tUHJlbWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVt +LVNpZy0wMjAeFw0wNjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJ +BgNVBAYTAkFUMRUwEwYDVQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtu +YWxsMQ8wDQYDVQQqDAZUaG9tYXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTEL +MAkGA1UEDAwCREkwSTATBgcqhkjOPQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ +6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp/NaiOuvrpv2RDVEKQm2tBiajggIP +MIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAnBggrBgEFBQcBAwEB/wQYMBYw +CAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUFBwEBBG8wbTBCBggrBgEF +BQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1QcmVt +aXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRy +dXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4BggrBgEFBQcC +ARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVByZW1p +dW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v +bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEt +VHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2Jq +ZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQI +SNyH29WUoCgwDgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUH +CQExERgPMTk3ODA0MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEF +BQADggEBAFkSCJE0YD4p4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ +ylYn8NQ4mMkD+yCDNtm8m8nr0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6 +uunLH0aFUpAhy+3mDdlH8uhhIQBHwCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkI +egO8OHQDadhgJvW80qspiao2DTac6vVgx4tGvjpdmw1R2pXBYhHD5rkPHlkf +GoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwnW9B8uPWSM5EYPoWJyBOWcKBL +SSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA72/uCFrBzyTk= + + + + + + + + 2008-07-14T15:51:35Z + + + + + inMYWBmAxMHP7mDENjLFaEtv0Zk= + + + CN=a-sign-Premium-Sig-02,OU=a-sign-Premium-Sig-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT + 132292 + + + + + + + + + + application/xhtml+xml + + + + + +
      \ No newline at end of file -- cgit v1.2.3 From 8579cf80c3602f963566d31eaf04f59f68d3bf11 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 29 Jan 2015 10:56:18 +0100 Subject: Add STORK process (MOAID-58). - Add STORKAuthentication.process.xml - Add PepsConnectorTask using code from PEPSConnectorServlet. - Split code from PEPSConnectorWithLocalSigningServlet into PepsConnectorHandleResponseWithoutSignatureTask and PepsConnectorHandleLocalSignResponseTask. - Replace SpringExpressionEvaluator within applicationContext.xml with SpringWebExpressionEvaluator (allowing expressions using request parameter(s)). - Make servlet mappings /PEPSConnectorWithLocalSigning and /PEPSConnector point to the process engine signaling servlet. - Add many FIXMEs marking problematic code. - Move code to start stork authentication from StartAuthenticationBuilder to CreateStorkAuthRequestFormTask. - Mark PEPSConnectorServlet and PEPSConnectorWithLocalSigningServlet deprecated. - Remove @author tknall from classes assembled using existing (bogus) code. --- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- id/server/auth/src/main/webapp/WEB-INF/web.xml | 24 +- .../moa/id/auth/AuthenticationServer.java | 13 +- .../auth/builder/StartAuthenticationBuilder.java | 28 +- .../moa/id/auth/servlet/PEPSConnectorServlet.java | 1 + .../PEPSConnectorWithLocalSigningServlet.java | 1 + .../moa/id/auth/tasks/AbstractAuthServletTask.java | 3 - .../id/auth/tasks/CertificateReadRequestTask.java | 5 +- .../id/auth/tasks/CreateIdentityLinkFormTask.java | 1 - .../moa/id/auth/tasks/GetForeignIDTask.java | 1 - .../moa/id/auth/tasks/GetMISSessionIDTask.java | 1 - .../auth/tasks/PrepareAuthBlockSignatureTask.java | 1 - .../auth/tasks/VerifyAuthenticationBlockTask.java | 1 - .../moa/id/auth/tasks/VerifyCertificateTask.java | 1 - .../moa/id/auth/tasks/VerifyIdentityLinkTask.java | 9 +- .../AbstractPepsConnectorWithLocalSigningTask.java | 258 ++++++++++ .../stork/CreateStorkAuthRequestFormTask.java | 114 +++++ .../PepsConnectorHandleLocalSignResponseTask.java | 218 ++++++++ ...onnectorHandleResponseWithoutSignatureTask.java | 441 ++++++++++++++++ .../moa/id/auth/tasks/stork/PepsConnectorTask.java | 567 +++++++++++++++++++++ .../processes/DefaultAuthentication.process.xml | 4 +- .../processes/STORKAuthentication.process.xml | 29 ++ .../resources/properties/id_messages_de.properties | 3 + 23 files changed, 1656 insertions(+), 70 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java create mode 100644 id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index 0f9f05baa..8e210c040 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -11,7 +11,7 @@ - + diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 4548e05d9..2dbceb4e9 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -119,28 +119,6 @@ /services/* - - Servlet receiving STORK SAML Response Messages from different C-PEPS - PEPSConnectorServlet - PEPSConnectorServlet - at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet - - - PEPSConnectorServlet - /PEPSConnector - - - - Servlet receiving STORK SAML Response Messages from different C-PEPS - PEPSConnectorWithLocalSigningServlet - PEPSConnectorWithLocalSigningServlet - at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet - - - PEPSConnectorWithLocalSigningServlet - /PEPSConnectorWithLocalSigning - - Dispatcher Servlet DispatcherServlet @@ -165,6 +143,8 @@ /VerifyAuthBlock /VerifyCertificate /VerifyIdentityLink + /PEPSConnectorWithLocalSigning + /PEPSConnector diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index c33e5c735..cf50a1bf5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -1402,8 +1402,8 @@ public class AuthenticationServer implements MOAIDAuthConstants { * Retrieves a session from the session store. * * @param id session ID - * @return AuthenticationSession stored with given session ID, - * null if session ID unknown + * @return AuthenticationSession stored with given session ID (never {@code null}). + * @throws AuthenticationException in case the session id does not reflect a valic, active session. */ public static AuthenticationSession getSession(String id) throws AuthenticationException { @@ -1707,10 +1707,6 @@ public class AuthenticationServer implements MOAIDAuthConstants { // String acsURL = new DataURLBuilder().buildDataURL(issuerValue, // PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN, moasession.getSessionID()); - //solve Problem with sessionIDs - String acsURL = issuerValue + PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN; - - Logger.debug("MOA Assertion Consumer URL (PEPSConnctor): " + acsURL); String providerName = oaParam.getFriendlyName(); Logger.debug("Issuer value: " + issuerValue); @@ -1744,8 +1740,12 @@ public class AuthenticationServer implements MOAIDAuthConstants { List value = new ArrayList(); Logger.debug("PEPS supports XMLSignatures:"+cpeps.isXMLSignatureSupported()); + String acsURL; if(cpeps.isXMLSignatureSupported())//Send SignRequest to PEPS { + //solve Problem with sessionIDs + acsURL = issuerValue + PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN; + value.add(generateDssSignRequest(CreateXMLSignatureRequestBuilder.buildForeignIDTextToBeSigned("wie im Signaturzertifikat (as in my signature certificate)", oaParam, moasession), "application/xhtml+xml", moasession.getCcc())); newAttribute.setValue(value); @@ -1776,6 +1776,7 @@ public class AuthenticationServer implements MOAIDAuthConstants { } } + Logger.debug("MOA Assertion Consumer URL (PEPSConnctor): " + acsURL); if (Logger.isDebugEnabled()) { Logger.debug("The following attributes are requested for this OA:"); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/StartAuthenticationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/StartAuthenticationBuilder.java index a92d3f678..9a8372a2d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/StartAuthenticationBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/StartAuthenticationBuilder.java @@ -52,10 +52,9 @@ public class StartAuthenticationBuilder { *
        *
      • Either creates an "IdentityLinkForm" with embedded {@code InfoBoxReadRequest} to be submitted to a citizen card * environment for reading the subject's IdentityLink
      • - *
      • or creates a STORK auth request and redirects to a CPEPS.
      • *
      * - * @return The "IdentityLinkForm" or an empty String in case of STORK. + * @return The IdentityLinkForm. */ public String build(AuthenticationSession moasession, HttpServletRequest req, HttpServletResponse resp) throws WrongParametersException, MOAIDException { @@ -64,26 +63,11 @@ public class StartAuthenticationBuilder { throw new AuthenticationException("auth.18", new Object[] { }); } - STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig(); - - Logger.info("Starting authentication for a citizen of country: " + (StringUtils.isEmpty(moasession.getCcc()) ? "AT" : moasession.getCcc())); - // STORK or normal authentication - // TODO[branch]: STORK - if (storkConfig.isSTORKAuthentication(moasession.getCcc())) { - //STORK authentication - Logger.trace("Found C-PEPS configuration for citizen of country: " + moasession.getCcc()); - Logger.debug("Starting STORK authentication"); - - AuthenticationServer.startSTORKAuthentication(req, resp, moasession); - return ""; - - } else { - //normal MOA-ID authentication - Logger.debug("Starting normal MOA-ID authentication"); - - String getIdentityLinkForm = AuthenticationServer.getInstance().startAuthentication(moasession, req); + //normal MOA-ID authentication + Logger.debug("Starting normal MOA-ID authentication"); + + String getIdentityLinkForm = AuthenticationServer.getInstance().startAuthentication(moasession, req); - return getIdentityLinkForm; - } + return getIdentityLinkForm; } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 4cd192070..02e1cb12d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -97,6 +97,7 @@ import javax.xml.ws.BindingProvider; /** * Endpoint for receiving STORK response messages + * @deprecated Use {@link at.gv.egovernment.moa.id.auth.tasks.stork.PepsConnectorTask} instead. */ public class PEPSConnectorServlet extends AuthServlet { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java index 165445ea5..fa80bdab9 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java @@ -109,6 +109,7 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException; /** * Endpoint for receiving STORK response messages + * @deprecated Use {@link at.gv.egovernment.moa.id.auth.tasks.stork.PepsConnectorHandleResponseWithoutSignatureTask} instead. */ public class PEPSConnectorWithLocalSigningServlet extends AuthServlet { private static final long serialVersionUID = 1L; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java index 7351933c1..9a5c2baee 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java @@ -43,9 +43,6 @@ import com.datentechnik.process_engine.springweb.AbstractSpringWebSupportedTask; /** * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing * etc.).

      The code has been taken from {@link AuthServlet}. - * - * @author tknall - * */ public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java index da8a3d997..29e9ac42f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java @@ -40,7 +40,6 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
    11. Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code {/VerifyCertificate}
    12. * * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ @@ -71,9 +70,9 @@ public class CertificateReadRequestTask extends AbstractAuthServletTask { AuthenticationSession session = AuthenticationServer.getSession(sessionID); boolean useMandate = session.getUseMandate(); - boolean identityLinkFound = BooleanUtils.isTrue((Boolean) executionContext.get("identityLinkFound")); + boolean identityLinkAvailable = BooleanUtils.isTrue((Boolean) executionContext.get("identityLinkAvailable")); - if (!identityLinkFound && useMandate) { + if (!identityLinkAvailable && useMandate) { Logger.error("Online-Mandate Mode for foreign citizencs not supported."); throw new AuthenticationException("auth.13", null); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java index 70afd477d..01628dcf6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java @@ -54,7 +54,6 @@ import com.datentechnik.process_engine.api.ExecutionContext; * * * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java index 602ad527b..8e52e3827 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java @@ -59,7 +59,6 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
    13. Redirect to {@code /dispatcher}.
    14. * * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java index 40e33ae43..626d33917 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java @@ -55,7 +55,6 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
    15. Redirect to {@code /dispatcher}.
    16. * * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java index 30777198c..8b45f1c66 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java @@ -38,7 +38,6 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
    17. Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
    18. * * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java index 2bc0bb8ad..97f3a21cb 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java @@ -70,7 +70,6 @@ import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; * * * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java index ddea4c414..7e76819ff 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java @@ -50,7 +50,6 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
    19. {@code CreateXMLSignatureRequest} send as HttpServletResponse (for CCE).
    20. * * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java index 5b21cd29c..9711b4bc4 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java @@ -31,7 +31,7 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
    21. Parses the identity link retrieved as {@code InfoBoxReadResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
    22. *
    23. Verifies the identity link.
    24. *
    25. Updates moa session.
    26. - *
    27. Puts boolean flag {@code identityLinkFound} into {@code ExecutionContext}.
    28. + *
    29. Puts boolean flag {@code identityLinkAvailable} into {@code ExecutionContext}.
    30. * * Expects: *
        @@ -41,10 +41,9 @@ import com.datentechnik.process_engine.api.ExecutionContext; * Result: *
          *
        • Identity link put into moa session.
        • - *
        • Boolean flag {@code identityLinkFound} into {@code ExecutionContext}.
        • + *
        • Boolean flag {@code identityLinkAvailable} into {@code ExecutionContext}.
        • *
        * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. - * @author tknall * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) * */ @@ -81,10 +80,10 @@ public class VerifyIdentityLinkTask extends AbstractAuthServletTask { AuthenticationSession session = AuthenticationServer.getSession(sessionID); - boolean identityLinkFound = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters) != null; + boolean identityLinkAvailable = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters) != null; AuthenticationSessionStoreage.storeSession(session); - executionContext.put("identityLinkFound", identityLinkFound); + executionContext.put("identityLinkAvailable", identityLinkAvailable); } catch (ParseException ex) { handleError(null, ex, req, resp, pendingRequestID); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java new file mode 100644 index 000000000..eff7fe43f --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java @@ -0,0 +1,258 @@ +package at.gv.egovernment.moa.id.auth.tasks.stork; + +import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.security.cert.CertificateException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import javax.activation.DataSource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.JAXBException; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Source; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactoryConfigurationError; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; +import org.xml.sax.SAXException; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.BKUException; +import at.gv.egovernment.moa.id.auth.exception.BuildException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.ParseException; +import at.gv.egovernment.moa.id.auth.exception.ServiceException; +import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.MOAException; +import at.gv.egovernment.moa.spss.api.SPSSFactory; +import at.gv.egovernment.moa.spss.api.SignatureVerificationService; +import at.gv.egovernment.moa.spss.api.common.Content; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; +import at.gv.egovernment.moa.util.StringUtils; +import at.gv.util.xsd.xmldsig.SignatureType; +import at.gv.util.xsd.xmldsig.X509DataType; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.api.LightweightSourceResolver; +import eu.stork.oasisdss.api.exceptions.ApiUtilsException; +import eu.stork.oasisdss.api.exceptions.UtilsException; +import eu.stork.oasisdss.profile.SignRequest; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; + +public abstract class AbstractPepsConnectorWithLocalSigningTask extends AbstractAuthServletTask { + + String getCitizienSignatureFromSignResponse(SignResponse dssSignResponse) throws IllegalArgumentException, + TransformerConfigurationException, UtilsException, TransformerException, + TransformerFactoryConfigurationError, IOException, ApiUtilsException { + // fetch signed doc + DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); + if (ds == null) { + throw new ApiUtilsException("No datasource found in response"); + } + + InputStream incoming = ds.getInputStream(); + String citizenSignature = IOUtils.toString(incoming); + incoming.close(); + + return citizenSignature; + } + + void SZRGInsertion(AuthenticationSession moaSession, IPersonalAttributeList personalAttributeList, + String authnContextClassRef, String citizenSignature) throws STORKException, MOAIDException { + Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); + Logger.debug("Citizen signature will be verified by SZR Gateway!"); + + Logger.debug("fetching OAParameters from database"); + + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + moaSession.getPublicOAURLPrefix()); + if (oaParam == null) + throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); + + // retrieve target + // TODO: check in case of SSO!!! + String targetType = null; + if (oaParam.getBusinessService()) { + String id = oaParam.getIdentityLinkDomainIdentifier(); + if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) + targetType = id; + else + targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); + } else { + targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); + } + + Logger.debug("Starting connecting SZR Gateway"); + // contact SZR Gateway + IdentityLink identityLink = null; + + identityLink = STORKResponseProcessor.connectToSZRGateway(personalAttributeList, oaParam.getFriendlyName(), + targetType, null, oaParam.getMandateProfiles(), citizenSignature); + Logger.debug("SZR communication was successfull"); + + if (identityLink == null) { + Logger.error("SZR Gateway did not return an identity link."); + throw new MOAIDException("stork.10", null); + } + Logger.info("Received Identity Link from SZR Gateway"); + moaSession.setIdentityLink(identityLink); + + Logger.debug("Adding addtional STORK attributes to MOA session"); + moaSession.setStorkAttributes(personalAttributeList); + + // We don't have BKUURL, setting from null to "Not applicable" + moaSession.setBkuURL("Not applicable (STORK Authentication)"); + + // free for single use + moaSession.setAuthenticatedUsed(false); + + // stork did the authentication step + moaSession.setAuthenticated(true); + + // TODO: found better solution, but QAA Level in response could be not supported yet + try { + if (authnContextClassRef == null) + authnContextClassRef = PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel(); + moaSession.setQAALevel(authnContextClassRef); + + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); + + } + + } + + X509Certificate getSignerCertificate(String citizenSignature) throws CertificateException, JAXBException, + UnsupportedEncodingException { + JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); + SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( + IOUtils.toInputStream(citizenSignature))).getValue(); + + // extract certificate + for (Object current : root.getKeyInfo().getContent()) + if (((JAXBElement) current).getValue() instanceof X509DataType) { + for (Object currentX509Data : ((JAXBElement) current).getValue() + .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { + JAXBElement casted = ((JAXBElement) currentX509Data); + if (casted.getName().getLocalPart().equals("X509Certificate")) { + return new X509Certificate(((String) casted.getValue()).getBytes("UTF-8")); + } + } + } + return null; + } + + VerifyXMLSignatureResponse verifyXMLSignature(String signature) throws AuthenticationException, ParseException, + BKUException, BuildException, ConfigurationException, ServiceException, UnsupportedEncodingException, + SAXException, IOException, ParserConfigurationException, MOAException { + // Based on MOA demo client + // Factory und Service instanzieren + SPSSFactory spssFac = SPSSFactory.getInstance(); + SignatureVerificationService sigVerifyService = SignatureVerificationService.getInstance(); + + Content sigDocContent1 = spssFac.createContent(IOUtils.toInputStream(signature, "UTF-8"), null); + + // Position der zu prüfenden Signatur im Dokument angeben + // (Nachdem im XPath-Ausdruck ein NS-Präfix verwendet wird, muss in einer Lookup-Tabelle + // der damit bezeichnete Namenraum mitgegeben werden) + HashMap nSMap = new HashMap(); + nSMap.put("dsig", "http://www.w3.org/2000/09/xmldsig#"); + VerifySignatureLocation sigLocation = spssFac.createVerifySignatureLocation("//dsig:Signature", nSMap); + + // Zu prüfendes Dokument und Signaturposition zusammenfassen + + VerifySignatureInfo sigInfo = spssFac.createVerifySignatureInfo(sigDocContent1, sigLocation); + + // Prüfrequest zusammenstellen + VerifyXMLSignatureRequest verifyRequest = spssFac.createVerifyXMLSignatureRequest(null, // Wird Prüfzeit nicht + // angegeben, wird + // aktuelle Zeit + // verwendet + sigInfo, null, // Keine Ergänzungsobjekte notwendig + null, // Signaturmanifest-Prüfung soll nicht durchgeführt werden + false, // Hash-Inputdaten, d.h. tatsächlich signierte Daten werden nicht zurückgeliefert + "MOAIDBuergerkartePersonenbindungMitTestkarten");// TODO load from config + // "Test-Signaturdienste"); // ID des verwendeten Vertrauensprofils + + VerifyXMLSignatureResponse verifyResponse = null; + try { + // Aufruf der Signaturprüfung + verifyResponse = sigVerifyService.verifyXMLSignature(verifyRequest); + } catch (MOAException e) { + // Service liefert Fehler + System.err.println("Die Signaturprüfung hat folgenden Fehler geliefert:"); + System.err.println("Fehlercode: " + e.getMessageId()); + System.err.println("Fehlernachricht: " + e.getMessage()); + throw e; + } + + return verifyResponse; + } + + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse convert( + VerifyXMLSignatureResponse xMLVerifySignatureResponse) { + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse response = new at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse(); + response.setCertificateCheckCode(xMLVerifySignatureResponse.getCertificateCheck().getCode()); + response.setPublicAuthority(xMLVerifySignatureResponse.getSignerInfo().isPublicAuthority()); + // response.setPublicAuthorityCode(publicAuthorityCode) + response.setQualifiedCertificate(xMLVerifySignatureResponse.getSignerInfo().isQualifiedCertificate()); + response.setSignatureCheckCode(xMLVerifySignatureResponse.getSignatureCheck().getCode()); + response.setSignatureManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); + // response.setSigningDateTime() + // response.setX509certificate(x509certificate) + response.setXmlDSIGManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); + // response.setXmlDSIGManigest(xMLVerifySignatureResponse.getSignatureManifestCheck()) + // response.setXmlDsigSubjectName(xmlDsigSubjectName) + return response; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java new file mode 100644 index 000000000..c32c9d791 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java @@ -0,0 +1,114 @@ +package at.gv.egovernment.moa.id.auth.tasks.stork; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; +import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.stork.CPEPS; +import at.gv.egovernment.moa.id.config.stork.STORKConfig; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates a SAML2 STORK authentication request, embeds it in a form (in order to satisfy saml post binging) and returns the form withing the HttpServletResponse.

        + * In detail: + *

          + *
        • Validates the stork configuration in order to make sure the selected country is supported.
        • + *
        • Puts a flag ({@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}) into the ExecutionContext reflecting the capability of the C-PEPS to create xml signatures.
        • + *
        • Invokes {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} which
        • + *
            + *
          • Creates and signs a SAML2 stork authentication request.
          • + *
          • Creates a signature request for auth block signature (either to be performed by the C-PEPS or locally).
          • + *
          • Using the velocity template engine in order to create a form with the embedded stork request.
          • + *
          • Writes the form to the response output stream.
          • + *
          + *
        + * Expects: + *
          + *
        • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
        • + *
        • Property {@code ccc} set within the moa session.
        • + *
        + * Result: + *
          + *
        • Form containing a SAML2 Stork authentication request and an action url pointing to the selected C-PEPS.
        • + *
        • Assertion consumer URL for C-PEPS set either to {@code /PEPSConnector} in case of a C-PEPS supporting xml signatures or {@code /PEPSConnectorWithLocalSigning} if the selected C-PEPS does not support xml signatures.
        • + *
        • In case of a C-PEPS not supporting xml signature: moasession with set signedDoc property (containing the signature request for local signing).
        • + *
        • ExecutionContext contains the boolean flag {@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}. + *
        + * Code taken from {@link StartAuthenticationBuilder#build(AuthenticationSession, HttpServletRequest, HttpServletResponse)}.
        + * Using {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class CreateStorkAuthRequestFormTask extends AbstractAuthServletTask { + + /** + * Boolean value reflecting the capability of the selected c-peps of creating xml signatures. + */ + public static final String PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED = "C-PEPS:XMLSignatureSupported"; + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + String pendingRequestID = null; + String sessionID = null; + try { + setNoCachingHeaders(resp); + + sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("CreateStorkAuthRequestFormTask", PARAM_SESSIONID, "auth.12"); + } + AuthenticationSession moasession = AuthenticationServer.getSession(sessionID); + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + if (StringUtils.isEmpty(moasession.getCcc())) { + // illegal state; task should not have been executed without a selected country + throw new AuthenticationException("stork.22", new Object[] { sessionID }); + } + STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig(); + if (!storkConfig.isSTORKAuthentication(moasession.getCcc())) { + throw new AuthenticationException("stork.23", new Object[] { moasession.getCcc(), sessionID }); + } + + // STORK authentication + // cpeps cannot be null + CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc()); + Logger.debug("Found C-PEPS configuration for citizen of country: " + moasession.getCcc()); + executionContext.put(PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED, cpeps.isXMLSignatureSupported()); + + Logger.info("Starting STORK authentication for a citizen of country: " + moasession.getCcc()); + AuthenticationServer.startSTORKAuthentication(req, resp, moasession); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("CreateStorkAuthRequestFormTask has an interal Error.", e); + throw new MOAIDException("Internal error.", new Object[] { sessionID }, e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java new file mode 100644 index 000000000..738988ff7 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java @@ -0,0 +1,218 @@ +package at.gv.egovernment.moa.id.auth.tasks.stork; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PersonalAttribute; + +/** + * Processes the citizen's signature, creates identity link using szr gateway and finalizes authentication. + *

        + * In detail: + *

          + *
        • Changes moa session id.
        • + *
        • Decodes and validates the sign response, extracting the citizen's signature.
        • + *
        • Verifies the citizen's signature.
        • + *
        • Create {@code signedDoc} attribute.
        • + *
        • Retrieve identity link from SZR gateway using the citizen's signature.
        • + *
        • If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. + * Therefore a form is presented asking for the subject's gender. The form finally submits the user back to the + * {@code /PepsConnectorWithLocalSigning} servlet (this task).
        • + *
        • The moa session is updated with authentication information.
        • + *
        • Change moa session id.
        • + *
        • Redirects back to {@code /dispatcher} in order to finalize the authentication.
        • + *
        + * Expects: + *
          + *
        • HttpServletRequest parameter {@code moaSessionID}
        • + *
        • HttpServletRequest parameter {@code signresponse}
        • + *
        + * Result: + *
          + *
        • Updated moa id session (signed auth block, signer certificate etc.)
        • + *
        • Redirect to {@code /dispatcher}.
        • + *
        • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
        • + *
        + * Possible branches: + *
          + *
        • In case the szr gateway throws exception due to missing gender information: + *
            + *
          • Returns a form for gender selection with action url back to this servlet/task.
          • + *
          + *
        • + *
        + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
        + * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorHandleLocalSignResponseTask extends AbstractPepsConnectorWithLocalSigningTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + + if (moaSessionID != null && signResponse != null) { + // redirect from oasis with signresponse + handleSignResponse(executionContext, request, response); + } else { + // should not occur + throw new IOException("should not occur"); + } + return; + } + + private void handleSignResponse(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) { + Logger.info("handleSignResponse started"); + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + String pendingRequestID = null; + try { + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + Logger.info("pendingRequestID:" + pendingRequestID); + String signResponseString = new String(Base64.decodeBase64(signResponse), "UTF8"); + Logger.info("RECEIVED signresponse:" + signResponseString); + // create SignResponse object + Source response1 = new StreamSource(new java.io.StringReader(signResponseString)); + SignResponse dssSignResponse = ApiUtils.unmarshal(response1, SignResponse.class); + + // SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource(new + // java.io.StringReader(Base64.signResponse))); + + String citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + X509Certificate cert = getSignerCertificate(citizenSignature); + moaSession.setSignerCertificate(cert); + VerifyXMLSignatureResponse xMLVerifySignatureResponse = verifyXMLSignature(citizenSignature); + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse tmp = convert(xMLVerifySignatureResponse); + + moaSession.setXMLVerifySignatureResponse(tmp); + executionContext.put("identityLinkAvailable", false); + try { + IPersonalAttributeList personalAttributeList = moaSession.getAuthnResponseGetPersonalAttributeList(); + // Add SignResponse TODO Add signature (extracted from signResponse)? + List values = new ArrayList(); + values.add(signResponseString); + // values.add(citizenSignature); + Logger.debug("Assembling signedDoc attribute"); + PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values, "Available"); + personalAttributeList.add(signedDocAttribute); + + String authnContextClassRef = moaSession.getAuthnContextClassRef(); + SZRGInsertion(moaSession, personalAttributeList, authnContextClassRef, citizenSignature); + executionContext.put("identityLinkAvailable", true); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas + // authnResponse? + moaSession.setForeigner(true); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + response.sendRedirect(redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java new file mode 100644 index 000000000..31bc28f5a --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java @@ -0,0 +1,441 @@ +package at.gv.egovernment.moa.id.auth.tasks.stork; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.StringUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.profile.SignRequest; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; + +/** + * Validates the SAML response from C-PEPS. + *

        + * In detail: + *

          + *
        • Decodes and validates SAML response from C-PEPS.
        • + *
        • Retrieves the moa session using the session id provided by HttpServletRequest parameter {@code RelayState} or by {@code inResponseTo} attribute of the saml response.
        • + *
        • Store saml response in moa session.
        • + *
        • Change moa session id.
        • + *
        • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
        • + *
        + * Expects: + *
          + *
        • HttpServletRequest parameter {@code moaSessionID} to be {@code null}
        • + *
        • HttpServletRequest parameter {@code signresponse} to be {@code null}
        • + *
        • HttpServletRequest parameter {@code SAMLResponse}
        • + *
        • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute within the saml response, both reflecting the moa session id.
        • + *
        + * Result: + *
          + *
        • Updated moa session (with saml response).
        • + *
        • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
        • + *
        + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
        + * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPepsConnectorWithLocalSigningTask { + + private String oasisDssWebFormURL = "https://testvidp.buergerkarte.at/oasis-dss/DSSWebFormServlet"; + // load from config below + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + + if (moaSessionID == null && signResponse == null) { + // normal saml response + handleSAMLResponse(executionContext, request, response); + + } else { + // should not occur + throw new IOException("should not occur"); + } + return; + } + + private void handleSAMLResponse(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) { + Logger.info("handleSAMLResponse started"); + String pendingRequestID = null; + + setNoCachingHeaders(response); + try { + Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); + Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); + + Logger.trace("No Caching headers set for HTTP response"); + + // check if https or only http + super.checkIfHTTPisAllowed(request.getRequestURL().toString()); + + Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); + + // extract STORK Response from HTTP Request + // Decodes SAML Response + byte[] decSamlToken; + try { + decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); + Logger.debug("SAMLResponse: " + new String(decSamlToken)); + + } catch (NullPointerException e) { + Logger.error("Unable to retrieve STORK Response", e); + throw new MOAIDException("stork.04", null); + } + + // Get SAMLEngine instance + STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); + + STORKAuthnResponse authnResponse = null; + try { + // validate SAML Token + Logger.debug("Starting validation of SAML response"); + authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); + Logger.info("SAML response succesfully verified!"); + } catch (STORKSAMLEngineException e) { + Logger.error("Failed to verify STORK SAML Response", e); + throw new MOAIDException("stork.05", null); + } + + Logger.info("STORK SAML Response message succesfully extracted"); + Logger.debug("STORK response: "); + Logger.debug(authnResponse.toString()); + + Logger.debug("Trying to find MOA Session-ID ..."); + // String moaSessionID = request.getParameter(PARAM_SESSIONID); + // first use SAML2 relayState + String moaSessionID = request.getParameter("RelayState"); + + // escape parameter strings + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + // check if SAML2 relaystate includes a MOA sessionID + if (StringUtils.isEmpty(moaSessionID)) { + // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier + + moaSessionID = authnResponse.getInResponseTo(); + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + if (StringUtils.isEmpty(moaSessionID)) { + // No authentication session has been started before + Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); + Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); + throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); + + } else + Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); + + } else + // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); + Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); + + /* + * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because + * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter + */ + // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) + // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Found MOA sessionID: " + moaSessionID); + + String statusCodeValue = authnResponse.getStatusCode(); + + if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { + Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); + throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); + } + + Logger.info("Got SAML response with authentication success message."); + + Logger.debug("MOA session is still valid"); + + STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); + + if (storkAuthnRequest == null) { + Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + throw new MOAIDException("stork.07", null); + } + + Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + + // //////////// incorporate gender from parameters if not in stork response + + IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); + + // but first, check if we have a representation case + if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) + || STORKResponseProcessor.hasAttribute("representative", attributeList) + || STORKResponseProcessor.hasAttribute("represented", attributeList)) { + // in a representation case... + moaSession.setUseMandate("true"); + + // and check if we have the gender value + PersonalAttribute gender = attributeList.get("gender"); + if (null == gender) { + String gendervalue = (String) request.getParameter("gender"); + if (null != gendervalue) { + gender = new PersonalAttribute(); + gender.setName("gender"); + ArrayList tmp = new ArrayList(); + tmp.add(gendervalue); + gender.setValue(tmp); + + authnResponse.getPersonalAttributeList().add(gender); + } + } + } + + + + // //////////////////////////////////////////////////////////////////////// + + Logger.debug("Starting extraction of signedDoc attribute"); + // extract signed doc element and citizen signature + String citizenSignature = null; + try { + PersonalAttribute signedDoc = authnResponse.getPersonalAttributeList().get("signedDoc"); + String signatureInfo = null; + // FIXME: Remove nonsense code (signedDoc attribute... (throw Exception for "should not occur" situations)), adjust error messages in order to reflect the true problem... + if (signedDoc != null) { + signatureInfo = signedDoc.getValue().get(0); + // should not occur + } else { + + // store SAMLResponse + moaSession.setSAMLResponse(request.getParameter("SAMLResponse")); + // store authnResponse + + // moaSession.setAuthnResponse(authnResponse);//not serializable + moaSession.setAuthnResponseGetPersonalAttributeList(authnResponse.getPersonalAttributeList()); + + String authnContextClassRef = null; + try { + authnContextClassRef = authnResponse.getAssertions().get(0).getAuthnStatements().get(0) + .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef(); + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + } + + moaSession.setAuthnContextClassRef(authnContextClassRef); + moaSession.setReturnURL(request.getRequestURL()); + + // load signedDoc + String signRequest = moaSession.getSignedDoc(); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + // set return url to PEPSConnectorWithLocalSigningServlet and add newMOASessionID + // signRequest + + String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix(); + String acsURL = issuerValue + + PEPSConnectorWithLocalSigningServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN; + + String url = acsURL + "?moaSessionID=" + newMOASessionID; + // redirect to OASIS module and sign there + + boolean found = false; + try { + List aps = AuthConfigurationProvider.getInstance() + .getOnlineApplicationParameter(moaSession.getPublicOAURLPrefix()).getStorkAPs(); + Logger.info("Found AttributeProviderPlugins:" + aps.size()); + for (AttributeProviderPlugin ap : aps) { + Logger.info("Found AttributeProviderPlugin attribute:" + ap.getAttributes()); + if (ap.getAttributes().equalsIgnoreCase("signedDoc")) { + // FIXME: A servlet's class field is not thread safe!!! + oasisDssWebFormURL = ap.getUrl(); + found = true; + Logger.info("Loaded signedDoc attribute provider url from config:" + oasisDssWebFormURL); + break; + } + } + } catch (Exception e) { + e.printStackTrace(); + Logger.error("Loading the signedDoc attribute provider url from config failed"); + } + if (!found) { + Logger.error("Failed to load the signedDoc attribute provider url from config"); + } + performRedirect(url, request, response, signRequest); + + return; + } + + // FIXME: This servlet/task is intended to handle peps responses without signature, so why do we try to process that signature here? + SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( + new java.io.StringReader(signatureInfo))); + + citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + X509Certificate cert = getSignerCertificate(citizenSignature); + moaSession.setSignerCertificate(cert); + moaSession.setForeigner(true); + + } catch (Throwable e) { + Logger.error("Could not extract citizen signature from C-PEPS", e); + throw new MOAIDException("stork.09", null); + } + + // FIXME: Same here; we do not have the citizen's signature, so this code might be regarded as dead code. + try { + SZRGInsertion(moaSession, authnResponse.getPersonalAttributeList(), authnResponse.getAssertions() + .get(0).getAuthnStatements().get(0).getAuthnContext().getAuthnContextClassRef() + .getAuthnContextClassRef(), citizenSignature); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas + // authnResponse? + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + response.setContentType("text/html"); + response.setStatus(302); + response.addHeader("Location", redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + + private void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, String signRequestString) + throws MOAIDException { + + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/oasis_dss_webform_binding.vm"); + VelocityContext context = new VelocityContext(); + + Logger.debug("performRedirect, signrequest:" + signRequestString); + Source signDoc = new StreamSource(new java.io.StringReader(signRequestString)); + SignRequest signRequest = ApiUtils.unmarshal(signDoc, SignRequest.class); + signRequest.setReturnURL("TODO"); + signRequestString = IOUtils.toString(ApiUtils.marshalToInputStream(signRequest)); + context.put("signrequest", Base64.encodeBase64String(signRequestString.getBytes("UTF8"))); + context.put("clienturl", url); + context.put("action", oasisDssWebFormURL); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + resp.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e) { + Logger.error("Error sending DSS signrequest.", e); + throw new MOAIDException("stork.11", null); + } + } +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java new file mode 100644 index 000000000..0e4e2a0f7 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java @@ -0,0 +1,567 @@ +package at.gv.egovernment.moa.id.auth.tasks.stork; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + +import javax.activation.DataSource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.namespace.QName; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.documentservice.DocumentService; +import eu.stork.documentservice.data.DatabaseConnectorMySQLImpl; +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.api.LightweightSourceResolver; +import eu.stork.oasisdss.api.exceptions.ApiUtilsException; +import eu.stork.oasisdss.profile.DocumentType; +import eu.stork.oasisdss.profile.DocumentWithSignature; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.PersonalAttributeList; +import eu.stork.peps.auth.commons.STORKAttrQueryRequest; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.StringUtils; +import at.gv.util.xsd.xmldsig.SignatureType; +import at.gv.util.xsd.xmldsig.X509DataType; + +/** + * Evaluates the SAML response from the C-PEPS and authenticates the user. + *

        + * In detail: + *

          + *
        • Decodes and validates the SAML response from the C-PEPS.
        • + *
        • Change moa session id.
        • + *
        • Extracts the subject's gender from request parameter {@code gender} if not available from the saml response.
        • + *
        • Extracts the {@code signedDoc} attribute from the response, get signed doc payload using stork attribute query request.
        • + *
        • Request SZR gateway for verification of the citizen's signature and for creating of an identity link.
        • + *
        • In case of mandate mode: If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. Therefore a form is presented asking for the subject's gender. The form submits the user back to the {@code /PepsConnector} servlet (this task).
        • + *
        • The moa session is updated with authentication information.
        • + *
        • Change moa session id.
        • + *
        • Redirects back to {@code /dispatcher} in order to finalize the authentication.
        • + *
        + * Expects: + *
          + *
        • HttpServletRequest parameter {@code SAMLResponse}
        • + *
        • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute from the SAML response (both depicting the moa session id)
        • + *
        • HttpServletRequest parameter {@code gender} in case the request comes from the gender selection form
        • + *
        • {@code signedDoc} attribute within the SAML response.
        • + *
        + * Result: + *
          + *
        • Updated moa id session (identity link, stork attributes...)
        • + *
        • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
        • + *
        • Redirect to {@code /dispatcher}.
        • + *
        + * Possible branches: + *
          + *
        • In case the szr gateway throws exception due to missing gender information: + *
            + *
          • Returns a form for gender selection with action url back to this servlet/task.
          • + *
          + *
        • + *
        + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet}.
        + * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorTask extends AbstractAuthServletTask { + + private String dtlUrl = null; + + public PepsConnectorTask() { + super(); + Properties props = new Properties(); + try { + props.load(DatabaseConnectorMySQLImpl.class.getResourceAsStream("docservice.properties")); + dtlUrl = props.getProperty("docservice.url"); + } catch (IOException e) { + dtlUrl = "http://testvidp.buergerkarte.at/DocumentService/DocumentService"; + Logger.error("Loading DTL config failed, using default value:" + dtlUrl); + e.printStackTrace(); + } + } + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String pendingRequestID = null; + + setNoCachingHeaders(response); + + try { + + Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); + Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); + + // check if https or only http + super.checkIfHTTPisAllowed(request.getRequestURL().toString()); + + Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); + + // extract STORK Response from HTTP Request + // Decodes SAML Response + byte[] decSamlToken; + try { + decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); + Logger.debug("SAMLResponse: " + new String(decSamlToken)); + + } catch (NullPointerException e) { + Logger.error("Unable to retrieve STORK Response", e); + throw new MOAIDException("stork.04", null); + } + + // Get SAMLEngine instance + STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); + + STORKAuthnResponse authnResponse = null; + try { + // validate SAML Token + Logger.debug("Starting validation of SAML response"); + authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); + Logger.info("SAML response succesfully verified!"); + } catch (STORKSAMLEngineException e) { + Logger.error("Failed to verify STORK SAML Response", e); + throw new MOAIDException("stork.05", null); + } + + Logger.info("STORK SAML Response message succesfully extracted"); + Logger.debug("STORK response: "); + Logger.debug(authnResponse.toString()); + + Logger.debug("Trying to find MOA Session-ID ..."); + // String moaSessionID = request.getParameter(PARAM_SESSIONID); + // first use SAML2 relayState + String moaSessionID = request.getParameter("RelayState"); + + // escape parameter strings + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + // check if SAML2 relaystate includes a MOA sessionID + if (StringUtils.isEmpty(moaSessionID)) { + // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier + + moaSessionID = authnResponse.getInResponseTo(); + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + if (StringUtils.isEmpty(moaSessionID)) { + // No authentication session has been started before + Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); + Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); + throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); + + } else + Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); + + } else + // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); + Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); + + /* + * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because + * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter + */ + // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) + // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Found MOA sessionID: " + moaSessionID); + + String statusCodeValue = authnResponse.getStatusCode(); + + if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { + Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); + throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); + } + + Logger.info("Got SAML response with authentication success message."); + + Logger.debug("MOA session is still valid"); + + STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); + + if (storkAuthnRequest == null) { + Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + throw new MOAIDException("stork.07", null); + } + + Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + + // //////////// incorporate gender from parameters if not in stork response + + IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); + + // but first, check if we have a representation case + if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) + || STORKResponseProcessor.hasAttribute("representative", attributeList) + || STORKResponseProcessor.hasAttribute("represented", attributeList)) { + // in a representation case... + moaSession.setUseMandate("true"); + + // and check if we have the gender value + PersonalAttribute gender = attributeList.get("gender"); // TODO Do we need to check gender value if + // there is no representation case? + if (null == gender) { + String gendervalue = (String) request.getParameter("gender"); + if (null != gendervalue) { + gender = new PersonalAttribute(); + gender.setName("gender"); + ArrayList tmp = new ArrayList(); + tmp.add(gendervalue); + gender.setValue(tmp); + + authnResponse.getPersonalAttributeList().add(gender); + } + } + } + + // //////////////////////////////////////////////////////////////////////// + + Logger.debug("Starting extraction of signedDoc attribute"); + // extract signed doc element and citizen signature + String citizenSignature = null; + try { + String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0); // TODO ERROR HANDLING + + Logger.debug("signatureInfo:" + signatureInfo); + + SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( + new java.io.StringReader(signatureInfo))); + + // fetch signed doc + DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); + if (ds == null) { + throw new ApiUtilsException("No datasource found in response"); + } + + InputStream incoming = ds.getInputStream(); + citizenSignature = IOUtils.toString(incoming); + incoming.close(); + + Logger.debug("citizenSignature:" + citizenSignature); + if (isDocumentServiceUsed(citizenSignature) == true) { + Logger.debug("Loading document from DocumentService."); + String url = getDtlUrlFromResponse(dssSignResponse); + // get Transferrequest + String transferRequest = getDocTransferRequest(dssSignResponse.getDocUI(), url); + // Load document from DocujmentService + byte[] data = getDocumentFromDtl(transferRequest, url); + citizenSignature = new String(data, "UTF-8"); + Logger.debug("Overridung citizenSignature with:" + citizenSignature); + } + + JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); + SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( + IOUtils.toInputStream(citizenSignature))).getValue(); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + // extract certificate + for (Object current : root.getKeyInfo().getContent()) + if (((JAXBElement) current).getValue() instanceof X509DataType) { + for (Object currentX509Data : ((JAXBElement) current).getValue() + .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { + JAXBElement casted = ((JAXBElement) currentX509Data); + if (casted.getName().getLocalPart().equals("X509Certificate")) { + moaSession.setSignerCertificate(new X509Certificate(((String) casted.getValue()) + .getBytes("UTF-8"))); + break; + } + } + } + + } catch (Throwable e) { + Logger.error("Could not extract citizen signature from C-PEPS", e); + throw new MOAIDException("stork.09", null); + } + Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); + Logger.debug("Citizen signature will be verified by SZR Gateway!"); + + Logger.debug("fetching OAParameters from database"); + + // //read configuration paramters of OA + // AuthenticationSession moasession; + // try { + // moasession = AuthenticationSessionStoreage.getSession(moaSessionID); + // } catch (MOADatabaseException e2) { + // Logger.error("could not retrieve moa session"); + // throw new AuthenticationException("auth.01", null); + // } + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + moaSession.getPublicOAURLPrefix()); + if (oaParam == null) + throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); + + // retrieve target + // TODO: check in case of SSO!!! + String targetType = null; + if (oaParam.getBusinessService()) { + String id = oaParam.getIdentityLinkDomainIdentifier(); + if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) + targetType = id; + else + targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); + } else { + targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); + } + + Logger.debug("Starting connecting SZR Gateway"); + // contact SZR Gateway + IdentityLink identityLink = null; + executionContext.put("identityLinkAvailable", false); + try { + identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(), + oaParam.getFriendlyName(), targetType, null, oaParam.getMandateProfiles(), citizenSignature); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + Logger.debug("SZR communication was successfull"); + + if (identityLink == null) { + Logger.error("SZR Gateway did not return an identity link."); + throw new MOAIDException("stork.10", null); + } + moaSession.setForeigner(true); + + Logger.info("Received Identity Link from SZR Gateway"); + executionContext.put("identityLinkAvailable", true); + moaSession.setIdentityLink(identityLink); + + Logger.debug("Adding addtional STORK attributes to MOA session"); + moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList()); + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse")); + + // We don't have BKUURL, setting from null to "Not applicable" + moaSession.setBkuURL("Not applicable (STORK Authentication)"); + + // free for single use + moaSession.setAuthenticatedUsed(false); + + // stork did the authentication step + moaSession.setAuthenticated(true); + + // TODO: found better solution, but QAA Level in response could be not supported yet + try { + + moaSession.setQAALevel(authnResponse.getAssertions().get(0).getAuthnStatements().get(0) + .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef()); + + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); + + } + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + // response.setContentType("text/html"); + // response.setStatus(302); + // response.addHeader("Location", redirectURL); + response.sendRedirect(redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + + private boolean isDocumentServiceUsed(String citizenSignature) // TODo add better check + { + if (citizenSignature + .contains("
        Service Name:{http://stork.eu}DocumentService
        Port Name:{http://stork.eu}DocumentServicePort
        ")) + return true; + return false; + } + + /** + * Get DTL uril from the oasis sign response + * + * @param signRequest + * The signature response + * @return The URL of DTL service + * @throws SimpleException + */ + private String getDtlUrlFromResponse(SignResponse dssSignResponse) { + List documents = ApiUtils.findNamedElement(dssSignResponse.getOptionalOutputs(), + ApiUtils.OPTIONAL_OUTPUT_DOCUMENTWITHSIGNATURE, DocumentWithSignature.class); + DocumentType sourceDocument = documents.get(0).getDocument(); + + if (sourceDocument.getDocumentURL() != null) + return sourceDocument.getDocumentURL(); + else + return null;// throw new Exception("No document url found"); + } + + // From DTLPEPSUTIL + + /** + * Get document from DTL + * + * @param transferRequest + * The transfer request (attribute query) + * @param eDtlUrl + * The DTL url of external DTL + * @return the document data + * @throws SimpleException + */ + private byte[] getDocumentFromDtl(String transferRequest, String eDtlUrl) throws Exception { + URL url = null; + try { + url = new URL(dtlUrl); + QName qname = new QName("http://stork.eu", "DocumentService"); + + Service service = Service.create(url, qname); + DocumentService docservice = service.getPort(DocumentService.class); + + BindingProvider bp = (BindingProvider) docservice; + SOAPBinding binding = (SOAPBinding) bp.getBinding(); + binding.setMTOMEnabled(true); + + if (eDtlUrl.equalsIgnoreCase(dtlUrl)) + return docservice.getDocument(transferRequest, ""); + else + return docservice.getDocument(transferRequest, eDtlUrl); + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("Error in getDocumentFromDtl", e); + } + } + + /** + * Get a document transfer request (attribute query) + * + * @param docId + * @return + * @throws SimpleException + */ + private String getDocTransferRequest(String docId, String destinationUrl) throws Exception { + String spCountry = docId.substring(0, docId.indexOf("/")); + final STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP"); + STORKAttrQueryRequest req = new STORKAttrQueryRequest(); + req.setAssertionConsumerServiceURL(dtlUrl); + req.setDestination(destinationUrl); + req.setSpCountry(spCountry); + req.setQaa(3);// TODO + PersonalAttributeList pal = new PersonalAttributeList(); + PersonalAttribute attr = new PersonalAttribute(); + attr.setName("docRequest"); + attr.setIsRequired(true); + attr.setValue(Arrays.asList(docId)); + pal.add(attr); + req.setPersonalAttributeList(pal); + + STORKAttrQueryRequest req1; + try { + req1 = engine.generateSTORKAttrQueryRequest(req); + return PEPSUtil.encodeSAMLTokenUrlSafe(req1.getTokenSaml()); + } catch (STORKSAMLEngineException e) { + e.printStackTrace(); + throw new Exception("Error in doc request attribute query generation", e); + } + } + +} diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index 48c9ee56c..b7d0d0f8b 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -2,7 +2,7 @@ @@ -21,7 +21,7 @@ - + diff --git a/id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml new file mode 100644 index 000000000..592603457 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties index 232f53559..8807d4ce0 100644 --- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties +++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties @@ -229,6 +229,9 @@ stork.18=STORK-SAML Engine konnte nicht initialisiert werden. stork.19=Das erforderliche Attribut ist f\u00FCr naturliche Personen nicht vorhanden\: {0} stork.20=Fehler bei der Datenkonversion - eingegebens Datum fehlerhaft stork.21=Der angeforderte QAA-level {0} ist h\u00F6her als der QAA-level der Authentifizierung {1} +stork.22=Der STORK Authentifizierung erfordert die Auswahl des Herkunftslandes der Betroffenen. +stork.23=Die STORK Authentifizierung f\u00FCr "{0}" wird nicht unterst\u00FCtzt. +stork.24=Die STORK Authentifizierungsantwort enth\uFFFDlt leere Angaben zum Geschlecht. pvp2.00={0} ist kein gueltiger consumer service index pvp2.01=Fehler beim kodieren der PVP2 Antwort -- cgit v1.2.3 From c7e846c52979756aa3c178d65f6d618c6189bd81 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 29 Jan 2015 11:20:53 +0100 Subject: Fix javadoc issues. --- .../moa/id/auth/servlet/ProcessEngineSignalServlet.java | 2 +- .../egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java | 4 ++-- .../egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java | 6 +++--- .../at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java | 6 +++--- .../at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java | 2 +- .../moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java | 2 +- .../moa/id/auth/tasks/VerifyAuthenticationBlockTask.java | 6 +++--- .../gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java | 8 ++++---- .../gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java | 6 +++--- .../moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java index 849ccf5db..01f8e8949 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java @@ -50,7 +50,7 @@ public class ProcessEngineSignalServlet extends AuthServlet { /** * Resumes the current process instance that has been suspended due to an asynchronous task. The process instance is - * retrieved from the MOA session referred to by the request parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}. + * retrieved from the MOA session referred to by the request parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}. */ @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java index 29e9ac42f..8cd0db679 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java @@ -29,11 +29,11 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
          *
        • Renames the moa session id.
        • *
        • Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.
        • - *
        • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code {/VerifyCertificate}
        • + *
        • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code /VerifyCertificate}
        • *
        * Expects: *
          - *
        • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
        • + *
        • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
        • *
        * Result: *
          diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java index 01628dcf6..ff55eedeb 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java @@ -30,14 +30,14 @@ import com.datentechnik.process_engine.api.ExecutionContext; * In detail: *
            *
          • Renames the moa session id.
          • - *
          • Removes ExecutionContext property {@link MOAIDAuthConstants#PARAM_SESSIONID}.
          • + *
          • Removes ExecutionContext property {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}.
          • *
          • Creates the http form mentioned above.
          • *
          • Returns the http form via HttpServletResponse.
          • *
          * Expects: *
            - *
          • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID} or
          • - *
          • ExecutionContext property {@link MOAIDAuthConstants#PARAM_SESSIONID} (in case of legacy authentication without CCE selection, where the moa session is not provided by request parameter).
          • + *
          • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID} or
          • + *
          • ExecutionContext property {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID} (in case of legacy authentication without CCE selection, where the moa session is not provided by request parameter).
          • *
          * Result: *
            diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java index 8e52e3827..2ce6a1ae8 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java @@ -42,7 +42,7 @@ import com.datentechnik.process_engine.api.ExecutionContext; * In detail: *
              *
            • Renames the moa session id.
            • - *
            • Parses the CreateXMLSignatureResponse retrieved from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
            • + *
            • Parses the CreateXMLSignatureResponse retrieved from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
            • *
            • Extracts signature and signer certificate.
            • *
            • Send request to SZR Gateway in order to get an identity link.
            • *
            • Updates moa session (sets identity link, QAA level 4, authentication data and foreigner flag).
            • @@ -50,8 +50,8 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
            * Expects: *
              - *
            • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
            • - *
            • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
            • + *
            • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
            • + *
            • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
            • *
            * Result: *
              diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java index 626d33917..a7ee086af 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java @@ -47,7 +47,7 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
            * Expects: *
              - *
            • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
            • + *
            • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
            • *
            * Result: *
              diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java index 8b45f1c66..566616fcd 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java @@ -31,7 +31,7 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
            * Expects: *
              - *
            • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
            • + *
            • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
            • *
            * Result: *
              diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java index 97f3a21cb..956ec9c88 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java @@ -45,15 +45,15 @@ import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; * In detail: *
                *
              • Renames the moa session id.
              • - *
              • Takes the {@code CreateXMLSignatureResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
              • + *
              • Takes the {@code CreateXMLSignatureResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
              • *
              • Verifies the {@code CreateXMLSignatureResponse}.
              • *
              • Updates moa session.
              • *
              • Redirects back to {@code /dispatcher} in order to finalize the authentication.
              • *
              * Expects: *
                - *
              • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
              • - *
              • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
              • + *
              • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
              • + *
              • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
              • *
              * Result: *
                diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java index 7e76819ff..854c78161 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java @@ -29,11 +29,11 @@ import at.gv.egovernment.moa.spss.util.CertificateUtils; import com.datentechnik.process_engine.api.ExecutionContext; /** - * Parses the certificate from {@code InfoBoxReadResponse} (via POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}), creates the auth block to be signed and returns a {@code CreateXMLSignatureRequest} for auth block signature.

                + * Parses the certificate from {@code InfoBoxReadResponse} (via POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}), creates the auth block to be signed and returns a {@code CreateXMLSignatureRequest} for auth block signature.

                * In detail: *

                  *
                • Renames the moa session id.
                • - *
                • Retrieves the certificate via {@code InfoBoxReadResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
                • + *
                • Retrieves the certificate via {@code InfoBoxReadResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                • *
                • Verifies the certificate.
                • *
                • Creates the auth block to be signed using information from the certificate (Organwalter, foreign citizen.
                • *
                • Puts it in a {@code CreateXMLSignatureRequest}.
                • @@ -42,8 +42,8 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
                * Expects: *
                  - *
                • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
                • - *
                • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code InfoBoxReadResponse}.
                • + *
                • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                • + *
                • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_SESSIONID} containing a {@code InfoBoxReadResponse}.
                • *
                * Result: *
                  diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java index 9711b4bc4..eb884e9db 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java @@ -28,15 +28,15 @@ import com.datentechnik.process_engine.api.ExecutionContext; * In detail: *
                    *
                  • Renames the moa session id.
                  • - *
                  • Parses the identity link retrieved as {@code InfoBoxReadResponse} from POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}.
                  • + *
                  • Parses the identity link retrieved as {@code InfoBoxReadResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • *
                  • Verifies the identity link.
                  • *
                  • Updates moa session.
                  • *
                  • Puts boolean flag {@code identityLinkAvailable} into {@code ExecutionContext}.
                  • *
                  * Expects: *
                    - *
                  • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
                  • - *
                  • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE} containing a {@code InfoBoxReadResponse}.
                  • + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code InfoBoxReadResponse}.
                  • *
                  * Result: *
                    diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java index c32c9d791..3894567ed 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java @@ -42,7 +42,7 @@ import com.datentechnik.process_engine.api.ExecutionContext; *
                  * Expects: *
                    - *
                  • HttpServletRequest parameter {@link MOAIDAuthConstants#PARAM_SESSIONID}
                  • + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • *
                  • Property {@code ccc} set within the moa session.
                  • *
                  * Result: -- cgit v1.2.3 From 90c4f8e9a6140b97469357deb906b8816f5f680c Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Thu, 29 Jan 2015 12:18:11 +0100 Subject: integrate process engine from project 'dti-process-engine' --- id/server/idserverlib/pom.xml | 72 ++- .../moa/id/auth/servlet/AuthServlet.java | 3 +- .../servlet/GenerateIFrameTemplateServlet.java | 7 +- .../auth/servlet/ProcessEngineSignalServlet.java | 3 +- .../moa/id/auth/tasks/AbstractAuthServletTask.java | 11 +- .../id/auth/tasks/CertificateReadRequestTask.java | 7 +- .../id/auth/tasks/CreateIdentityLinkFormTask.java | 5 +- .../moa/id/auth/tasks/GetForeignIDTask.java | 8 +- .../moa/id/auth/tasks/GetMISSessionIDTask.java | 7 +- .../auth/tasks/PrepareAuthBlockSignatureTask.java | 6 +- .../auth/tasks/VerifyAuthenticationBlockTask.java | 8 +- .../moa/id/auth/tasks/VerifyCertificateTask.java | 7 +- .../moa/id/auth/tasks/VerifyIdentityLinkTask.java | 5 +- .../moa/id/moduls/AuthenticationManager.java | 11 +- .../id/moduls/moduleregistration/AuthModule.java | 4 +- .../moduls/moduleregistration/AuthModuleImpl.java | 2 +- .../moduleregistration/ModuleRegistration.java | 6 +- .../moa/id/process/ExecutionContextImpl.java | 2 +- .../process/ExpressionEvaluationContextImpl.java | 4 +- .../moa/id/process/ProcessDefinitionParser.java | 12 +- .../egovernment/moa/id/process/ProcessEngine.java | 4 +- .../moa/id/process/ProcessEngineImpl.java | 20 +- .../moa/id/process/ProcessInstance.java | 6 +- .../process/api/ExpressionEvaluationContext.java | 2 +- .../moa/id/process/dao/ProcessInstanceStore.java | 48 ++ .../moa/id/process/model/ProcessDefinition.java | 2 +- .../moa/id/process/model/ProcessNode.java | 2 +- .../egovernment/moa/id/process/model/TaskInfo.java | 2 +- .../moa/id/process/model/Transition.java | 2 +- .../process/spring/SpringExpressionEvaluator.java | 6 +- .../springweb/AbstractAuthSourceServlet.java | 6 +- .../springweb/AbstractSpringWebSupportedTask.java | 4 +- .../springweb/SpringWebExpressionEvaluator.java | 137 ++++++ .../test/BooleanStringExpressionEvaluator.java | 24 + .../process/process_engine/test/HalloWeltTask.java | 19 + .../process_engine/test/HelloWorldTask.java | 19 + .../test/ProcessDefinitionParserTest.java | 137 ++++++ .../process_engine/test/ProcessEngineTest.java | 67 +++ .../spring/test/ExpressionContextAdapter.java | 52 +++ ...mpleProcessDefinitionForSAML1Authentication.xml | 54 --- .../SampleProcessDefinitionWithExpression1.xml | 19 - .../moa/id/process/spring/test/SimplePojo.java | 41 ++ ...ingExpressionAwareProcessEngineTest-context.xml | 30 -- .../SpringExpressionAwareProcessEngineTest.java | 66 +++ .../test/SpringExpressionEvaluatorTest-context.xml | 14 - .../spring/test/SpringExpressionEvaluatorTest.java | 54 +++ .../spring/test/task/CreateSAML1AssertionTask.java | 54 +++ .../spring/test/task/GetIdentityLinkTask.java | 50 +++ .../test/task/IdentityLink_Max_Mustermann.xml | 52 --- .../id/process/spring/test/task/SAML1Assertion.xml | 487 --------------------- .../id/process/spring/test/task/SelectBKUTask.java | 33 ++ .../spring/test/task/SignAuthBlockTask.java | 52 +++ .../process/spring/test/task/SignedAuthBlock.xml | 179 -------- .../spring/test/task/ValidateIdentityLinkTask.java | 42 ++ .../test/task/ValidateSignedAuthBlockTask.java | 46 ++ ...nvalidProcessDefinition_MultipleStartEvents.xml | 22 + .../InvalidProcessDefinition_NoStartEvents.xml | 16 + .../InvalidProcessDefinition_TransitionLoop.xml | 21 + ...dProcessDefinition_TransitionRefsTransition.xml | 19 + ...cessDefinition_TransitionStartsFromEndEvent.xml | 19 + .../test/SampleProcessDefinition1.xml | 18 + .../test/SampleProcessDefinition2.xml | 21 + ...mpleProcessDefinitionForSAML1Authentication.xml | 54 +++ .../SampleProcessDefinitionWithExpression1.xml | 19 + ...ingExpressionAwareProcessEngineTest-context.xml | 30 ++ .../test/SpringExpressionEvaluatorTest-context.xml | 14 + .../test/task/IdentityLink_Max_Mustermann.xml | 52 +++ .../id/process/spring/test/task/SAML1Assertion.xml | 487 +++++++++++++++++++++ .../process/spring/test/task/SignedAuthBlock.xml | 179 ++++++++ id/server/pom.xml | 80 +++- 70 files changed, 2138 insertions(+), 935 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/SpringWebExpressionEvaluator.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/ExpressionContextAdapter.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SimplePojo.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/CreateSAML1AssertionTask.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/GetIdentityLinkTask.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SelectBKUTask.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignAuthBlockTask.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateIdentityLinkTask.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateSignedAuthBlockTask.java create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 0b3319111..70d3f9e01 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -15,7 +15,6 @@ ${basedir}/../../../repository - 0.0.1-SNAPSHOT @@ -25,13 +24,19 @@ https://build.shibboleth.net/nexus/content/groups/public/ - + - - eu.stork - oasis-dss-api - 1.0.0-RELEASE - + + eu.stork + oasis-dss-api + 1.0.0-RELEASE + + + org.apache.commons + commons-io + + + MOA.id.server @@ -219,12 +224,7 @@ jul-to-slf4j 1.7.6 --> - - - junit - junit - test - + commons-logging commons-logging @@ -412,6 +412,52 @@ provided + + + junit + junit + test + + + + + org.apache.commons + commons-collections4 + + + commons-io + commons-io + + + + + org.springframework + spring-core + + + commons-logging + commons-logging + + + + + org.springframework + spring-expression + + + org.springframework + spring-context + + + org.springframework + spring-webmvc + + + org.springframework + spring-test + test + + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java index 404dc68af..331a7653a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java @@ -79,6 +79,7 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.config.ConfigurationException; import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; +import at.gv.egovernment.moa.id.process.ProcessEngine; import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; import at.gv.egovernment.moa.id.storage.IExceptionStore; import at.gv.egovernment.moa.id.util.ServletUtils; @@ -86,8 +87,6 @@ import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; import at.gv.egovernment.moa.util.URLDecoder; -import com.datentechnik.process_engine.ProcessEngine; - /** * Base class for MOA-ID Auth Servlets, providing standard error handling and * constant names. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java index 6e817e2a5..7f53a1a13 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java @@ -42,15 +42,14 @@ import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration; +import at.gv.egovernment.moa.id.process.ExecutionContextImpl; +import at.gv.egovernment.moa.id.process.ProcessInstance; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.FileUtils; import at.gv.egovernment.moa.util.MiscUtil; -import com.datentechnik.process_engine.ExecutionContextImpl; -import com.datentechnik.process_engine.ProcessInstance; -import com.datentechnik.process_engine.api.ExecutionContext; - public class GenerateIFrameTemplateServlet extends AuthServlet { private static final long serialVersionUID = 1L; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java index 849ccf5db..c172124d2 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java @@ -13,10 +13,9 @@ import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils; +import at.gv.egovernment.moa.id.process.ProcessInstance; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import com.datentechnik.process_engine.ProcessInstance; - /** * Servlet that resumes a suspended process (in case of asynchronous tasks). * diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java index 7351933c1..a5c30485d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java @@ -1,6 +1,12 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_CACHE_CONTROL; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_EXPIRES; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_PRAGMA; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_CACHE_CONTROL_IE; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_EXPIRES; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.HEADER_VALUE_PRAGMA; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,14 +38,13 @@ import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.auth.servlet.AuthServlet; import at.gv.egovernment.moa.id.config.ConfigurationException; import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; +import at.gv.egovernment.moa.id.process.springweb.AbstractSpringWebSupportedTask; import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; import at.gv.egovernment.moa.id.storage.IExceptionStore; import at.gv.egovernment.moa.id.util.ServletUtils; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; -import com.datentechnik.process_engine.springweb.AbstractSpringWebSupportedTask; - /** * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing * etc.).

                  The code has been taken from {@link AuthServlet}. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java index da8a3d997..f62c49063 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java @@ -1,6 +1,7 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.REQ_VERIFY_CERTIFICATE; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -9,6 +10,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang3.BooleanUtils; import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; @@ -16,13 +18,12 @@ import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; import at.gv.egovernment.moa.id.util.ServletUtils; import at.gv.egovernment.moa.logging.Logger; -import com.datentechnik.process_engine.api.ExecutionContext; - /** * Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java index 70afd477d..435c77092 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java @@ -1,6 +1,6 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; import java.io.PrintWriter; @@ -18,13 +18,12 @@ import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; import at.gv.egovernment.moa.util.StringUtils; -import com.datentechnik.process_engine.api.ExecutionContext; - /** * Creates a http form including an embedded {@code InfoBoxReadRequest} for reading the identity link.

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java index 602ad527b..2f361fa43 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java @@ -1,6 +1,8 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_XMLRESPONSE; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.REQ_VERIFY_AUTH_BLOCK; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -16,6 +18,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.w3c.dom.Element; import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse; @@ -28,6 +31,7 @@ import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; import at.gv.egovernment.moa.id.client.SZRGWClientException; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; @@ -35,8 +39,6 @@ import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.DOMUtils; import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse; -import com.datentechnik.process_engine.api.ExecutionContext; - /** * Evaluates the {@code CreateXMLSignatureResponse}, extracts signature and certificate and asks the SZR Gateway for an identity link.

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java index 40e33ae43..0bc01191b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java @@ -1,6 +1,7 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.GET_MIS_SESSIONID; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; import iaik.pki.PKIException; import java.security.GeneralSecurityException; @@ -15,6 +16,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.xml.sax.SAXException; import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; @@ -24,6 +26,7 @@ import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.config.ConnectionParameter; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; @@ -33,8 +36,6 @@ import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.DOMUtils; -import com.datentechnik.process_engine.api.ExecutionContext; - /** * Retrieves a mandate from the online mandate issuing service.

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java index 30777198c..fec5531ae 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java @@ -1,6 +1,6 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -8,19 +8,19 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringEscapeUtils; import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; import at.gv.egovernment.moa.id.util.ServletUtils; import at.gv.egovernment.moa.logging.Logger; -import com.datentechnik.process_engine.api.ExecutionContext; - /** * Creates {@code CreateXMLSignatureRequest} for auth block signature.

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java index 2bc0bb8ad..287965097 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java @@ -1,5 +1,8 @@ package at.gv.egovernment.moa.id.auth.tasks; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.GET_MIS_SESSIONID; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_XMLRESPONSE; import iaik.pki.PKIException; import java.io.IOException; @@ -17,6 +20,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.w3c.dom.Element; import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; @@ -29,6 +33,7 @@ import at.gv.egovernment.moa.id.config.ConnectionParameter; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; import at.gv.egovernment.moa.id.util.SSLUtils; @@ -37,9 +42,6 @@ import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.DOMUtils; -import com.datentechnik.process_engine.api.ExecutionContext; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - /** * Verifies the signed authentication block (provided as {@code CreateXMLSignatureResponse}).

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java index ddea4c414..bf4292c15 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java @@ -1,6 +1,7 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.REQ_GET_FOREIGN_ID; import iaik.x509.X509Certificate; import java.io.IOException; @@ -13,6 +14,7 @@ import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.lang.StringEscapeUtils; import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; @@ -20,14 +22,13 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; import at.gv.egovernment.moa.id.util.ServletUtils; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.spss.util.CertificateUtils; -import com.datentechnik.process_engine.api.ExecutionContext; - /** * Parses the certificate from {@code InfoBoxReadResponse} (via POST parameter {@link MOAIDAuthConstants#PARAM_XMLRESPONSE}), creates the auth block to be signed and returns a {@code CreateXMLSignatureRequest} for auth block signature.

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java index 5b21cd29c..d70b89d71 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java @@ -1,6 +1,6 @@ package at.gv.egovernment.moa.id.auth.tasks; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID; import java.io.IOException; import java.util.Map; @@ -17,12 +17,11 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; import at.gv.egovernment.moa.id.util.ParamValidatorUtils; import at.gv.egovernment.moa.logging.Logger; -import com.datentechnik.process_engine.api.ExecutionContext; - /** * Verifies the identity link.

                  * In detail: diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java index 1a0c11aa1..ffb5e3d65 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java @@ -77,6 +77,11 @@ import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.data.SLOInformationContainer; import at.gv.egovernment.moa.id.data.SLOInformationImpl; import at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration; +import at.gv.egovernment.moa.id.process.ExecutionContextImpl; +import at.gv.egovernment.moa.id.process.ProcessEngine; +import at.gv.egovernment.moa.id.process.ProcessExecutionException; +import at.gv.egovernment.moa.id.process.ProcessInstance; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.protocols.pvp2x.PVPTargetConfiguration; import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IEncoder; import at.gv.egovernment.moa.id.protocols.pvp2x.binding.PostBinding; @@ -95,12 +100,6 @@ import at.gv.egovernment.moa.id.util.Random; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; -import com.datentechnik.process_engine.ExecutionContextImpl; -import com.datentechnik.process_engine.ProcessEngine; -import com.datentechnik.process_engine.ProcessExecutionException; -import com.datentechnik.process_engine.ProcessInstance; -import com.datentechnik.process_engine.api.ExecutionContext; - public class AuthenticationManager implements MOAIDAuthConstants { private static final AuthenticationManager INSTANCE = new AuthenticationManager(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java index 35273cd2b..6c9981feb 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java @@ -1,7 +1,7 @@ package at.gv.egovernment.moa.id.moduls.moduleregistration; -import com.datentechnik.process_engine.api.ExecutionContext; -import com.datentechnik.process_engine.model.ProcessDefinition; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.model.ProcessDefinition; /** * Defines the module capabilities. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java index cbe5c5932..68835f208 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java @@ -1,6 +1,6 @@ package at.gv.egovernment.moa.id.moduls.moduleregistration; -import com.datentechnik.process_engine.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; public class AuthModuleImpl implements AuthModule { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java index b90e0d94f..5faae2897 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java @@ -19,9 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.io.Resource; -import com.datentechnik.process_engine.ProcessDefinitionParserException; -import com.datentechnik.process_engine.ProcessEngine; -import com.datentechnik.process_engine.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException; +import at.gv.egovernment.moa.id.process.ProcessEngine; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; /** * This class handles registering modules. The modules are detected either with diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java index 87ee57a24..080990f71 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExecutionContextImpl.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.datentechnik.process_engine.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; /** * ExecutionContext implementation, related to a certain process instance. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java index acc10449f..f0d1c861d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ExpressionEvaluationContextImpl.java @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.datentechnik.process_engine.api.ExecutionContext; -import com.datentechnik.process_engine.api.ExpressionEvaluationContext; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext; /** * Context implementation used for expression evaluation only. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java index b38bb7aa0..6b245f013 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java @@ -27,12 +27,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; -import com.datentechnik.process_engine.model.EndEvent; -import com.datentechnik.process_engine.model.ProcessDefinition; -import com.datentechnik.process_engine.model.ProcessNode; -import com.datentechnik.process_engine.model.StartEvent; -import com.datentechnik.process_engine.model.TaskInfo; -import com.datentechnik.process_engine.model.Transition; +import at.gv.egovernment.moa.id.process.model.EndEvent; +import at.gv.egovernment.moa.id.process.model.ProcessDefinition; +import at.gv.egovernment.moa.id.process.model.ProcessNode; +import at.gv.egovernment.moa.id.process.model.StartEvent; +import at.gv.egovernment.moa.id.process.model.TaskInfo; +import at.gv.egovernment.moa.id.process.model.Transition; /** * Parses an XML representation of a process definition as defined by the respective XML schema. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java index b4135ee41..2d9dcff8e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java @@ -4,8 +4,8 @@ package at.gv.egovernment.moa.id.process; import java.io.InputStream; import java.io.Serializable; -import com.datentechnik.process_engine.api.ExecutionContext; -import com.datentechnik.process_engine.model.ProcessDefinition; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.model.ProcessDefinition; /** * Process engine providing means for starting and resuming processes. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java index 8f9d73b3d..3ba8fb9ed 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java @@ -16,16 +16,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import com.datentechnik.process_engine.api.ExecutionContext; -import com.datentechnik.process_engine.api.ExpressionEvaluationContext; -import com.datentechnik.process_engine.api.ExpressionEvaluator; -import com.datentechnik.process_engine.api.Task; -import com.datentechnik.process_engine.model.EndEvent; -import com.datentechnik.process_engine.model.ProcessDefinition; -import com.datentechnik.process_engine.model.ProcessNode; -import com.datentechnik.process_engine.model.StartEvent; -import com.datentechnik.process_engine.model.TaskInfo; -import com.datentechnik.process_engine.model.Transition; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext; +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator; +import at.gv.egovernment.moa.id.process.api.Task; +import at.gv.egovernment.moa.id.process.model.EndEvent; +import at.gv.egovernment.moa.id.process.model.ProcessDefinition; +import at.gv.egovernment.moa.id.process.model.ProcessNode; +import at.gv.egovernment.moa.id.process.model.StartEvent; +import at.gv.egovernment.moa.id.process.model.TaskInfo; +import at.gv.egovernment.moa.id.process.model.Transition; /** * Process engine implementation allowing starting and continuing processes as well as providing means for cleanup actions. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java index 0899426ca..ef69451eb 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java @@ -6,9 +6,9 @@ import java.util.Date; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.time.DurationFormatUtils; -import com.datentechnik.process_engine.api.ExecutionContext; -import com.datentechnik.process_engine.model.ProcessDefinition; -import com.datentechnik.process_engine.support.SecureRandomHolder; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.model.ProcessDefinition; +import at.gv.egovernment.moa.id.process.support.SecureRandomHolder; /** * Represents a process being executed. The process instance provides information about the process and its state. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java index bb3b267cf..94854dcad 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/api/ExpressionEvaluationContext.java @@ -3,7 +3,7 @@ package at.gv.egovernment.moa.id.process.api; import java.io.Serializable; import java.util.Map; -import com.datentechnik.process_engine.model.Transition; +import at.gv.egovernment.moa.id.process.model.Transition; /** * Context used for evaluation of condition expressions set for {@linkplain Transition Transitions}. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java new file mode 100644 index 000000000..5270e036a --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -0,0 +1,48 @@ +package at.gv.egovernment.moa.id.process.dao; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.Table; + +@Entity +@Table(name = "process_instance") +public class ProcessInstanceStore { + + @Column(name = "id", unique = true, nullable = false) + @Id + private String id; + + @Column(name = "processDefinitionID", unique = true, nullable = false) + private String processDefinitionID; + + @Column(name = "executionContextData", nullable = false) + @Lob + private byte[] executionContextData; + + public String getId() { + return id; + } + + public String getProcessDefinitionID() { + return processDefinitionID; + } + + public byte[] getExecutionContextData() { + return executionContextData; + } + + public void setId(String id) { + this.id = id; + } + + public void setProcessDefinitionID(String processDefinitionID) { + this.processDefinitionID = processDefinitionID; + } + + public void setExecutionContextData(byte[] executionContextData) { + this.executionContextData = executionContextData; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java index 19e78b0e6..518409ecf 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessDefinition.java @@ -4,7 +4,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; -import com.datentechnik.process_engine.ProcessDefinitionParser; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParser; /** * Represents a single process definition containing diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java index a94d33943..42f2e3cc2 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/ProcessNode.java @@ -3,7 +3,7 @@ package at.gv.egovernment.moa.id.process.model; import java.util.ArrayList; import java.util.List; -import com.datentechnik.process_engine.ProcessDefinitionParser; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParser; /** * Represents a {@link StartEvent}, an {@link EndEvent} or a {@linkplain TaskInfo Task}. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java index b7f13a880..78a9d6a0a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/TaskInfo.java @@ -4,7 +4,7 @@ import java.io.Serializable; import org.apache.commons.collections4.CollectionUtils; -import com.datentechnik.process_engine.api.Task; +import at.gv.egovernment.moa.id.process.api.Task; /** * Represents information about a single task to be performed upon process execution. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java index 9d9c44c8c..bc3005534 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/model/Transition.java @@ -2,7 +2,7 @@ package at.gv.egovernment.moa.id.process.model; import java.io.Serializable; -import com.datentechnik.process_engine.ProcessDefinitionParser; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParser; /** * Represents a single transition from a {@link StartEvent} or {@linkplain TaskInfo Task} to another diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java index 1c91cf780..5b30c7172 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/spring/SpringExpressionEvaluator.java @@ -15,9 +15,9 @@ import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import com.datentechnik.process_engine.api.ExpressionEvaluationContext; -import com.datentechnik.process_engine.api.ExpressionEvaluator; -import com.datentechnik.process_engine.model.Transition; +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext; +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator; +import at.gv.egovernment.moa.id.process.model.Transition; /** * Expression evaluator for processing {@link Transition} conditions allowing to reference Spring beans from the diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java index 4b5af854e..738b58834 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractAuthSourceServlet.java @@ -10,9 +10,9 @@ import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import com.datentechnik.process_engine.ProcessEngine; -import com.datentechnik.process_engine.ProcessInstance; -import com.datentechnik.process_engine.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.ProcessEngine; +import at.gv.egovernment.moa.id.process.ProcessInstance; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; /** * Abstract HttpServlet that provides means for retrieving the process engine (Spring Web required) as well as diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java index 1f7fb7690..c9262cea9 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java @@ -8,8 +8,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.filter.RequestContextFilter; -import com.datentechnik.process_engine.api.ExecutionContext; -import com.datentechnik.process_engine.api.Task; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; /** * Abstract task implementation providing {@link HttpServletRequest} and {@link HttpServletResponse}. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/SpringWebExpressionEvaluator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/SpringWebExpressionEvaluator.java new file mode 100644 index 000000000..9dd7bc61e --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/SpringWebExpressionEvaluator.java @@ -0,0 +1,137 @@ +package at.gv.egovernment.moa.id.process.springweb; + +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; + +import javax.annotation.PostConstruct; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.expression.BeanFactoryResolver; +import org.springframework.expression.Expression; +import org.springframework.expression.ExpressionParser; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; + +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext; +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator; +import at.gv.egovernment.moa.id.process.model.Transition; + +/** + * Expression evaluator for processing {@link Transition} conditions allowing to + *

                    + *
                  • reference Spring beans from the application context using {@code @myBeanName...},
                  • + *
                  • {@link ExecutionContext} properties using {@code ctx['property']},
                  • + *
                  • Multi valued {@link HttpServletRequest} parameters using {@code requestParameters['foo']} (keep in mind that this + * expression returns an array of String values) and
                  • + *
                  • Single valued {@link HttpServletRequest} parameters using {@code requestParameter['foo']}
                  • + *
                  + * + * @author tknall + * + */ +public class SpringWebExpressionEvaluator implements ExpressionEvaluator { + + private Logger log = LoggerFactory.getLogger(getClass()); + private ExpressionParser parser = new SpelExpressionParser(); + private StandardEvaluationContext evaluationContext = new StandardEvaluationContext(); + + @Autowired(required = false) + private ApplicationContext ctx; + + @Autowired(required = false) + private HttpServletRequest request; + + @PostConstruct + private void init() { + if (ctx != null) { + evaluationContext.setBeanResolver(new BeanFactoryResolver(ctx)); + } + } + + /** + * Evaluation context that provides access to {@link HttpServletRequest} parameters using + * {@code requestParameter['foo']} for single value parameters or {@code requestParameters['foo']} for multi value + * parameters. Basic calls to {@code ctx} will be delegated. + * + * @author tknall + * + */ + private class SpringWebExpressionEvaluationContext implements ExpressionEvaluationContext { + + private static final long serialVersionUID = 1L; + + /** + * Creates a new expression evaluation context, providing access to HttpServletRequest parameter(s). + * + * @param delegate + * The original {@link ExpressionEvaluationContext} to be delegated to for {@code ctx['foo']} + * expressions. + */ + public SpringWebExpressionEvaluationContext(ExpressionEvaluationContext delegate) { + this.delegate = delegate; + } + + private ExpressionEvaluationContext delegate; + + @Override + public Map getCtx() { + return delegate.getCtx(); + } + + @SuppressWarnings("unused") + public Map getRequestParameter() { + if (request != null) { + Map singleValueMap = new HashMap(); + Iterator> it = request.getParameterMap().entrySet().iterator(); + while (it.hasNext()) { + Entry entry = it.next(); + if (ArrayUtils.isNotEmpty(entry.getValue())) { + singleValueMap.put(entry.getKey(), entry.getValue()[0]); + } + } + return singleValueMap; + } else { + return Collections. emptyMap(); + } + } + + @SuppressWarnings("unused") + public Map getRequestParameters() { + if (request != null) { + return request.getParameterMap(); + } else { + return Collections. emptyMap(); + } + } + + } + + @Override + public boolean evaluate(ExpressionEvaluationContext expressionContext, String expression) { + Objects.requireNonNull(expression, "Expression must not be null."); + log.trace("Evaluating '{}'.", expression); + + Expression expr = parser.parseExpression(expression); + Boolean result = expr.getValue(evaluationContext, new SpringWebExpressionEvaluationContext(expressionContext), + Boolean.class); + if (result == null) { + log.warn("Evaluation of '{}' results in null-value.", expression); + } else { + log.debug("Expression '{}' -> {}", expression, result); + } + + return BooleanUtils.isTrue(result); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java new file mode 100644 index 000000000..c51f5fe66 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java @@ -0,0 +1,24 @@ +package at.gv.egovernment.moa.id.process.process_engine.test; + +import java.util.Objects; + +import org.apache.commons.lang3.BooleanUtils; + +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext; +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator; + +/** + * Expression evaluator that guesses the boolean value from a String. Refer to {@link BooleanUtils#toBoolean(String)} + * for further information. + * + * @author tknall + * + */ +public class BooleanStringExpressionEvaluator implements ExpressionEvaluator { + + @Override + public boolean evaluate(ExpressionEvaluationContext expressionContext, String expression) { + return BooleanUtils.toBoolean(Objects.requireNonNull(expression, "Expression must not be null.")); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java new file mode 100644 index 000000000..1a8de811b --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java @@ -0,0 +1,19 @@ +package at.gv.egovernment.moa.id.process.process_engine.test; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * Simple task that just outputs a "Hallo World" text to the console. + * + * @author tknall + * + */ +public class HalloWeltTask implements Task { + + @Override + public void execute(ExecutionContext executionContext) { + System.out.println("Hallo Welt"); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java new file mode 100644 index 000000000..6ce3091dd --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java @@ -0,0 +1,19 @@ +package at.gv.egovernment.moa.id.process.process_engine.test; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * Simple task that just outputs a "Hello World" text to the console. + * + * @author tknall + * + */ +public class HelloWorldTask implements Task { + + @Override + public void execute(ExecutionContext executionContext) { + System.out.println("Hello World"); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java new file mode 100644 index 000000000..e20f4bfe8 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java @@ -0,0 +1,137 @@ +package at.gv.egovernment.moa.id.process.process_engine.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.io.InputStream; + +import org.junit.Test; + +import at.gv.egovernment.moa.id.process.ProcessDefinitionParser; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException; +import at.gv.egovernment.moa.id.process.model.EndEvent; +import at.gv.egovernment.moa.id.process.model.ProcessDefinition; +import at.gv.egovernment.moa.id.process.model.ProcessNode; +import at.gv.egovernment.moa.id.process.model.StartEvent; +import at.gv.egovernment.moa.id.process.model.TaskInfo; +import at.gv.egovernment.moa.id.process.model.Transition; + +public class ProcessDefinitionParserTest { + + @Test(expected = ProcessDefinitionParserException.class) + public void testParseInvalidProcessDefinition_MultipleStartEvents() throws IOException, ProcessDefinitionParserException { + try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_MultipleStartEvents.xml")) { + new ProcessDefinitionParser().parse(in); + } + } + + @Test(expected = ProcessDefinitionParserException.class) + public void testParseInvalidProcessDefinition_TransitionLoop() throws IOException, ProcessDefinitionParserException { + try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionLoop.xml")) { + new ProcessDefinitionParser().parse(in); + } + } + + @Test(expected = ProcessDefinitionParserException.class) + public void testParseInvalidProcessDefinition_TransitionStartsFromEndEvent() throws IOException, ProcessDefinitionParserException { + try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionStartsFromEndEvent.xml")) { + new ProcessDefinitionParser().parse(in); + } + } + + @Test(expected = ProcessDefinitionParserException.class) + public void testParseInvalidProcessDefinition_TransitionRefsTransition() throws IOException, ProcessDefinitionParserException { + try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionRefsTransition.xml")) { + new ProcessDefinitionParser().parse(in); + } + } + + @Test(expected = ProcessDefinitionParserException.class) + public void testParseInvalidProcessDefinition_NoStartEvents() throws IOException, ProcessDefinitionParserException { + try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_NoStartEvents.xml")) { + new ProcessDefinitionParser().parse(in); + } + } + + @Test + public void testParseSampleProcessDefinition() throws IOException, ProcessDefinitionParserException { + try (InputStream in = getClass().getResourceAsStream("SampleProcessDefinition1.xml")) { + + ProcessDefinitionParser parser = new ProcessDefinitionParser(); + ProcessDefinition pd = parser.parse(in); + + assertNotNull(pd); + assertEquals("SampleProcess1", pd.getId()); + + // first assert tasks then transitions + // start event + StartEvent startEvent = pd.getStartEvent(); + assertNotNull(startEvent); + assertEquals("start", startEvent.getId()); + assertEquals(startEvent, pd.getProcessNode("start")); + // task1 + ProcessNode processNode = pd.getProcessNode("task1"); + assertNotNull(processNode); + assertTrue(processNode instanceof TaskInfo); + TaskInfo task1 = (TaskInfo) processNode; + assertEquals("task1", task1.getId()); + assertFalse(task1.isAsync()); + // task2 + processNode = pd.getProcessNode("task2"); + assertNotNull(processNode); + assertTrue(processNode instanceof TaskInfo); + TaskInfo task2 = (TaskInfo) processNode; + assertEquals("task2", task2.getId()); + assertTrue(task2.isAsync()); + // end event + processNode = pd.getProcessNode("end"); + assertNotNull(processNode); + assertTrue(processNode instanceof EndEvent); + EndEvent endEvent = (EndEvent) processNode; + assertEquals("end", endEvent.getId()); + + // assert transitions + // start event + assertNotNull(startEvent.getIncomingTransitions()); + assertTrue(startEvent.getIncomingTransitions().isEmpty()); + assertNotNull(startEvent.getOutgoingTransitions()); + assertEquals(1, startEvent.getOutgoingTransitions().size()); + // transition from start to task1 + Transition startToTask1 = startEvent.getOutgoingTransitions().get(0); + assertEquals("fromStart", startToTask1.getId()); + assertEquals(startEvent, startToTask1.getFrom()); + assertEquals(task1, startToTask1.getTo()); + assertEquals("true", startToTask1.getConditionExpression()); + // task1 + assertNotNull(task1.getIncomingTransitions()); + assertEquals(1, task1.getIncomingTransitions().size()); + assertEquals(startToTask1, task1.getIncomingTransitions().get(0)); + assertNotNull(task1.getOutgoingTransitions()); + assertEquals(1, task1.getOutgoingTransitions().size()); + // transition from task1 to task2 + Transition task1ToTask2 = task1.getOutgoingTransitions().get(0); + assertNull(task1ToTask2.getId()); + assertEquals(task1, task1ToTask2.getFrom()); + assertEquals(task2, task1ToTask2.getTo()); + assertNull(task1ToTask2.getConditionExpression()); + // task2 + assertNotNull(task2.getIncomingTransitions()); + assertEquals(1, task2.getIncomingTransitions().size()); + assertEquals(task1ToTask2, task2.getIncomingTransitions().get(0)); + assertNotNull(task2.getOutgoingTransitions()); + assertEquals(1, task2.getOutgoingTransitions().size()); + // transition from task2 to end + Transition task2ToEnd = task2.getOutgoingTransitions().get(0); + assertNull(task2ToEnd.getId()); + assertEquals(task2, task2ToEnd.getFrom()); + assertEquals(endEvent, task2ToEnd.getTo()); + assertNull(task2ToEnd.getConditionExpression()); + + } + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java new file mode 100644 index 000000000..04a7a659d --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java @@ -0,0 +1,67 @@ +package at.gv.egovernment.moa.id.process.process_engine.test; + +import static at.gv.egovernment.moa.id.process.ProcessInstanceState.ENDED; +import static at.gv.egovernment.moa.id.process.ProcessInstanceState.NOT_STARTED; +import static at.gv.egovernment.moa.id.process.ProcessInstanceState.SUSPENDED; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.io.InputStream; + +import org.junit.BeforeClass; +import org.junit.Test; + +import at.gv.egovernment.moa.id.process.ProcessDefinitionParser; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException; +import at.gv.egovernment.moa.id.process.ProcessEngine; +import at.gv.egovernment.moa.id.process.ProcessEngineImpl; +import at.gv.egovernment.moa.id.process.ProcessExecutionException; +import at.gv.egovernment.moa.id.process.ProcessInstance; + +public class ProcessEngineTest { + + private static ProcessEngine pe; + + @BeforeClass + public static void init() throws IOException, ProcessDefinitionParserException { + ProcessDefinitionParser pdp = new ProcessDefinitionParser(); + pe = new ProcessEngineImpl(); + ((ProcessEngineImpl) pe).setTransitionConditionExpressionEvaluator(new BooleanStringExpressionEvaluator()); + try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition1.xml")) { + ((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in)); + } + try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition2.xml")) { + ((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in)); + } + } + + @Test + public void testSampleProcess1() throws IOException, ProcessDefinitionParserException, ProcessExecutionException { + ProcessInstance pi = pe.createProcessInstance("SampleProcess1"); + assertEquals(NOT_STARTED, pi.getState()); + // start process + pe.start(pi); + assertEquals(SUSPENDED, pi.getState()); + System.out.println("Do something asynchronously"); + pe.signal(pi); + assertEquals(ENDED, pi.getState()); + } + + @Test + public void testSampleProcess2() throws IOException, ProcessDefinitionParserException, ProcessExecutionException { + ProcessInstance pi = pe.createProcessInstance("SampleProcess2"); + assertEquals(NOT_STARTED, pi.getState()); + // start process + pe.start(pi); + assertEquals(SUSPENDED, pi.getState()); + System.out.println("Do something asynchronously"); + pe.signal(pi); + assertEquals(ENDED, pi.getState()); + } + + @Test(expected = IllegalArgumentException.class) + public void testProcessInstanceDoesNotExist() { + pe.getProcessInstance("does not exist"); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/ExpressionContextAdapter.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/ExpressionContextAdapter.java new file mode 100644 index 000000000..c26236619 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/ExpressionContextAdapter.java @@ -0,0 +1,52 @@ +package at.gv.egovernment.moa.id.process.spring.test; + + +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext; + +/** + * Adapter class for {@link ExpressionEvaluationContext}. Intended to be used for testing purposes. + * + * @author tknall + * + */ +public class ExpressionContextAdapter implements ExpressionEvaluationContext { + + private static final long serialVersionUID = 1L; + + private Map ctxData = Collections.synchronizedMap(new HashMap()); + + /** + * Returns a certain {@link Serializable} object associated with a certain {@code key}. + * + * @param key + * The key. + * @return The object or {@code null} if no object was found stored with that key or if a {@code null} value was + * stored. + */ + Serializable get(String key) { + return ctxData.get(key); + } + + /** + * Stores a {@link Serializable} with a certain {@code key}. + * + * @param key + * The key. + * @param object + * The object. + */ + void put(String key, Serializable object) { + ctxData.put(key, object); + } + + @Override + public Map getCtx() { + return Collections.unmodifiableMap(ctxData); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml deleted file mode 100644 index 6525fb0cd..000000000 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml deleted file mode 100644 index ef71026ec..000000000 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SimplePojo.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SimplePojo.java new file mode 100644 index 000000000..89f3c0383 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SimplePojo.java @@ -0,0 +1,41 @@ +package at.gv.egovernment.moa.id.process.spring.test; + +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator; + +/** + * A dummy pojo used to test {@link ExpressionEvaluator} with Spring EL referencing Spring beans. + * + * @author tknall + * + */ +public class SimplePojo { + + private Boolean booleanValue; + private String stringValue; + private Integer integerValue; + + public Boolean getBooleanValue() { + return booleanValue; + } + + public void setBooleanValue(Boolean booleanValue) { + this.booleanValue = booleanValue; + } + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(String stringValue) { + this.stringValue = stringValue; + } + + public Integer getIntegerValue() { + return integerValue; + } + + public void setIntegerValue(Integer integerValue) { + this.integerValue = integerValue; + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml deleted file mode 100644 index eb62d1ae2..000000000 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java new file mode 100644 index 000000000..4022a7a15 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java @@ -0,0 +1,66 @@ +package at.gv.egovernment.moa.id.process.spring.test; + +import static at.gv.egovernment.moa.id.process.ProcessInstanceState.ENDED; +import static at.gv.egovernment.moa.id.process.ProcessInstanceState.NOT_STARTED; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException; +import at.gv.egovernment.moa.id.process.ProcessEngine; +import at.gv.egovernment.moa.id.process.ProcessExecutionException; +import at.gv.egovernment.moa.id.process.ProcessInstance; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; + +/** + * Tests the process engine using processes based on Spring EL referencing the process context and further Spring beans. + * + * @author tknall + * + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration +public class SpringExpressionAwareProcessEngineTest { + + @Autowired + private ProcessEngine pe; + + @Test + public void testSampleProcessDefinitionWithExpression1() throws IOException, ProcessDefinitionParserException, + ProcessExecutionException { + ProcessInstance pi = pe.createProcessInstance("SampleProcessWithExpression1"); + assertEquals(NOT_STARTED, pi.getState()); + // start process + pe.start(pi); + assertEquals(ENDED, pi.getState()); + } + + @Test + public void testSampleProcessDefinitionForSAML1Authentication() throws IOException, + ProcessDefinitionParserException, ProcessExecutionException { + ProcessInstance pi = pe.createProcessInstance("SampleProcessDefinitionForSAML1Authentication"); + assertEquals(NOT_STARTED, pi.getState()); + // start process + pe.start(pi); + assertEquals(ENDED, pi.getState()); + + ExecutionContext ec = pi.getExecutionContext(); + assertNotNull(ec); + System.out.println(ec.keySet()); + + assertNotNull(ec.get("bkuURL")); + assertNotNull(ec.get("IdentityLink")); + assertNotNull(ec.get("isIdentityLinkValidated")); + assertNotNull(ec.get("SignedAuthBlock")); + assertNotNull(ec.get("isSignedAuthBlockValidated")); + assertNotNull(ec.get("SAML1Assertion")); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml deleted file mode 100644 index dadc6bf81..000000000 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest.java new file mode 100644 index 000000000..bc9d1d399 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest.java @@ -0,0 +1,54 @@ +package at.gv.egovernment.moa.id.process.spring.test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator; + +/** + * Tests the {@link ExpressionEvaluator} using a Spring EL based implementation capable of dereferencing Spring beans. + * + * @author tknall + * + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration +public class SpringExpressionEvaluatorTest { + + private ExpressionContextAdapter ctx; + + @Autowired + private ExpressionEvaluator expressionEvaluator; + + @Before + public void prepareTest() { + ctx = new ExpressionContextAdapter(); + } + + @Test + public void testEvaluateSimpleExpression() { + assertTrue(expressionEvaluator.evaluate(ctx, "'true'")); + } + + @Test + public void testEvaluateExpressionWithCtx() { + ctx.put("myProperty", false); + assertFalse(expressionEvaluator.evaluate(ctx, "ctx['myProperty']")); + } + + @Test + public void testEvaluateExpressionWithBeanReference() { + assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.booleanValue")); + assertTrue(expressionEvaluator.evaluate(ctx, "'HelloWorld'.equals(@simplePojo.stringValue)")); + assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.integerValue == 42")); + assertTrue(expressionEvaluator.evaluate(ctx, "@simplePojo.stringValue.length() == 10")); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/CreateSAML1AssertionTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/CreateSAML1AssertionTask.java new file mode 100644 index 000000000..7e56071bd --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/CreateSAML1AssertionTask.java @@ -0,0 +1,54 @@ +package at.gv.egovernment.moa.id.process.spring.test.task; + +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.Objects; + +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * A dummy task simulating the creation of a SAML1 assertion. + *

                  + * Requires context data: + *

                    + *
                  • {@code IdentityLink}
                  • + *
                  • {@code isIdentityLinkValidated}
                  • + *
                  • {@code SignedAuthBlock}
                  • + *
                  • {@code isSignedAuthBlockValidated}
                  • + *
                  + *

                  + *

                  + * Enriches context data with: + *

                    + *
                  • {@code SAML1Assertion}
                  • + *
                  + *

                  + * + * @author tknall + * + */ +public class CreateSAML1AssertionTask implements Task { + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(ExecutionContext executionContext) throws Exception { + Objects.requireNonNull(executionContext.get("IdentityLink")); + assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated")))); + Objects.requireNonNull(executionContext.get("SignedAuthBlock")); + assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isSignedAuthBlockValidated")))); + + log.debug("Using IdentityLink and signed auth block in order to create SAML1 assertion."); + + try (InputStream in = getClass().getResourceAsStream("SAML1Assertion.xml")) { + executionContext.put("SAML1Assertion", IOUtils.toString(in, Charset.forName("UTF-8"))); + } + + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/GetIdentityLinkTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/GetIdentityLinkTask.java new file mode 100644 index 000000000..412fb0123 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/GetIdentityLinkTask.java @@ -0,0 +1,50 @@ +package at.gv.egovernment.moa.id.process.spring.test.task; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.Objects; + +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * A dummy task simulating the retrieval of an IdentityLink. + *

                  + * Asynchonous + *

                  + * Requires context data: + *

                    + *
                  • {@code bkuURL}
                  • + *
                  + *

                  + *

                  + * Enriches context data with: + *

                    + *
                  • {@code IdentityLink}
                  • + *
                  + *

                  + * + * @author tknall + * + */ +public class GetIdentityLinkTask implements Task { + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(ExecutionContext executionContext) throws IOException { + Objects.requireNonNull(executionContext.get("bkuURL")); + + log.debug("Using bkuURL in order to retrieve IdentityLink."); + + try (InputStream in = getClass().getResourceAsStream("IdentityLink_Max_Mustermann.xml")) { + executionContext.put("IdentityLink", IOUtils.toString(in, Charset.forName("UTF-8"))); + } + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml deleted file mode 100644 index c68972f13..000000000 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - urn:oasis:names:tc:SAML:1.0:cm:sender-vouches - - tqCQEC7+AqGEeeL390V5Jg==urn:publicid:gv.at:baseidMaxMustermann1940-01-01 - - - - - - - - - - - - not(ancestor-or-self::pr:Identification) - - - - - Rmr5vkWXL/PvpoXnbK632QmzYms= - - - - HoPZWYll8aMFpKOlRSwckt5iCQk= - - - - NPpRwVo5/5kf5iHUyaEc7d7So3W4oPgOCYNgnKpgdZfttFkFFN+9oG60w7YvKEYSeTPhP3zp7eaH -ZFapj+naD+wd0y5ELWep9Y+s+qP7fNLrFECHQxQasLWtR4akxlWDpYQ0bvOuepK2ip1EQ6pRlccA -wJ1l4iOWFhfdA9YAg5QLkBqWSwgrNUswhLnDBM+Ot6Gj5g2rpYY7aoAOXvTR8B5Dkg94ASb4u0wv -VPV8+4mjOfP+l6QWLqywzcq3qj/qFZkbujjZbV/fNPDnDD1ff/M6ZfCGO8xzlYfjfEA7cmHuiJf2 -/ey/3nT7vI5XbpBPWChT5Sl4DQysxlfE6e4MZw== - MIIF3TCCBMWgAwIBAgIDByniMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMB4XDTEwMDcyODExMzY0M1oXDTE1MDcyODExMzY0M1owgbYxCzAJBgNVBAYTAkFUMR4wHAYDVQQKDBVEYXRlbnNjaHV0emtvbW1pc3Npb24xIjAgBgNVBAsMGVN0YW1temFobHJlZ2lzdGVyYmVob2VyZGUxLjAsBgNVBAMMJVNpZ25hdHVyc2VydmljZSBEYXRlbnNjaHV0emtvbW1pc3Npb24xFTATBgNVBAUTDDMyNTkyODMyMzk5ODEcMBoGCSqGSIb3DQEJARYNZHNrQGRzay5ndi5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+dBSEBGj2jUXIK1Mp3lVxc/Za+pJMiyKrX3G1ZxgX/ikx7D9scsPYMt473LlAWl9cmCbHbJK+PV2XNNdURLMUCIX+4vUNs2MHeDTQtX8BXjJFpwJYSoaRJQ39FVS/1r5sWcra9Hhdm7w5Gtx/2ukyDX0kdkxawkhP4EQEzi/SI+Fugn+WqgQ1nAdlbxb/dcBw5w1h9b3lmuwUf4z3ooQWUD2DgA/kKd1KejNR43mLUsmvSzevPxT9zs78pOR1OacB7IszTVJPXeOEaaNZHnnB/UeO3g8LEV/3OkXcUgcMkbIIiaBHlll71Pq0COj9kqjXoe7OrRjLY5i3KwOpa6TMCAwEAAaOCAgcwggIDMBMGA1UdIwQMMAqACEkcWDpP6A0DMH8GCCsGAQUFBwEBBHMwcTAnBggrBgEFBQcwAYYbaHR0cDovL29jc3AuYS10cnVzdC5hdC9vY3NwMEYGCCsGAQUFBzAChjpodHRwOi8vd3d3LmEtdHJ1c3QuYXQvY2VydHMvYS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMmEuY3J0MFQGA1UdIARNMEswSQYGKigAEQESMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2NwL2Etc2lnbi1BbXRzc2lnbmF0dXIwgZ4GA1UdHwSBljCBkzCBkKCBjaCBioaBh2xkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMixvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQITAgOnhr0tbowDgYDVR0PAQH/BAQDAgSwMCAGA1UdEQQZMBeBFW1hcmN1cy5oaWxkQGRzay5ndi5hdDAJBgNVHRMEAjAAMA4GByooAAoBBwEEAwEB/zAUBgcqKAAKAQEBBAkMB0JTQi1EU0swDQYJKoZIhvcNAQEFBQADggEBAHTklnvPCH/bJSOlIPbLUEkSGuFHsektSZ8Vr22x/Yv7EzsxoQrJIiz2mQ2gQqFuExdWYxvsowjiSbiis9iUf1c0zscvDS3mIZxGs4M89XHsjHnIyb+Fuwnamw65QrFvM1tNB1ZMjxJ3x+YmHLHdtT3BEBcr3/NCRHd2S0HoBspNz9HVgJaZY1llR7poKBvnAc4g1i+QTvyVb00PtKxR9Lw/9ABInX/1pzpxqrPy7Ib2OP8z6dd3WHmIsCiSHUaj0Dxwwln6fYJjhxZ141SnbovlCLYtrsZLXoi9ljIqX4xO0PwMI2RfNc9cXxTRrRS6rEOvX7PpvgXiDXhp592Yyp4= - - - - - - not(ancestor-or-self::dsig:Signature) - - - - 7IkIdYti2dh3VZQ4Fp+9lPT67cM= - - - - - \ No newline at end of file diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml deleted file mode 100644 index 3aeedd590..000000000 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml +++ /dev/null @@ -1,487 +0,0 @@ - - - - - K2YMyx3/5kIpNJR+SAD/rbRYH+c= - - http://reference.e-government.gv.at/namespace/moa/20020822#cm - - - - - https://localhost:18443/moa-id-auth/ - - - - - K2YMyx3/5kIpNJR+SAD/rbRYH+c= - urn:publicid:gv.at:wbpk+FN+www.act.at - - - - - https://localhost:48443/mandates/ - - - 1978-04-29 - - - Vollmachtsvertreter - - - MeineTestFirma - - - 123456i - - - - - - - - - - - - - - - Signatur der Anmeldedaten - - - -

                  Signatur der Anmeldedaten

                  -

                  -

                  Mit meiner elektronischen Signatur beantrage ich, - - - , geboren am - . - . - , - - in der Rolle als - (OID***= ), - - den Zugang zur gesicherten Anwendung. -

                  -

                  -

                  Datum und Uhrzeit: - . - . - , - : - : - -

                  - -

                  HPI(**): -

                  -
                  - -

                  wbPK(*): -

                  -
                  - -
                  -

                  Ich bin weiters ermächtigt als - von - , geboren am - . - . - - - , - - , in deren Auftrag zu handeln. -

                  - -

                  wbPK(*) des Vollmachtgebers: -

                  -
                  -

                  - - - -

                  -


                  - - -

                  -


                  -
                  - -

                  -


                  -
                  - - -
                  (*) wbPK: Das wirtschaftsbereichsspezifische Personenkennzeichen wird aus den - jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum - Wirtschaftsunternehmen.
                  -
                  - -
                  (**) HPI: Der eHealth Professional Identifier wird aus den jeweiligen - Stammzahlen der Gesundheitsdiensteanbieterinnen / Gesundheitsdiensteanbieter berechnet und ermöglicht eine eindeutige Zuordnung der - Gesundheitsdiensteanbieterin / des Gesundheitsdiensteanbieters im Gesundheitsbereich.
                  -
                  - -
                  (***) OID: Object Identifier sind standardisierte Objekt-Bezeichner und - beschreiben eindeutig die Rollen des GDA-Token Inhabers.
                  -
                  - - -
                  -
                  -
                  - -
                  - - 0q9QWyqAyyiVNNLu1rIcU+nKsEE= -
                  - - - WtB0/ptvoB/r/7+fauSUIBULymg= - -
                  - mZt9DuZiDqG81scsf30qjSDdy6vKC2/n034ZZwMUAvfWOXy3+Ubsk5X5CHhz -+lyI - - - MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQG -EwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lz -dGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVh -LXNpZ24tUHJlbWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVt -LVNpZy0wMjAeFw0wNjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJ -BgNVBAYTAkFUMRUwEwYDVQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtu -YWxsMQ8wDQYDVQQqDAZUaG9tYXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTEL -MAkGA1UEDAwCREkwSTATBgcqhkjOPQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ -6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp/NaiOuvrpv2RDVEKQm2tBiajggIP -MIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAnBggrBgEFBQcBAwEB/wQYMBYw -CAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUFBwEBBG8wbTBCBggrBgEF -BQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1QcmVt -aXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRy -dXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4BggrBgEFBQcC -ARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVByZW1p -dW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v -bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEt -VHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2Jq -ZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQI -SNyH29WUoCgwDgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUH -CQExERgPMTk3ODA0MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEF -BQADggEBAFkSCJE0YD4p4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ -ylYn8NQ4mMkD+yCDNtm8m8nr0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6 -uunLH0aFUpAhy+3mDdlH8uhhIQBHwCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkI -egO8OHQDadhgJvW80qspiao2DTac6vVgx4tGvjpdmw1R2pXBYhHD5rkPHlkf -GoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwnW9B8uPWSM5EYPoWJyBOWcKBL -SSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA72/uCFrBzyTk= - - - - - - - - 2008-07-14T15:51:35Z - - - - - inMYWBmAxMHP7mDENjLFaEtv0Zk= - - - CN=a-sign-Premium-Sig-02,OU=a-sign-Premium-Sig-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT - 132292 - - - - - - - - - - application/xhtml+xml - - - - - -
                  -
                  - - - - - urn:oasis:names:tc:SAML:1.0:cm:sender-vouches - - - - K2YMyx3/5kIpNJR+SAD/rbRYH+c= - urn:publicid:gv.at:wbpk+FN+www.act.at - - - Thomas - Knall - - 1978-04-29 - - - - - - - - - - - - - - - - - - - - - sWOqPZzPTn9VvBR5LjuopIWYdh5aGzuX2vMjofhn8bStba1CDW1qkDdlYW4Rs/DfU/I1uqor4Lje -/G3Yzh82yD0MHdzlW8MYUJ8RJe+czbjRUPaSbC/NRqhyF3eKnflxM++sJb2abrUH/9TV0q8P5QRS -uZC/JpAEYpSazysPz/fv8AEnU8oxcTvCiax1jf2GZPmm3qFjPc4qDYNHqfnE8yWYt7kHeqPV/cRw -x3aMGW8mRwQZb7VRFLW5g37nrt9N - AQAB - - - - - - - - - - - - not(ancestor-or-self::pr:Identification) - - - - - b3d/wcQb0Bl0/6GSPsrMxWpdRLA= - - - - eet0q3Thmw6+cbO1fazbEg0556I= - - - -oy55Cq7IyYy7z/TO2a3+m7tjG/ztiKhxhGzVqEYIWIObEOs/GVJDCCI4oe/HS8Fhc4TaXDcZXk4y -qBp4JJ288TeaNjPYkPzp38nWJ4xRatEyo7VaySXy+TqgwiBT5uhxrwkroCr4ZIWwOvt1uR5UBVAf -qk1ii+LPW2WYE3bMpoHfrM9CdFSPzWTRl/0zsEURc64EBPyIdKz+c70DaexeX2E0JVelKcj+jDaJ -mHsFhi/9QoscqPEVA87qv07yhyK5S41+f3HDvpuhYwvQDdOq50sclfsI+g9r473VxiRsOmJ9Ak4/ -k2KP0tgfAQ+h5hRGQUUo5LYPywjg7zPxe8SGGA== - - - - -MIIFZTCCBE2gAwIBAgIDAt4cMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJB -VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp -bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29y -cG9yYXRlLWxpZ2h0LTAzMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0 -LTAzMB4XDTA3MDExOTA5MDY0OFoXDTEyMDExOTA5MDY0OFowgZwxCzAJBgNVBAYT -AkFUMRkwFwYDVQQKDBBCdW5kZXNrYW56bGVyYW10MR4wHAYDVQQLDBVEYXRlbnNj -aHV0emtvbW1pc3Npb24xHTAbBgNVBAMMFERyLiBXYWx0cmF1dCBLb3RzY2h5MRUw -EwYDVQQFEww3MDAyNDc0OTk4MDQxHDAaBgkqhkiG9w0BCQEWDWRza0Bkc2suZ3Yu -YXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfnQUhARo9o1FyCtTK -d5VcXP2WvqSTIsiq19xtWcYF/4pMew/bHLD2DLeO9y5QFpfXJgmx2ySvj1dlzTXV -ESzFAiF/uL1DbNjB3g00LV/AV4yRacCWEqGkSUN/RVUv9a+bFnK2vR4XZu8ORrcf -9rpMg19JHZMWsJIT+BEBM4v0iPhboJ/lqoENZwHZW8W/3XAcOcNYfW95ZrsFH+M9 -6KEFlA9g4AP5CndSnozUeN5i1LJr0s3rz8U/c7O/KTkdTmnAeyLM01ST13jhGmjW -R55wf1Hjt4PCxFf9zpF3FIHDJGyCImgR5ZZe9T6tAjo/ZKo16Huzq0Yy2OYtysDq -WukzAgMBAAGjggGpMIIBpTATBgNVHSMEDDAKgAhBkWkcv63YmDBVBggrBgEFBQcB -AQRJMEcwRQYIKwYBBQUHMAKGOWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9h -LXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAzLmNydDBYBgNVHSAEUTBPME0GByooABEB -BwEwQjBABggrBgEFBQcCARY0aHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3Av -YS1zaWduLWNvcnBvcmF0ZS1saWdodDCBngYDVR0fBIGWMIGTMIGQoIGNoIGKhoGH -bGRhcDovL2xkYXAuYS10cnVzdC5hdC9vdT1hLXNpZ24tY29ycG9yYXRlLWxpZ2h0 -LTAzLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/YmFz -ZT9vYmplY3RjbGFzcz1laWRDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MBEGA1UdDgQK -BAhMCA6eGvS1ujAOBgNVHQ8BAf8EBAMCBLAwCQYDVR0TBAIwADAOBgcqKAAKAQcB -BAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEoIvqPLAg0n2wCS27zTL+hmLi7zSbes -Od4e6pFT1l3cwGfdTkhiHVPnPRaDGLQkS384fAXBrOp6W13X9m2jD9csO6vZhd+T -nERXN1AqayoaecXFyHPykVUTLhn6pMdiSE21mEozfGLUDGMz74lvphEKFAOOCgp1 -o5ZCR09RbGAEbQNNn+ucXJxIa3mYjr1h3AElVbXoeoz12qUpqsNm9znymSkcmcNo -B5Pk6qXXx9UeC/Tj0aTglNkcMOSCFayldzOBaY6+qWKguPdzQUEryhGiNuARQpM5 -KMzvI0rmpc4Gau5HT9rQZHadr++VS8v1k6935uIyyZF9s+gdS5ywnSM= - - - - - - - - - not(ancestor-or-self::dsig:Signature) - - - - JZGwiDzQAtJtnJMeeXyypTrDjwY= - - - - - -
                  -
                  -
                  - - - - - K2YMyx3/5kIpNJR+SAD/rbRYH+c= - urn:publicid:gv.at:wbpk+FN+www.act.at - - - Thomas - Knall - - 1978-04-29 - - - - - true - - - https://127.0.0.1:3496/https-security-layer-request - - - MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQGEwJB -VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp -bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVhLXNpZ24tUHJl -bWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVtLVNpZy0wMjAeFw0w -NjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJBgNVBAYTAkFUMRUwEwYD -VQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtuYWxsMQ8wDQYDVQQqDAZUaG9t -YXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTELMAkGA1UEDAwCREkwSTATBgcqhkjO -PQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp -/NaiOuvrpv2RDVEKQm2tBiajggIPMIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAn -BggrBgEFBQcBAwEB/wQYMBYwCAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUF -BwEBBG8wbTBCBggrBgEFBQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRz -L2Etc2lnbi1QcmVtaXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8v -b2NzcC5hLXRydXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4Bggr -BgEFBQcCARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVBy -ZW1pdW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v -bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEtVHJ1 -c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xh -c3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQISNyH29WUoCgw -DgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMTk3ODA0 -MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAFkSCJE0YD4p -4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ylYn8NQ4mMkD+yCDNtm8m8nr -0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6uunLH0aFUpAhy+3mDdlH8uhhIQBH -wCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkIegO8OHQDadhgJvW80qspiao2DTac6vVg -x4tGvjpdmw1R2pXBYhHD5rkPHlkfGoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwn -W9B8uPWSM5EYPoWJyBOWcKBLSSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA7 -2/uCFrBzyTk= - - - - - Prokura - MeineTestFirma - http://localhost:58080/omsp/OMSPRequest - - - - K2YMyx3/5kIpNJR+SAD/rbRYH+c= - urn:publicid:gv.at:wbpk+FN+www.act.at - - - Thomas - Knall - - 1978-04-29 - - - - - - 123456i - urn:publicid:gv.at:baseid+XFN - - MeineTestFirma - - - - Wien - 2008-07-14 - - - false - - - Der/Die Bevollmächtigte wird zum Prokuristen/Prokuristin bestellt. - - - - - - - - - not(ancestor-or-self::pr:Identification or ancestor-or-self::dsig:Signature) - - - - - - PRRF0sWBgoywztCKWEXafZfhpd0= - - - - NorNorUqPFMA06JfxSJopOq7Qv0= - - - IQMZFc57XZd9LjeiaZqSfzZtWuXhuikAqbKA7pWuDK02DLFSYZPXsGjcvnwNdVaP - - - MIICtjCCAm6gAwIBAgIBATAJBgcqhkjOPQQBMGoxCzAJBgNVBAYTAkFUMQ0wCwYD -VQQHEwRXaWVuMRkwFwYDVQQJExBFc3NsaW5nZ2Fzc2UgNS85MQwwCgYDVQQKEwNB -Q1QxIzAhBgNVBAMTGlZvbGxtYWNodGVuIFNpZ25hdHVyZGllbnN0MB4XDTA4MDcw -ODE1MTk1MFoXDTEyMTIzMTIxNTk1OVowajELMAkGA1UEBhMCQVQxDTALBgNVBAcT -BFdpZW4xGTAXBgNVBAkTEEVzc2xpbmdnYXNzZSA1LzkxDDAKBgNVBAoTA0FDVDEj -MCEGA1UEAxMaVm9sbG1hY2h0ZW4gU2lnbmF0dXJkaWVuc3QwgfMwgbwGByqGSM49 -AgEwgbACAQEwJAYHKoZIzj0BAQIZAP////////////////////7//////////zA0 -BBj////////////////////+//////////wEGGQhBRnlnIDnD6fpq3IkMEn+uN7s -wUa5sQQxBBiNqA6wMJD2fL8g60OhiAD0/wr9gv8QEgcZK5X/yNp4YxAR7WskzdVz -+XehHnlIEQIZAP///////////////5ne+DYUa8mxtNIoMQIBAQMyAAS908G9FD5/ -LLYruwFbp9giXahdQ1FAqKwzohSn9pgsVTQBnvXxU8IWIzhPHs49DZCjazBpMAwG -A1UdEwEB/wQCMAAwHQYDVR0OBBYEFLOSgnkLSJ3l4Ah49rHX/FAV1wWcMBkGA1Ud -IAQSMBAwDgYMKwYBBAGVEgECBAEBMB8GA1UdIwQYMBaAFLOSgnkLSJ3l4Ah49rHX -/FAV1wWcMAkGByqGSM49BAEDNwAwNAIYTTppZzS6wqoLDFcf9frHzf1kMheY04dT -Ahg4Nrb54vE3DTRf9sbO4xs4dTARHSt1ihA= - - - - - - - - not(ancestor-or-self::dsig:Signature) - - - - - - oz6ThHPL3V7RNibfPrDSWVhUgi8= - - - - - - - -
                  -
                  diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SelectBKUTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SelectBKUTask.java new file mode 100644 index 000000000..54195ec91 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SelectBKUTask.java @@ -0,0 +1,33 @@ +package at.gv.egovernment.moa.id.process.spring.test.task; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * A dummy task simulating a bku selection. + *

                  + * Asynchonous + *

                  + * Enriches context data with: + *

                    + *
                  • {@code bkuURL}
                  • + *
                  + *

                  + * + * @author tknall + * + */ +public class SelectBKUTask implements Task { + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(ExecutionContext executionContext) { + log.debug("Providing BKU selection."); + executionContext.put("bkuURL", "https://127.0.0.1:3496/https-security-layer-request"); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignAuthBlockTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignAuthBlockTask.java new file mode 100644 index 000000000..8099c0f98 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignAuthBlockTask.java @@ -0,0 +1,52 @@ +package at.gv.egovernment.moa.id.process.spring.test.task; + +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.Objects; + +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * A dummy task simulating the signature of an auth block. + *

                  + * Asynchonous + *

                  + * Requires context data: + *

                    + *
                  • {@code IdentityLink}
                  • + *
                  • {@code isIdentityLinkValidated}
                  • + *
                  • {@code bkuURL}
                  • + *
                  + *

                  + *

                  + * Enriches context data with: + *

                    + *
                  • {@code SignedAuthBlock}
                  • + *
                  + *

                  + * + * @author tknall + * + */ +public class SignAuthBlockTask implements Task { + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(ExecutionContext executionContext) throws Exception { + Objects.requireNonNull(executionContext.get("IdentityLink")); + assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated")))); + Objects.requireNonNull(executionContext.get("bkuURL")); + + log.debug("Using validated IdentityLink and bkuURL in order to sign auth block."); + try (InputStream in = getClass().getResourceAsStream("SignedAuthBlock.xml")) { + executionContext.put("SignedAuthBlock", IOUtils.toString(in, Charset.forName("UTF-8"))); + } + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml deleted file mode 100644 index 450ba90f3..000000000 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - Signatur der Anmeldedaten - - - -

                  Signatur der Anmeldedaten

                  -

                  -

                  Mit meiner elektronischen Signatur beantrage ich, - - - , geboren am -. -. -, - -in der Rolle als -(OID***= ), - -den Zugang zur gesicherten Anwendung. -

                  -

                  -

                  Datum und Uhrzeit: -. -. -, -: -: - -

                  - -

                  HPI(**): -

                  -
                  - -

                  wbPK(*): -

                  -
                  - -
                  -

                  Ich bin weiters ermächtigt als -von - , geboren am - . - . - - - , - - , in deren Auftrag zu handeln. -

                  - -

                  wbPK(*) des Vollmachtgebers: -

                  -
                  -

                  - - - -

                  -


                  - - -

                  -


                  -
                  - -

                  -


                  -
                  - - -
                  (*) wbPK: Das wirtschaftsbereichsspezifische Personenkennzeichen wird aus den -jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum -Wirtschaftsunternehmen.
                  -
                  - -
                  (**) HPI: Der eHealth Professional Identifier wird aus den jeweiligen -Stammzahlen der Gesundheitsdiensteanbieterinnen / Gesundheitsdiensteanbieter berechnet und ermöglicht eine eindeutige Zuordnung der -Gesundheitsdiensteanbieterin / des Gesundheitsdiensteanbieters im Gesundheitsbereich.
                  -
                  - -
                  (***) OID: Object Identifier sind standardisierte Objekt-Bezeichner und -beschreiben eindeutig die Rollen des GDA-Token Inhabers.
                  -
                  - - -
                  -
                  -
                  - -
                  - - 0q9QWyqAyyiVNNLu1rIcU+nKsEE= -
                  - - - WtB0/ptvoB/r/7+fauSUIBULymg= - -
                  - mZt9DuZiDqG81scsf30qjSDdy6vKC2/n034ZZwMUAvfWOXy3+Ubsk5X5CHhz -+lyI - - - MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQG -EwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lz -dGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVh -LXNpZ24tUHJlbWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVt -LVNpZy0wMjAeFw0wNjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJ -BgNVBAYTAkFUMRUwEwYDVQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtu -YWxsMQ8wDQYDVQQqDAZUaG9tYXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTEL -MAkGA1UEDAwCREkwSTATBgcqhkjOPQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ -6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp/NaiOuvrpv2RDVEKQm2tBiajggIP -MIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAnBggrBgEFBQcBAwEB/wQYMBYw -CAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUFBwEBBG8wbTBCBggrBgEF -BQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1QcmVt -aXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRy -dXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4BggrBgEFBQcC -ARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVByZW1p -dW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v -bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEt -VHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2Jq -ZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQI -SNyH29WUoCgwDgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUH -CQExERgPMTk3ODA0MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEF -BQADggEBAFkSCJE0YD4p4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ -ylYn8NQ4mMkD+yCDNtm8m8nr0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6 -uunLH0aFUpAhy+3mDdlH8uhhIQBHwCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkI -egO8OHQDadhgJvW80qspiao2DTac6vVgx4tGvjpdmw1R2pXBYhHD5rkPHlkf -GoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwnW9B8uPWSM5EYPoWJyBOWcKBL -SSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA72/uCFrBzyTk= - - - - - - - - 2008-07-14T15:51:35Z - - - - - inMYWBmAxMHP7mDENjLFaEtv0Zk= - - - CN=a-sign-Premium-Sig-02,OU=a-sign-Premium-Sig-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT - 132292 - - - - - - - - - - application/xhtml+xml - - - - - -
                  \ No newline at end of file diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateIdentityLinkTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateIdentityLinkTask.java new file mode 100644 index 000000000..a8e7df3d7 --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateIdentityLinkTask.java @@ -0,0 +1,42 @@ +package at.gv.egovernment.moa.id.process.spring.test.task; + +import java.util.Objects; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * Dummy task simulating the validation of an IdentityLink. + *

                  + * Requires context data: + *

                    + *
                  • {@code IdentityLink}
                  • + *
                  + *

                  + *

                  + * Enriches context data with: + *

                    + *
                  • {@code isIdentityLinkValidated}
                  • + *
                  + *

                  + * + * @author tknall + * + */ +public class ValidateIdentityLinkTask implements Task { + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(ExecutionContext executionContext) { + Objects.requireNonNull(executionContext.get("IdentityLink")); + + log.debug("Validating IdentityLink."); + + executionContext.put("isIdentityLinkValidated", true); + } + +} diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateSignedAuthBlockTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateSignedAuthBlockTask.java new file mode 100644 index 000000000..07b2ea69c --- /dev/null +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/task/ValidateSignedAuthBlockTask.java @@ -0,0 +1,46 @@ +package at.gv.egovernment.moa.id.process.spring.test.task; + +import java.util.Objects; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * A dummy task simulating the validation of an auth block. + *

                  + * Requires context data: + *

                    + *
                  • {@code IdentityLink}
                  • + *
                  • {@code isIdentityLinkValidated}
                  • + *
                  • {@code SignedAuthBlock}
                  • + *
                  + *

                  + *

                  + * Enriches context data with: + *

                    + *
                  • {@code isSignedAuthBlockValidated}
                  • + *
                  + *

                  + * + * @author tknall + * + */ +public class ValidateSignedAuthBlockTask implements Task { + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(ExecutionContext executionContext) throws Exception { + Objects.requireNonNull(executionContext.get("IdentityLink")); + assert (Boolean.TRUE.equals(Objects.requireNonNull(executionContext.get("isIdentityLinkValidated")))); + Objects.requireNonNull(executionContext.get("SignedAuthBlock")); + + log.debug("Using validated IdentityLink and signed auth block in order to validate signed auth block."); + + executionContext.put("isSignedAuthBlockValidated", true); + } + +} diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml new file mode 100644 index 000000000..8a32ca46d --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml new file mode 100644 index 000000000..754b7a34d --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml new file mode 100644 index 000000000..e698f8019 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml new file mode 100644 index 000000000..564bf9040 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml new file mode 100644 index 000000000..b3d2d2ebc --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml new file mode 100644 index 000000000..ab033fb8f --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml new file mode 100644 index 000000000..ca2617ce8 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml new file mode 100644 index 000000000..6525fb0cd --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml new file mode 100644 index 000000000..ef71026ec --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml new file mode 100644 index 000000000..eb62d1ae2 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml new file mode 100644 index 000000000..dadc6bf81 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml new file mode 100644 index 000000000..c68972f13 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/IdentityLink_Max_Mustermann.xml @@ -0,0 +1,52 @@ + + + + + urn:oasis:names:tc:SAML:1.0:cm:sender-vouches + + tqCQEC7+AqGEeeL390V5Jg==urn:publicid:gv.at:baseidMaxMustermann1940-01-01 + + + + + + + + + + + + not(ancestor-or-self::pr:Identification) + + + + + Rmr5vkWXL/PvpoXnbK632QmzYms= + + + + HoPZWYll8aMFpKOlRSwckt5iCQk= + + + + NPpRwVo5/5kf5iHUyaEc7d7So3W4oPgOCYNgnKpgdZfttFkFFN+9oG60w7YvKEYSeTPhP3zp7eaH +ZFapj+naD+wd0y5ELWep9Y+s+qP7fNLrFECHQxQasLWtR4akxlWDpYQ0bvOuepK2ip1EQ6pRlccA +wJ1l4iOWFhfdA9YAg5QLkBqWSwgrNUswhLnDBM+Ot6Gj5g2rpYY7aoAOXvTR8B5Dkg94ASb4u0wv +VPV8+4mjOfP+l6QWLqywzcq3qj/qFZkbujjZbV/fNPDnDD1ff/M6ZfCGO8xzlYfjfEA7cmHuiJf2 +/ey/3nT7vI5XbpBPWChT5Sl4DQysxlfE6e4MZw== + MIIF3TCCBMWgAwIBAgIDByniMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMB4XDTEwMDcyODExMzY0M1oXDTE1MDcyODExMzY0M1owgbYxCzAJBgNVBAYTAkFUMR4wHAYDVQQKDBVEYXRlbnNjaHV0emtvbW1pc3Npb24xIjAgBgNVBAsMGVN0YW1temFobHJlZ2lzdGVyYmVob2VyZGUxLjAsBgNVBAMMJVNpZ25hdHVyc2VydmljZSBEYXRlbnNjaHV0emtvbW1pc3Npb24xFTATBgNVBAUTDDMyNTkyODMyMzk5ODEcMBoGCSqGSIb3DQEJARYNZHNrQGRzay5ndi5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+dBSEBGj2jUXIK1Mp3lVxc/Za+pJMiyKrX3G1ZxgX/ikx7D9scsPYMt473LlAWl9cmCbHbJK+PV2XNNdURLMUCIX+4vUNs2MHeDTQtX8BXjJFpwJYSoaRJQ39FVS/1r5sWcra9Hhdm7w5Gtx/2ukyDX0kdkxawkhP4EQEzi/SI+Fugn+WqgQ1nAdlbxb/dcBw5w1h9b3lmuwUf4z3ooQWUD2DgA/kKd1KejNR43mLUsmvSzevPxT9zs78pOR1OacB7IszTVJPXeOEaaNZHnnB/UeO3g8LEV/3OkXcUgcMkbIIiaBHlll71Pq0COj9kqjXoe7OrRjLY5i3KwOpa6TMCAwEAAaOCAgcwggIDMBMGA1UdIwQMMAqACEkcWDpP6A0DMH8GCCsGAQUFBwEBBHMwcTAnBggrBgEFBQcwAYYbaHR0cDovL29jc3AuYS10cnVzdC5hdC9vY3NwMEYGCCsGAQUFBzAChjpodHRwOi8vd3d3LmEtdHJ1c3QuYXQvY2VydHMvYS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMmEuY3J0MFQGA1UdIARNMEswSQYGKigAEQESMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2NwL2Etc2lnbi1BbXRzc2lnbmF0dXIwgZ4GA1UdHwSBljCBkzCBkKCBjaCBioaBh2xkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMixvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQITAgOnhr0tbowDgYDVR0PAQH/BAQDAgSwMCAGA1UdEQQZMBeBFW1hcmN1cy5oaWxkQGRzay5ndi5hdDAJBgNVHRMEAjAAMA4GByooAAoBBwEEAwEB/zAUBgcqKAAKAQEBBAkMB0JTQi1EU0swDQYJKoZIhvcNAQEFBQADggEBAHTklnvPCH/bJSOlIPbLUEkSGuFHsektSZ8Vr22x/Yv7EzsxoQrJIiz2mQ2gQqFuExdWYxvsowjiSbiis9iUf1c0zscvDS3mIZxGs4M89XHsjHnIyb+Fuwnamw65QrFvM1tNB1ZMjxJ3x+YmHLHdtT3BEBcr3/NCRHd2S0HoBspNz9HVgJaZY1llR7poKBvnAc4g1i+QTvyVb00PtKxR9Lw/9ABInX/1pzpxqrPy7Ib2OP8z6dd3WHmIsCiSHUaj0Dxwwln6fYJjhxZ141SnbovlCLYtrsZLXoi9ljIqX4xO0PwMI2RfNc9cXxTRrRS6rEOvX7PpvgXiDXhp592Yyp4= + + + + + + not(ancestor-or-self::dsig:Signature) + + + + 7IkIdYti2dh3VZQ4Fp+9lPT67cM= + + + + + \ No newline at end of file diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml new file mode 100644 index 000000000..3aeedd590 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SAML1Assertion.xml @@ -0,0 +1,487 @@ + + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + + http://reference.e-government.gv.at/namespace/moa/20020822#cm + + + + + https://localhost:18443/moa-id-auth/ + + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + + + https://localhost:48443/mandates/ + + + 1978-04-29 + + + Vollmachtsvertreter + + + MeineTestFirma + + + 123456i + + + + + + + + + + + + + + + Signatur der Anmeldedaten + + + +

                  Signatur der Anmeldedaten

                  +

                  +

                  Mit meiner elektronischen Signatur beantrage ich, + + + , geboren am + . + . + , + + in der Rolle als + (OID***= ), + + den Zugang zur gesicherten Anwendung. +

                  +

                  +

                  Datum und Uhrzeit: + . + . + , + : + : + +

                  + +

                  HPI(**): +

                  +
                  + +

                  wbPK(*): +

                  +
                  + +
                  +

                  Ich bin weiters ermächtigt als + von + , geboren am + . + . + + + , + + , in deren Auftrag zu handeln. +

                  + +

                  wbPK(*) des Vollmachtgebers: +

                  +
                  +

                  + + + +

                  +


                  + + +

                  +


                  +
                  + +

                  +


                  +
                  + + +
                  (*) wbPK: Das wirtschaftsbereichsspezifische Personenkennzeichen wird aus den + jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum + Wirtschaftsunternehmen.
                  +
                  + +
                  (**) HPI: Der eHealth Professional Identifier wird aus den jeweiligen + Stammzahlen der Gesundheitsdiensteanbieterinnen / Gesundheitsdiensteanbieter berechnet und ermöglicht eine eindeutige Zuordnung der + Gesundheitsdiensteanbieterin / des Gesundheitsdiensteanbieters im Gesundheitsbereich.
                  +
                  + +
                  (***) OID: Object Identifier sind standardisierte Objekt-Bezeichner und + beschreiben eindeutig die Rollen des GDA-Token Inhabers.
                  +
                  + + +
                  +
                  +
                  + +
                  + + 0q9QWyqAyyiVNNLu1rIcU+nKsEE= +
                  + + + WtB0/ptvoB/r/7+fauSUIBULymg= + +
                  + mZt9DuZiDqG81scsf30qjSDdy6vKC2/n034ZZwMUAvfWOXy3+Ubsk5X5CHhz ++lyI + + + MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQG +EwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lz +dGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVh +LXNpZ24tUHJlbWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVt +LVNpZy0wMjAeFw0wNjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJ +BgNVBAYTAkFUMRUwEwYDVQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtu +YWxsMQ8wDQYDVQQqDAZUaG9tYXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTEL +MAkGA1UEDAwCREkwSTATBgcqhkjOPQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ +6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp/NaiOuvrpv2RDVEKQm2tBiajggIP +MIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAnBggrBgEFBQcBAwEB/wQYMBYw +CAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUFBwEBBG8wbTBCBggrBgEF +BQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1QcmVt +aXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRy +dXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4BggrBgEFBQcC +ARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVByZW1p +dW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v +bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEt +VHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2Jq +ZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQI +SNyH29WUoCgwDgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUH +CQExERgPMTk3ODA0MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEF +BQADggEBAFkSCJE0YD4p4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ +ylYn8NQ4mMkD+yCDNtm8m8nr0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6 +uunLH0aFUpAhy+3mDdlH8uhhIQBHwCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkI +egO8OHQDadhgJvW80qspiao2DTac6vVgx4tGvjpdmw1R2pXBYhHD5rkPHlkf +GoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwnW9B8uPWSM5EYPoWJyBOWcKBL +SSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA72/uCFrBzyTk= + + + + + + + + 2008-07-14T15:51:35Z + + + + + inMYWBmAxMHP7mDENjLFaEtv0Zk= + + + CN=a-sign-Premium-Sig-02,OU=a-sign-Premium-Sig-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT + 132292 + + + + + + + + + + application/xhtml+xml + + + + + +
                  +
                  + + + + + urn:oasis:names:tc:SAML:1.0:cm:sender-vouches + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + Thomas + Knall + + 1978-04-29 + + + + + + + + + + + + + + + + + + + + + sWOqPZzPTn9VvBR5LjuopIWYdh5aGzuX2vMjofhn8bStba1CDW1qkDdlYW4Rs/DfU/I1uqor4Lje +/G3Yzh82yD0MHdzlW8MYUJ8RJe+czbjRUPaSbC/NRqhyF3eKnflxM++sJb2abrUH/9TV0q8P5QRS +uZC/JpAEYpSazysPz/fv8AEnU8oxcTvCiax1jf2GZPmm3qFjPc4qDYNHqfnE8yWYt7kHeqPV/cRw +x3aMGW8mRwQZb7VRFLW5g37nrt9N + AQAB + + + + + + + + + + + + not(ancestor-or-self::pr:Identification) + + + + + b3d/wcQb0Bl0/6GSPsrMxWpdRLA= + + + + eet0q3Thmw6+cbO1fazbEg0556I= + + + +oy55Cq7IyYy7z/TO2a3+m7tjG/ztiKhxhGzVqEYIWIObEOs/GVJDCCI4oe/HS8Fhc4TaXDcZXk4y +qBp4JJ288TeaNjPYkPzp38nWJ4xRatEyo7VaySXy+TqgwiBT5uhxrwkroCr4ZIWwOvt1uR5UBVAf +qk1ii+LPW2WYE3bMpoHfrM9CdFSPzWTRl/0zsEURc64EBPyIdKz+c70DaexeX2E0JVelKcj+jDaJ +mHsFhi/9QoscqPEVA87qv07yhyK5S41+f3HDvpuhYwvQDdOq50sclfsI+g9r473VxiRsOmJ9Ak4/ +k2KP0tgfAQ+h5hRGQUUo5LYPywjg7zPxe8SGGA== + + + + +MIIFZTCCBE2gAwIBAgIDAt4cMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29y +cG9yYXRlLWxpZ2h0LTAzMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0 +LTAzMB4XDTA3MDExOTA5MDY0OFoXDTEyMDExOTA5MDY0OFowgZwxCzAJBgNVBAYT +AkFUMRkwFwYDVQQKDBBCdW5kZXNrYW56bGVyYW10MR4wHAYDVQQLDBVEYXRlbnNj +aHV0emtvbW1pc3Npb24xHTAbBgNVBAMMFERyLiBXYWx0cmF1dCBLb3RzY2h5MRUw +EwYDVQQFEww3MDAyNDc0OTk4MDQxHDAaBgkqhkiG9w0BCQEWDWRza0Bkc2suZ3Yu +YXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfnQUhARo9o1FyCtTK +d5VcXP2WvqSTIsiq19xtWcYF/4pMew/bHLD2DLeO9y5QFpfXJgmx2ySvj1dlzTXV +ESzFAiF/uL1DbNjB3g00LV/AV4yRacCWEqGkSUN/RVUv9a+bFnK2vR4XZu8ORrcf +9rpMg19JHZMWsJIT+BEBM4v0iPhboJ/lqoENZwHZW8W/3XAcOcNYfW95ZrsFH+M9 +6KEFlA9g4AP5CndSnozUeN5i1LJr0s3rz8U/c7O/KTkdTmnAeyLM01ST13jhGmjW +R55wf1Hjt4PCxFf9zpF3FIHDJGyCImgR5ZZe9T6tAjo/ZKo16Huzq0Yy2OYtysDq +WukzAgMBAAGjggGpMIIBpTATBgNVHSMEDDAKgAhBkWkcv63YmDBVBggrBgEFBQcB +AQRJMEcwRQYIKwYBBQUHMAKGOWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9h +LXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAzLmNydDBYBgNVHSAEUTBPME0GByooABEB +BwEwQjBABggrBgEFBQcCARY0aHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3Av +YS1zaWduLWNvcnBvcmF0ZS1saWdodDCBngYDVR0fBIGWMIGTMIGQoIGNoIGKhoGH +bGRhcDovL2xkYXAuYS10cnVzdC5hdC9vdT1hLXNpZ24tY29ycG9yYXRlLWxpZ2h0 +LTAzLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/YmFz +ZT9vYmplY3RjbGFzcz1laWRDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MBEGA1UdDgQK +BAhMCA6eGvS1ujAOBgNVHQ8BAf8EBAMCBLAwCQYDVR0TBAIwADAOBgcqKAAKAQcB +BAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEoIvqPLAg0n2wCS27zTL+hmLi7zSbes +Od4e6pFT1l3cwGfdTkhiHVPnPRaDGLQkS384fAXBrOp6W13X9m2jD9csO6vZhd+T +nERXN1AqayoaecXFyHPykVUTLhn6pMdiSE21mEozfGLUDGMz74lvphEKFAOOCgp1 +o5ZCR09RbGAEbQNNn+ucXJxIa3mYjr1h3AElVbXoeoz12qUpqsNm9znymSkcmcNo +B5Pk6qXXx9UeC/Tj0aTglNkcMOSCFayldzOBaY6+qWKguPdzQUEryhGiNuARQpM5 +KMzvI0rmpc4Gau5HT9rQZHadr++VS8v1k6935uIyyZF9s+gdS5ywnSM= + + + + + + + + + not(ancestor-or-self::dsig:Signature) + + + + JZGwiDzQAtJtnJMeeXyypTrDjwY= + + + + + +
                  +
                  +
                  + + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + Thomas + Knall + + 1978-04-29 + + + + + true + + + https://127.0.0.1:3496/https-security-layer-request + + + MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQGEwJB +VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp +bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVhLXNpZ24tUHJl +bWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVtLVNpZy0wMjAeFw0w +NjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJBgNVBAYTAkFUMRUwEwYD +VQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtuYWxsMQ8wDQYDVQQqDAZUaG9t +YXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTELMAkGA1UEDAwCREkwSTATBgcqhkjO +PQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp +/NaiOuvrpv2RDVEKQm2tBiajggIPMIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAn +BggrBgEFBQcBAwEB/wQYMBYwCAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUF +BwEBBG8wbTBCBggrBgEFBQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRz +L2Etc2lnbi1QcmVtaXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8v +b2NzcC5hLXRydXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4Bggr +BgEFBQcCARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVBy +ZW1pdW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v +bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEtVHJ1 +c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xh +c3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQISNyH29WUoCgw +DgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUHCQExERgPMTk3ODA0 +MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAFkSCJE0YD4p +4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ylYn8NQ4mMkD+yCDNtm8m8nr +0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6uunLH0aFUpAhy+3mDdlH8uhhIQBH +wCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkIegO8OHQDadhgJvW80qspiao2DTac6vVg +x4tGvjpdmw1R2pXBYhHD5rkPHlkfGoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwn +W9B8uPWSM5EYPoWJyBOWcKBLSSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA7 +2/uCFrBzyTk= + + + + + Prokura - MeineTestFirma + http://localhost:58080/omsp/OMSPRequest + + + + K2YMyx3/5kIpNJR+SAD/rbRYH+c= + urn:publicid:gv.at:wbpk+FN+www.act.at + + + Thomas + Knall + + 1978-04-29 + + + + + + 123456i + urn:publicid:gv.at:baseid+XFN + + MeineTestFirma + + + + Wien + 2008-07-14 + + + false + + + Der/Die Bevollmächtigte wird zum Prokuristen/Prokuristin bestellt. + + + + + + + + + not(ancestor-or-self::pr:Identification or ancestor-or-self::dsig:Signature) + + + + + + PRRF0sWBgoywztCKWEXafZfhpd0= + + + + NorNorUqPFMA06JfxSJopOq7Qv0= + + + IQMZFc57XZd9LjeiaZqSfzZtWuXhuikAqbKA7pWuDK02DLFSYZPXsGjcvnwNdVaP + + + MIICtjCCAm6gAwIBAgIBATAJBgcqhkjOPQQBMGoxCzAJBgNVBAYTAkFUMQ0wCwYD +VQQHEwRXaWVuMRkwFwYDVQQJExBFc3NsaW5nZ2Fzc2UgNS85MQwwCgYDVQQKEwNB +Q1QxIzAhBgNVBAMTGlZvbGxtYWNodGVuIFNpZ25hdHVyZGllbnN0MB4XDTA4MDcw +ODE1MTk1MFoXDTEyMTIzMTIxNTk1OVowajELMAkGA1UEBhMCQVQxDTALBgNVBAcT +BFdpZW4xGTAXBgNVBAkTEEVzc2xpbmdnYXNzZSA1LzkxDDAKBgNVBAoTA0FDVDEj +MCEGA1UEAxMaVm9sbG1hY2h0ZW4gU2lnbmF0dXJkaWVuc3QwgfMwgbwGByqGSM49 +AgEwgbACAQEwJAYHKoZIzj0BAQIZAP////////////////////7//////////zA0 +BBj////////////////////+//////////wEGGQhBRnlnIDnD6fpq3IkMEn+uN7s +wUa5sQQxBBiNqA6wMJD2fL8g60OhiAD0/wr9gv8QEgcZK5X/yNp4YxAR7WskzdVz ++XehHnlIEQIZAP///////////////5ne+DYUa8mxtNIoMQIBAQMyAAS908G9FD5/ +LLYruwFbp9giXahdQ1FAqKwzohSn9pgsVTQBnvXxU8IWIzhPHs49DZCjazBpMAwG +A1UdEwEB/wQCMAAwHQYDVR0OBBYEFLOSgnkLSJ3l4Ah49rHX/FAV1wWcMBkGA1Ud +IAQSMBAwDgYMKwYBBAGVEgECBAEBMB8GA1UdIwQYMBaAFLOSgnkLSJ3l4Ah49rHX +/FAV1wWcMAkGByqGSM49BAEDNwAwNAIYTTppZzS6wqoLDFcf9frHzf1kMheY04dT +Ahg4Nrb54vE3DTRf9sbO4xs4dTARHSt1ihA= + + + + + + + + not(ancestor-or-self::dsig:Signature) + + + + + + oz6ThHPL3V7RNibfPrDSWVhUgi8= + + + + + + + +
                  +
                  diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml new file mode 100644 index 000000000..450ba90f3 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/task/SignedAuthBlock.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + Signatur der Anmeldedaten + + + +

                  Signatur der Anmeldedaten

                  +

                  +

                  Mit meiner elektronischen Signatur beantrage ich, + + + , geboren am +. +. +, + +in der Rolle als +(OID***= ), + +den Zugang zur gesicherten Anwendung. +

                  +

                  +

                  Datum und Uhrzeit: +. +. +, +: +: + +

                  + +

                  HPI(**): +

                  +
                  + +

                  wbPK(*): +

                  +
                  + +
                  +

                  Ich bin weiters ermächtigt als +von + , geboren am + . + . + + + , + + , in deren Auftrag zu handeln. +

                  + +

                  wbPK(*) des Vollmachtgebers: +

                  +
                  +

                  + + + +

                  +


                  + + +

                  +


                  +
                  + +

                  +


                  +
                  + + +
                  (*) wbPK: Das wirtschaftsbereichsspezifische Personenkennzeichen wird aus den +jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum +Wirtschaftsunternehmen.
                  +
                  + +
                  (**) HPI: Der eHealth Professional Identifier wird aus den jeweiligen +Stammzahlen der Gesundheitsdiensteanbieterinnen / Gesundheitsdiensteanbieter berechnet und ermöglicht eine eindeutige Zuordnung der +Gesundheitsdiensteanbieterin / des Gesundheitsdiensteanbieters im Gesundheitsbereich.
                  +
                  + +
                  (***) OID: Object Identifier sind standardisierte Objekt-Bezeichner und +beschreiben eindeutig die Rollen des GDA-Token Inhabers.
                  +
                  + + +
                  +
                  +
                  + +
                  + + 0q9QWyqAyyiVNNLu1rIcU+nKsEE= +
                  + + + WtB0/ptvoB/r/7+fauSUIBULymg= + +
                  + mZt9DuZiDqG81scsf30qjSDdy6vKC2/n034ZZwMUAvfWOXy3+Ubsk5X5CHhz ++lyI + + + MIIEtDCCA5ygAwIBAgIDAgTEMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYDVQQG +EwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lz +dGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMR4wHAYDVQQLDBVh +LXNpZ24tUHJlbWl1bS1TaWctMDIxHjAcBgNVBAMMFWEtc2lnbi1QcmVtaXVt +LVNpZy0wMjAeFw0wNjA0MDQwOTUyMjhaFw0xMTA0MDQwOTUyMjhaMGkxCzAJ +BgNVBAYTAkFUMRUwEwYDVQQDDAxUaG9tYXMgS25hbGwxDjAMBgNVBAQMBUtu +YWxsMQ8wDQYDVQQqDAZUaG9tYXMxFTATBgNVBAUTDDUzNTE5ODkyMzM0OTEL +MAkGA1UEDAwCREkwSTATBgcqhkjOPQIBBggqhkjOPQMBAQMyAARrnYW5sXCQ +6M3irWaanDPi/ROXueKWiPRyZGjNH0Cp/NaiOuvrpv2RDVEKQm2tBiajggIP +MIICCzATBgNVHSMEDDAKgAhN3+H/S9nJ3zAnBggrBgEFBQcBAwEB/wQYMBYw +CAYGBACORgEBMAoGCCsGAQUFBwsBMHsGCCsGAQUFBwEBBG8wbTBCBggrBgEF +BQcwAoY2aHR0cDovL3d3dy5hLXRydXN0LmF0L2NlcnRzL2Etc2lnbi1QcmVt +aXVtLVNpZy0wMmEuY3J0MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5hLXRy +dXN0LmF0L29jc3AwWQYDVR0gBFIwUDBEBgYqKAARAQswOjA4BggrBgEFBQcC +ARYsaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvY3AvYS1zaWduLVByZW1p +dW0wCAYGBACLMAEBMIGaBgNVHR8EgZIwgY8wgYyggYmggYaGgYNsZGFwOi8v +bGRhcC5hLXRydXN0LmF0L291PWEtc2lnbi1QcmVtaXVtLVNpZy0wMixvPUEt +VHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2Jq +ZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQI +SNyH29WUoCgwDgYDVR0PAQH/BAQDAgbAMCgGA1UdCQQhMB8wHQYIKwYBBQUH +CQExERgPMTk3ODA0MjkwMDAwMDBaMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEF +BQADggEBAFkSCJE0YD4p4izU3ekQYPv4Z7gm/VFlpma5hXNvwkajVjHlAqo/ +ylYn8NQ4mMkD+yCDNtm8m8nr0K/yICb8Gnkbv59i6nh2AbzYBBb49VnYYGL6 +uunLH0aFUpAhy+3mDdlH8uhhIQBHwCfgwG1qa5zXY7bz4Vzkac/h6T+JVFkI +egO8OHQDadhgJvW80qspiao2DTac6vVgx4tGvjpdmw1R2pXBYhHD5rkPHlkf +GoeL3ak6hq4ea94Oy5VfNTIJv5MA0J2G1mwnW9B8uPWSM5EYPoWJyBOWcKBL +SSUqOt9D/9215ZGfbchkdRZjx0dTAD3FIhgG8nA72/uCFrBzyTk= + + + + + + + + 2008-07-14T15:51:35Z + + + + + inMYWBmAxMHP7mDENjLFaEtv0Zk= + + + CN=a-sign-Premium-Sig-02,OU=a-sign-Premium-Sig-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT + 132292 + + + + + + + + + + application/xhtml+xml + + + + + +
                  \ No newline at end of file diff --git a/id/server/pom.xml b/id/server/pom.xml index f574a0cf2..14cb227e7 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -13,6 +13,14 @@ pom MOA ID Server + + 4.11 + 2.4 + 3.3.2 + 4.0 + ${basedir}/../../repository + + idserverlib proxy @@ -22,9 +30,75 @@ stork2-commons - - ${basedir}/../../repository - + + + + + + junit + junit + ${junit.version} + test + + + + + org.apache.commons + commons-lang3 + ${org.apache.commons.lang3.version} + + + + org.apache.commons + commons-collections4 + ${org.apache.commons.collections4.version} + + + + commons-io + commons-io + ${org.apache.commons.io.version} + + + + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + + org.springframework + spring-expression + ${org.springframework.version} + + + + org.springframework + spring-context + ${org.springframework.version} + + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + + org.springframework + spring-test + ${org.springframework.version} + test + + + -- cgit v1.2.3 From a3002d5966703675e982f5699b7a829d2dc22d84 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 29 Jan 2015 13:47:36 +0100 Subject: Integrate processes with module discovery. - Fix AuthModuleImpl process resource uri. - Create package at.gv.egovernment.moa.id.auth.modules with submodule "internal" and "stork". - Rename AuthModuleImpl to DefaultAuthModuleImpl (placed in at.gv.egovernment.moa.id.auth.modules.internal). - Move stork specific tasks to "...stork.tasks" and internal modules to "...internal.tasks". - Fix bean classes in applicationContext.xml - Move process descriptions to at.gv.egovernment.moa.id.auth.modules.[internal|stork]. - Add STORKAuthModuleImpl. --- .../src/main/webapp/WEB-INF/applicationContext.xml | 5 +- .../modules/internal/DefaultAuthModuleImpl.java | 27 + .../internal/tasks/AbstractAuthServletTask.java | 379 ++++++++++++++ .../internal/tasks/CertificateReadRequestTask.java | 101 ++++ .../internal/tasks/CreateIdentityLinkFormTask.java | 120 +++++ .../modules/internal/tasks/GetForeignIDTask.java | 182 +++++++ .../internal/tasks/GetMISSessionIDTask.java | 181 +++++++ .../tasks/PrepareAuthBlockSignatureTask.java | 102 ++++ .../tasks/VerifyAuthenticationBlockTask.java | 246 +++++++++ .../internal/tasks/VerifyCertificateTask.java | 164 ++++++ .../internal/tasks/VerifyIdentityLinkTask.java | 103 ++++ .../id/auth/modules/stork/STORKAuthModuleImpl.java | 27 + .../AbstractPepsConnectorWithLocalSigningTask.java | 257 ++++++++++ .../tasks/CreateStorkAuthRequestFormTask.java | 114 +++++ .../PepsConnectorHandleLocalSignResponseTask.java | 218 ++++++++ ...onnectorHandleResponseWithoutSignatureTask.java | 441 ++++++++++++++++ .../modules/stork/tasks/PepsConnectorTask.java | 567 +++++++++++++++++++++ .../moa/id/auth/servlet/GetForeignIDServlet.java | 2 +- .../id/auth/servlet/GetMISSessionIDServlet.java | 2 +- .../moa/id/auth/servlet/PEPSConnectorServlet.java | 2 +- .../PEPSConnectorWithLocalSigningServlet.java | 2 +- .../servlet/VerifyAuthenticationBlockServlet.java | 2 +- .../id/auth/servlet/VerifyCertificateServlet.java | 2 +- .../id/auth/servlet/VerifyIdentityLinkServlet.java | 2 +- .../moa/id/auth/tasks/AbstractAuthServletTask.java | 379 -------------- .../id/auth/tasks/CertificateReadRequestTask.java | 101 ---- .../id/auth/tasks/CreateIdentityLinkFormTask.java | 120 ----- .../moa/id/auth/tasks/GetForeignIDTask.java | 182 ------- .../moa/id/auth/tasks/GetMISSessionIDTask.java | 181 ------- .../auth/tasks/PrepareAuthBlockSignatureTask.java | 102 ---- .../auth/tasks/VerifyAuthenticationBlockTask.java | 246 --------- .../moa/id/auth/tasks/VerifyCertificateTask.java | 164 ------ .../moa/id/auth/tasks/VerifyIdentityLinkTask.java | 103 ---- .../AbstractPepsConnectorWithLocalSigningTask.java | 258 ---------- .../stork/CreateStorkAuthRequestFormTask.java | 114 ----- .../PepsConnectorHandleLocalSignResponseTask.java | 218 -------- ...onnectorHandleResponseWithoutSignatureTask.java | 441 ---------------- .../moa/id/auth/tasks/stork/PepsConnectorTask.java | 567 --------------------- .../moduls/moduleregistration/AuthModuleImpl.java | 23 - .../moduleregistration/ModuleRegistration.java | 29 +- ...ent.moa.id.moduls.moduleregistration.AuthModule | 3 + ...ment.moa.id.moduls.modulregistration.AuthModule | 2 - .../internal/DefaultAuthentication.process.xml | 44 ++ .../modules/stork/STORKAuthentication.process.xml | 29 ++ .../processes/DefaultAuthentication.process.xml | 44 -- .../processes/STORKAuthentication.process.xml | 29 -- 46 files changed, 3331 insertions(+), 3296 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java create mode 100644 id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule delete mode 100644 id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule create mode 100644 id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml create mode 100644 id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml delete mode 100644 id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml delete mode 100644 id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index 563fd6ec7..65a9e7176 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -11,7 +11,10 @@ + + @@ -27,5 +30,5 @@ - + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java new file mode 100644 index 000000000..99c28fd7f --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java @@ -0,0 +1,27 @@ +package at.gv.egovernment.moa.id.auth.modules.internal; + +import org.apache.commons.lang3.StringUtils; + +import at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule; + +import com.datentechnik.process_engine.api.ExecutionContext; + +public class DefaultAuthModuleImpl implements AuthModule { + + @Override + public int getPriority() { + // neutral priority between Integer.MIN_VALUE and Integer.MAX_VALUE + return 0; + } + + @Override + public String selectProcess(ExecutionContext context) { + return StringUtils.isBlank((String) context.get("ccc")) ? "DefaultAuthentication" : null; + } + + @Override + public String[] getProcessDefinitions() { + return new String[] { "classpath:at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml" }; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java new file mode 100644 index 000000000..8a6c58953 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java @@ -0,0 +1,379 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.lang3.ArrayUtils; + +import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.servlet.AuthServlet; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; +import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; +import at.gv.egovernment.moa.id.storage.IExceptionStore; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; + +import com.datentechnik.process_engine.springweb.AbstractSpringWebSupportedTask; + +/** + * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing + * etc.).

                  The code has been taken from {@link AuthServlet}. + */ +public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask { + + protected static final String ERROR_CODE_PARAM = "errorid"; + + protected void handleErrorNoRedirect(String errorMessage, Throwable exceptionThrown, + HttpServletRequest req, HttpServletResponse resp) { + + if (null != errorMessage) { + Logger.error(errorMessage); + req.setAttribute("ErrorMessage", errorMessage); + } + + if (null != exceptionThrown) { + if (null == errorMessage) + errorMessage = exceptionThrown.getMessage(); + Logger.error(errorMessage, exceptionThrown); + req.setAttribute("ExceptionThrown", exceptionThrown); + } + + if (Logger.isDebugEnabled()) { + req.setAttribute("LogLevel", "debug"); + } + + + StatisticLogger logger = StatisticLogger.getInstance(); + logger.logErrorOperation(exceptionThrown); + + + // forward this to errorpage-auth.jsp where the HTML error page is + // generated + ServletContext context = req.getServletContext(); + RequestDispatcher dispatcher = context + .getRequestDispatcher("/errorpage-auth.jsp"); + try { + + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + + dispatcher.forward(req, resp); + } catch (ServletException e) { + Logger.error(e); + } catch (IOException e) { + Logger.error(e); + } + } + + /** + * Handles an error.
                  > + *
                    + *
                  • Logs the error
                  • + *
                  • Places error message and exception thrown into the request as request + * attributes (to be used by "/errorpage-auth.jsp")
                  • + *
                  • Sets HTTP status 500 (internal server error)
                  • + *
                  + * + * @param errorMessage + * error message + * @param exceptionThrown + * exception thrown + * @param req + * servlet request + * @param resp + * servlet response + */ + protected void handleError(String errorMessage, Throwable exceptionThrown, + HttpServletRequest req, HttpServletResponse resp, String pendingRequestID) { + + if (null != errorMessage) { + Logger.error(errorMessage); + req.setAttribute("ErrorMessage", errorMessage); + } + + if (null != exceptionThrown) { + if (null == errorMessage) + errorMessage = exceptionThrown.getMessage(); + Logger.error(errorMessage, exceptionThrown); + req.setAttribute("ExceptionThrown", exceptionThrown); + } + + if (Logger.isDebugEnabled()) { + req.setAttribute("LogLevel", "debug"); + } + + if (!(exceptionThrown instanceof MOAIDException)) { + Logger.error("Receive an internal error: Message=" + exceptionThrown.getMessage(), exceptionThrown); + + } + + IExceptionStore store = DBExceptionStoreImpl.getStore(); + String id = store.storeException(exceptionThrown); + + if (id != null && MiscUtil.isNotEmpty(pendingRequestID)) { + + String redirectURL = null; + + redirectURL = ServletUtils.getBaseUrl(req); + redirectURL += "/dispatcher?" + ERROR_CODE_PARAM + "=" + id + + "&" + DispatcherServlet.PARAM_TARGET_PENDINGREQUESTID + "=" + pendingRequestID; + + resp.setContentType("text/html"); + resp.setStatus(302); + + resp.addHeader("Location", redirectURL); + Logger.debug("REDIRECT TO: " + redirectURL); + + return; + + } else { + + //Exception can not be stored in database + handleErrorNoRedirect(errorMessage, exceptionThrown, req, resp); + } + } + + /** + * Handles a WrongParametersException. + * + * @param req + * servlet request + * @param resp + * servlet response + */ + protected void handleWrongParameters(WrongParametersException ex, + HttpServletRequest req, HttpServletResponse resp) { + Logger.error(ex.toString()); + req.setAttribute("WrongParameters", ex.getMessage()); + + // forward this to errorpage-auth.jsp where the HTML error page is + // generated + ServletContext context = req.getServletContext(); + RequestDispatcher dispatcher = context + .getRequestDispatcher("/errorpage-auth.jsp"); + try { + setNoCachingHeaders(resp); + dispatcher.forward(req, resp); + } catch (ServletException e) { + Logger.error(e); + } catch (IOException e) { + Logger.error(e); + } + } + + /** + * Logs all servlet parameters for debugging purposes. + */ + protected void logParameters(HttpServletRequest req) { + for (Enumeration params = req.getParameterNames(); params + .hasMoreElements();) { + String parname = (String) params.nextElement(); + Logger.debug("Parameter " + parname + req.getParameter(parname)); + } + } + + /** + * Parses the request input stream for parameters, assuming parameters are + * encoded UTF-8 (no standard exists how browsers should encode them). + * + * @param req + * servlet request + * + * @return mapping parameter name -> value + * + * @throws IOException + * if parsing request parameters fails. + * + * @throws FileUploadException + * if parsing request parameters fails. + */ + protected Map getParameters(HttpServletRequest req) throws IOException, + FileUploadException { + + Map parameters = new HashMap(); + + if (ServletFileUpload.isMultipartContent(req)) { + // request is encoded as mulitpart/form-data + FileItemFactory factory = new DiskFileItemFactory(); + ServletFileUpload upload = null; + upload = new ServletFileUpload(factory); + List items = null; + items = upload.parseRequest(req); + for (int i = 0; i < items.size(); i++) { + FileItem item = (FileItem) items.get(i); + if (item.isFormField()) { + // Process only form fields - no file upload items + String logString = item.getString("UTF-8"); + + // TODO use RegExp + String startS = ""; + String endS = "urn:publicid:gv.at:baseid"; + String logWithMaskedBaseid = logString; + int start = logString.indexOf(startS); + if (start > -1) { + int end = logString.indexOf(endS); + if (end > -1) { + logWithMaskedBaseid = logString.substring(0, start); + logWithMaskedBaseid += startS; + logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; + logWithMaskedBaseid += logString.substring(end, + logString.length()); + } + } + parameters + .put(item.getFieldName(), item.getString("UTF-8")); + Logger.debug("Processed multipart/form-data request parameter: \nName: " + + item.getFieldName() + + "\nValue: " + + logWithMaskedBaseid); + } + } + } + + else { + // request is encoded as application/x-www-urlencoded + // [tknall]: we must not consume request body input stream once servlet-api request parameters have been accessed + + /* + InputStream in = req.getInputStream(); + + String paramName; + String paramValueURLEncoded; + do { + paramName = new String(readBytesUpTo(in, '=')); + if (paramName.length() > 0) { + paramValueURLEncoded = readBytesUpTo(in, '&'); + String paramValue = URLDecoder.decode(paramValueURLEncoded, + "UTF-8"); + parameters.put(paramName, paramValue); + } + } while (paramName.length() > 0); + in.close(); + */ + + Iterator> requestParamIt = req.getParameterMap().entrySet().iterator(); + while (requestParamIt.hasNext()) { + Entry entry = requestParamIt.next(); + String key = entry.getKey(); + String[] values = entry.getValue(); + // take the last value from the value array since the legacy code above also does it this way + parameters.put(key, ArrayUtils.isEmpty(values) ? null : values[values.length-1]); + } + + } + + return parameters; + } + + /** + * Reads bytes up to a delimiter, consuming the delimiter. + * + * @param in + * input stream + * @param delimiter + * delimiter character + * @return String constructed from the read bytes + * @throws IOException + */ + protected String readBytesUpTo(InputStream in, char delimiter) + throws IOException { + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + boolean done = false; + int b; + while (!done && (b = in.read()) >= 0) { + if (b == delimiter) + done = true; + else + bout.write(b); + } + return bout.toString(); + } + + /** + * Sets response headers that prevent caching (code taken from {@link AuthServlet}). + * + * @param resp + * The HttpServletResponse. + */ + public void setNoCachingHeaders(HttpServletResponse resp) { + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + } + + /** + * Adds a parameter to a URL. + * + * @param url + * the URL + * @param paramname + * parameter name + * @param paramvalue + * parameter value + * @return the URL with parameter added + */ + protected static String addURLParameter(String url, String paramname, + String paramvalue) { + String param = paramname + "=" + paramvalue; + if (url.indexOf("?") < 0) + return url + "?" + param; + else + return url + "&" + param; + } + + /** + * Checks if HTTP requests are allowed + * + * @param authURL + * requestURL + * @throws AuthenticationException + * if HTTP requests are not allowed + * @throws ConfigurationException + */ + protected void checkIfHTTPisAllowed(String authURL) + throws AuthenticationException, ConfigurationException { + // check if HTTP Connection may be allowed (through + // FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY) + + //Removed from MOA-ID 2.0 config +// String boolStr = AuthConfigurationProvider +// .getInstance() +// .getGenericConfigurationParameter( +// AuthConfigurationProvider.FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY); + if ((!authURL.startsWith("https:")) + //&& (false == BoolUtils.valueOf(boolStr)) + ) + throw new AuthenticationException("auth.07", new Object[] { authURL + + "*" }); + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java new file mode 100644 index 000000000..4af07950b --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java @@ -0,0 +1,101 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.BooleanUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.
                  • + *
                  • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code /VerifyCertificate}
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  + * Result: + *
                    + *
                  • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code {/VerifyCertificate}
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class CertificateReadRequestTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + // TODO[branch]: Foreign citizen or mandate mode; respond with IRR for certificates, dataURL = "/VerifyCertificate" + Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); + + setNoCachingHeaders(resp); + + String pendingRequestID = null; + + try { + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("CertificateReadRequestTask", PARAM_SESSIONID, "auth.12"); + } + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + boolean useMandate = session.getUseMandate(); + boolean identityLinkAvailable = BooleanUtils.isTrue((Boolean) executionContext.get("identityLinkAvailable")); + + if (!identityLinkAvailable && useMandate) { + Logger.error("Online-Mandate Mode for foreign citizencs not supported."); + throw new AuthenticationException("auth.13", null); + } + + // change MOASessionID + AuthenticationSessionStoreage.changeSessionID(session); + + // create the InfoboxReadRequest to get the certificate + String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); + + // build dataurl (to the VerifyCertificateSerlvet) + String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, + session.getSessionID()); + + ServletUtils.writeCreateXMLSignatureRequest(resp, infoboxReadRequest, + AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + } finally { + ConfigurationDBUtils.closeSession(); + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java new file mode 100644 index 000000000..d88042528 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java @@ -0,0 +1,120 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import java.io.PrintWriter; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.ObjectUtils; + +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; +import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; +import at.gv.egovernment.moa.util.StringUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates a http form including an embedded {@code InfoBoxReadRequest} for reading the identity link.

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Removes ExecutionContext property {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}.
                  • + *
                  • Creates the http form mentioned above.
                  • + *
                  • Returns the http form via HttpServletResponse.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID} or
                  • + *
                  • ExecutionContext property {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID} (in case of legacy authentication without CCE selection, where the moa session is not provided by request parameter).
                  • + *
                  + * Result: + *
                    + *
                  • The identity link form via HttpServletResponse.
                  • + *
                  + * Possible branches: + *
                    + *
                  • In case of STORK authentication + *
                      + *
                    • Creates STORK auth SAML request.
                    • + *
                    • Creates and returns a form for submitting the SAML request to the CPEPS (post binding).
                    • + *
                    • Returns the form via HttpServletResponse.
                    • + *
                    + *
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class CreateIdentityLinkFormTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + String pendingRequestID = null; + String moasessionid = StringEscapeUtils.escapeHtml(ObjectUtils.defaultIfNull(req.getParameter(PARAM_SESSIONID), (String) executionContext.get(PARAM_SESSIONID))); + AuthenticationSession moasession = null; + try { + + if (MiscUtil.isEmpty(moasessionid)) { + Logger.warn("MOASessionID is empty."); + throw new MOAIDException("auth.18", new Object[] {}); + } + + try { + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moasessionid); + moasession = AuthenticationSessionStoreage.getSession(moasessionid); + AuthenticationSessionStoreage.changeSessionID(moasession); + executionContext.remove(PARAM_SESSIONID); + + } catch (MOADatabaseException e) { + Logger.info("MOASession with SessionID=" + moasessionid + " is not found in Database"); + throw new MOAIDException("init.04", new Object[] { moasessionid }); + + } catch (Throwable e) { + Logger.info("No HTTP Session found!"); + throw new MOAIDException("auth.18", new Object[] {}); + } + + StartAuthenticationBuilder startauth = StartAuthenticationBuilder.getInstance(); + String getIdentityLinkForm = startauth.build(moasession, req, resp); + + if (!StringUtils.isEmpty(getIdentityLinkForm)) { + resp.setContentType("text/html;charset=UTF-8"); + PrintWriter out = new PrintWriter(resp.getOutputStream()); + out.print(getIdentityLinkForm); + out.flush(); + Logger.debug("Finished GET " + GenerateIFrameTemplateServlet.class); + } + + } catch (WrongParametersException ex) { + handleWrongParameters(ex, req, resp); + } + + catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("CreateIdentityLinkFormTask has an interal Error.", e); + + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java new file mode 100644 index 000000000..a661abc95 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java @@ -0,0 +1,182 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.TransformerException; + +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.lang.StringEscapeUtils; +import org.w3c.dom.Element; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.ParseException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser; +import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; +import at.gv.egovernment.moa.id.client.SZRGWClientException; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils; +import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Evaluates the {@code CreateXMLSignatureResponse}, extracts signature and certificate and asks the SZR Gateway for an identity link.

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Parses the CreateXMLSignatureResponse retrieved from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • + *
                  • Extracts signature and signer certificate.
                  • + *
                  • Send request to SZR Gateway in order to get an identity link.
                  • + *
                  • Updates moa session (sets identity link, QAA level 4, authentication data and foreigner flag).
                  • + *
                  • Redirects back to {@code /dispatcher} in order to finalize authentication.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
                  • + *
                  + * Result: + *
                    + *
                  • Identity link, QAA level 4 and foreigner flag put into moa session.
                  • + *
                  • Redirect to {@code /dispatcher}.
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class GetForeignIDTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + Logger.debug("POST GetForeignIDServlet"); + + setNoCachingHeaders(resp); + + Map parameters; + + try { + parameters = getParameters(req); + } catch (FileUploadException e) { + Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); + throw new IOException(e.getMessage()); + } + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + String pendingRequestID = null; + String redirectURL = null; + AuthenticationSession session = null; + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("GetForeignID", PARAM_SESSIONID, "auth.12"); + } + String xmlCreateXMLSignatureResponse = (String) parameters.get(PARAM_XMLRESPONSE); + if (!ParamValidatorUtils.isValidXMLDocument(xmlCreateXMLSignatureResponse)) { + throw new WrongParametersException("GetForeignID", PARAM_XMLRESPONSE, "auth.12"); + } + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + session = AuthenticationServer.getSession(sessionID); + + // change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.debug(xmlCreateXMLSignatureResponse); + + CreateXMLSignatureResponse csresp = new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse) + .parseResponseDsig(); + + try { + String serializedAssertion = DOMUtils.serializeNode(csresp.getDsigSignature()); + session.setAuthBlock(serializedAssertion); + + } catch (TransformerException e) { + throw new ParseException("parser.04", new Object[] { REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE }); + + } catch (IOException e) { + throw new ParseException("parser.04", new Object[] { REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE }); + + } + + Element signature = csresp.getDsigSignature(); + + try { + session.setSignerCertificate(AuthenticationServer.getCertificateFromXML(signature)); + } catch (CertificateException e) { + Logger.error("Could not extract certificate from CreateXMLSignatureResponse"); + throw new MOAIDException("auth.14", null); + } + + // make SZR request to the identity link + CreateIdentityLinkResponse response = AuthenticationServer.getInstance().getIdentityLink(signature); + + if (null != response.getErrorResponse()) { + // TODO fix exception parameter + throw new SZRGWClientException("service.08", (String) response.getErrorResponse().getErrorCode(), + (String) response.getErrorResponse().getInfo()); + } else { + IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream( + response.getIdentityLink())); + IdentityLink identitylink = ilParser.parseIdentityLink(); + session.setIdentityLink(identitylink); + + // set QAA Level four in case of card authentifcation + session.setQAALevel(PVPConstants.STORK_QAA_1_4); + + AuthenticationServer.getInstance().getForeignAuthenticationData(session); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.info("Changed MOASession " + sessionID + " to Session " + newMOASessionID); + Logger.info("Daten angelegt zu MOASession " + newMOASessionID); + + redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), + ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = resp.encodeRedirectURL(redirectURL); + + // TODO[branch]: Final step back to /dispatcher + + try { + AuthenticationSessionStoreage.storeSession(session); + } catch (MOADatabaseException e) { + throw new MOAIDException("Session store error", null); + } + + resp.setContentType("text/html"); + resp.setStatus(302); + resp.addHeader("Location", redirectURL); + Logger.debug("REDIRECT TO: " + redirectURL); + } + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("GetForeignIDServlet has an interal Error.", e); + + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java new file mode 100644 index 000000000..6e4d77b17 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java @@ -0,0 +1,181 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import iaik.pki.PKIException; + +import java.security.GeneralSecurityException; +import java.util.List; + +import javax.net.ssl.SSLSocketFactory; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.parsers.ParserConfigurationException; + +import org.apache.commons.lang.StringEscapeUtils; +import org.xml.sax.SAXException; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.ConnectionParameter; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.SSLUtils; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Retrieves a mandate from the online mandate issuing service.

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Retrieves the mandate referenced within the moa session from the online (external) mandate issuing service.
                  • + *
                  • Verifies the mandate.
                  • + *
                  • Puts mandate into moa session.
                  • + *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  + * Result: + *
                    + *
                  • Mandate put into moa session.
                  • + *
                  • Redirect to {@code /dispatcher}.
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class GetMISSessionIDTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + Logger.debug("POST GetMISSessionIDServlet"); + + String sessionID = req.getParameter(PARAM_SESSIONID); + + // escape parameter strings + sessionID = StringEscapeUtils.escapeHtml(sessionID); + + AuthenticationSession session = null; + String pendingRequestID = null; + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) + throw new WrongParametersException("VerifyCertificate", + PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + session = AuthenticationServer.getSession(sessionID); + + //change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + String misSessionID = session.getMISSessionID(); + + AuthConfigurationProvider authConf = AuthConfigurationProvider + .getInstance(); + ConnectionParameter connectionParameters = authConf + .getOnlineMandatesConnectionParameter(); + SSLSocketFactory sslFactory = SSLUtils.getSSLSocketFactory( + AuthConfigurationProvider.getInstance(), + connectionParameters); + + List list = MISSimpleClient.sendGetMandatesRequest( + connectionParameters.getUrl(), misSessionID, sslFactory); + + if (list == null || list.size() == 0) { + Logger.error("Keine Vollmacht gefunden."); + throw new AuthenticationException("auth.15", null); + } + + // for now: list contains only one element + MISMandate mandate = (MISMandate) list.get(0); + + // TODO[tlenz]: UTF-8 ? + String sMandate = new String(mandate.getMandate()); + if (sMandate == null || sMandate.compareToIgnoreCase("") == 0) { + Logger.error("Mandate is empty."); + throw new AuthenticationException("auth.15", + new Object[] { GET_MIS_SESSIONID }); + } + + //check if it is a parsable XML + byte[] byteMandate = mandate.getMandate(); + // TODO[tlenz]: UTF-8 ? + String stringMandate = new String(byteMandate); + DOMUtils.parseDocument(stringMandate, false, + null, null).getDocumentElement(); + + // extract RepresentationType + AuthenticationServer.getInstance().verifyMandate(session, mandate); + + session.setMISMandate(mandate); + session.setAuthenticatedUsed(false); + session.setAuthenticated(true); + + //set QAA Level four in case of card authentifcation + session.setQAALevel(PVPConstants.STORK_QAA_1_4); + + String oldsessionID = session.getSessionID(); + + //Session is implicite stored in changeSessionID!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.info("Changed MOASession " + oldsessionID + " to Session " + newMOASessionID); + Logger.info("Daten angelegt zu MOASession " + newMOASessionID); + + String redirectURL = new DataURLBuilder().buildDataURL( + session.getAuthURL(), + ModulUtils.buildAuthURL(session.getModul(), + session.getAction(), pendingRequestID), newMOASessionID); + redirectURL = resp.encodeRedirectURL(redirectURL); + + // TODO[branch]: Final step back to /dispatcher + + resp.setContentType("text/html"); + resp.setStatus(302); + resp.addHeader("Location", redirectURL); + Logger.debug("REDIRECT TO: " + redirectURL); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (GeneralSecurityException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (PKIException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (SAXException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (ParserConfigurationException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("MISMandateValidation has an interal Error.", e); + + } + finally { + ConfigurationDBUtils.closeSession(); + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java new file mode 100644 index 000000000..d7a95bfcc --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java @@ -0,0 +1,102 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates {@code CreateXMLSignatureRequest} for auth block signature.

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Creates {@code CreateXMLSignatureRequest} for auth block signature.
                  • + *
                  • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  + * Result: + *
                    + *
                  • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class PrepareAuthBlockSignatureTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet + + Logger.debug("Process IdentityLink"); + + setNoCachingHeaders(resp); + + String pendingRequestID = null; + + try { + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); + } + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + // change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + Logger.info("Normal"); + + // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" + + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + session.getPublicOAURLPrefix()); + AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); + + String createXMLSignatureRequest = AuthenticationServer.getInstance() + .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); + + AuthenticationSessionStoreage.storeSession(session); + + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, + createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, + "VerifyIdentityLink"); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("IdentityLinkValidation has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java new file mode 100644 index 000000000..8c59c39ba --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java @@ -0,0 +1,246 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import iaik.pki.PKIException; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.util.List; +import java.util.Map; + +import javax.net.ssl.SSLSocketFactory; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.TransformerException; + +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.lang.StringEscapeUtils; +import org.w3c.dom.Element; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.config.ConnectionParameter; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.SSLUtils; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISSessionId; +import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.DOMUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +/** + * Verifies the signed authentication block (provided as {@code CreateXMLSignatureResponse}).

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Takes the {@code CreateXMLSignatureResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • + *
                  • Verifies the {@code CreateXMLSignatureResponse}.
                  • + *
                  • Updates moa session.
                  • + *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
                  • + *
                  + * Result: + *
                    + *
                  • Authentication data put into moa session.
                  • + *
                  • Redirect to {@code /dispatcher}.
                  • + *
                  + * Possible branches: + *
                    + *
                  • In case of mandate mode + *
                      + *
                    • Creates a mandate session at the external mandate issuing service.
                    • + *
                    • Redirects the user's browser to the online mandate issuing service GUI.
                    • + *
                    + *
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet + + Logger.debug("POST VerifyAuthenticationBlock"); + + String pendingRequestID = null; + + Map parameters; + try + { + parameters = getParameters(req); + } catch (FileUploadException e) + { + Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); + throw new IOException(e.getMessage()); + + } + String sessionID = req.getParameter(PARAM_SESSIONID); + String createXMLSignatureResponse = (String)parameters.get(PARAM_XMLRESPONSE); + + // escape parameter strings + sessionID = StringEscapeUtils.escapeHtml(sessionID); + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + String redirectURL = null; + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) + throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); + if (!ParamValidatorUtils.isValidXMLDocument(createXMLSignatureResponse)) + throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_XMLRESPONSE, "auth.12"); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + //change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + String authenticatedMOASessionId = AuthenticationServer.getInstance().verifyAuthenticationBlock(session, createXMLSignatureResponse); + + if (authenticatedMOASessionId == null) { + //mandate Mode + + AuthConfigurationProvider authConf= AuthConfigurationProvider.getInstance(); + ConnectionParameter connectionParameters = authConf.getOnlineMandatesConnectionParameter(); + SSLSocketFactory sslFactory = SSLUtils.getSSLSocketFactory(AuthConfigurationProvider.getInstance(), connectionParameters); + + // get identitity link as byte[] + Element elem = session.getIdentityLink().getSamlAssertion(); + String s = DOMUtils.serializeNode(elem); + + //System.out.println("IDL: " + s); + + byte[] idl = s.getBytes("UTF-8"); + + // redirect url + // build redirect(to the GetMISSessionIdSerlvet) + + //change MOASessionID before MIS request + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); + + redirectURL = + new DataURLBuilder().buildDataURL( + session.getAuthURL(), + GET_MIS_SESSIONID, + newMOASessionID); + + String oaURL = session.getOAURLRequested(); + OAAuthParameter oaParam = authConf.getOnlineApplicationParameter(oaURL); + List profiles = oaParam.getMandateProfiles(); + + if (profiles == null) { + Logger.error("No Mandate/Profile for OA configured."); + throw new AuthenticationException("config.21", new Object[] { GET_MIS_SESSIONID}); + } + + String oaFriendlyName = oaParam.getFriendlyName(); + String mandateReferenceValue = session.getMandateReferenceValue(); + byte[] cert = session.getEncodedSignerCertificate(); + byte[] authBlock = session.getAuthBlock().getBytes("UTF-8"); + + //TODO: check in case of SSO!!! + String targetType = null; + if(oaParam.getBusinessService()) { + String id = oaParam.getIdentityLinkDomainIdentifier(); + if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) + targetType = id; + else + targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_+session.getDomainIdentifier(); + + } else { + targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); + } + + MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest( + connectionParameters.getUrl(), + idl, + cert, + oaFriendlyName, + redirectURL, + mandateReferenceValue, + profiles, + targetType, + authBlock, + sslFactory); + + if (misSessionID == null) { + Logger.error("Fehler bei Anfrage an Vollmachten Service. MIS Session ID ist null."); + throw new MISSimpleClientException("Fehler bei Anfrage an Vollmachten Service."); + } + + String redirectMISGUI = misSessionID.getRedirectURL(); + session.setMISSessionID(misSessionID.getSessiondId()); + + try { + AuthenticationSessionStoreage.storeSession(session); + } catch (MOADatabaseException e) { + throw new MOAIDException("Session store error", null); + } + + // TODO[branch]: Mandate; redirect to MIS website; website redirects back to "/GetMISSessionID" + + resp.setStatus(302); + resp.addHeader("Location", redirectMISGUI); + Logger.debug("REDIRECT TO: " + redirectURL); + } + else { + // TODO[branch]: Final step back to /dispatcher + redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), + ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), authenticatedMOASessionId); + + resp.setContentType("text/html"); + resp.setStatus(302); + + resp.addHeader("Location", redirectURL); + Logger.debug("REDIRECT TO: " + redirectURL); + + } + + } + + catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (GeneralSecurityException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (PKIException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (TransformerException e) { + handleError(null, e, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("AuthBlockValidation has an interal Error.", e); + } + + + finally { + ConfigurationDBUtils.closeSession(); + } + + + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java new file mode 100644 index 000000000..7f9fed37a --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java @@ -0,0 +1,164 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.lang.StringEscapeUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.util.CertificateUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Parses the certificate from {@code InfoBoxReadResponse} (via POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}), creates the auth block to be signed and returns a {@code CreateXMLSignatureRequest} for auth block signature.

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Retrieves the certificate via {@code InfoBoxReadResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • + *
                  • Verifies the certificate.
                  • + *
                  • Creates the auth block to be signed using information from the certificate (Organwalter, foreign citizen.
                  • + *
                  • Puts it in a {@code CreateXMLSignatureRequest}.
                  • + *
                  • Updates moa session.
                  • + *
                  • Responds with {@code CreateXMLSignatureRequest}.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_SESSIONID} containing a {@code InfoBoxReadResponse}.
                  • + *
                  + * Result: + *
                    + *
                  • {@code CreateXMLSignatureRequest} send as HttpServletResponse (for CCE).
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class VerifyCertificateTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet + + Logger.debug("POST VerifyCertificateServlet"); + + String pendingRequestID = null; + + Map parameters; + try + { + parameters = getParameters(req); + } catch (FileUploadException e) + { + Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); + throw new IOException(e.getMessage()); + } + String sessionID = req.getParameter(PARAM_SESSIONID); + + // escape parameter strings + sessionID = StringEscapeUtils.escapeHtml(sessionID); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = null; + try { + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) + throw new WrongParametersException("VerifyCertificate", PARAM_SESSIONID, "auth.12"); + + session = AuthenticationServer.getSession(sessionID); + + //change MOASessionID + sessionID = AuthenticationSessionStoreage.changeSessionID(session); + + X509Certificate cert = AuthenticationServer.getInstance().getCertificate(sessionID, parameters); + if (cert == null) { + Logger.error("Certificate could not be read."); + throw new AuthenticationException("auth.14", null); + } + + boolean useMandate = session.getUseMandate(); + + if (useMandate) { + + // verify certificate for OrganWalter + String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyCertificate(session, cert); + + try { + AuthenticationSessionStoreage.storeSession(session); + } catch (MOADatabaseException e) { + throw new MOAIDException("session store error", null); + } + + // TODO[branch]: Mandate; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" + ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyCertificate"); + + } + else { + + + String countrycode = CertificateUtils.getIssuerCountry(cert); + if (countrycode != null) { + if (countrycode.compareToIgnoreCase("AT") == 0) { + Logger.error("Certificate issuer country code is \"AT\". Login not support in foreign identities mode."); + throw new AuthenticationException("auth.22", null); + } + } + + // Foreign Identities Modus + String createXMLSignatureRequest = AuthenticationServer.getInstance().createXMLSignatureRequestForeignID(session, cert); + // build dataurl (to the GetForeignIDSerlvet) + String dataurl = + new DataURLBuilder().buildDataURL( + session.getAuthURL(), + REQ_GET_FOREIGN_ID, + session.getSessionID()); + + try { + AuthenticationSessionStoreage.storeSession(session); + } catch (MOADatabaseException e) { + throw new MOAIDException("session store error", null); + } + + // TODO[branch]: Foreign citizen; respond with CXSR for authblock signature, dataURL "/GetForeignID" + ServletUtils.writeCreateXMLSignatureRequest(resp, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); + + Logger.debug("Send CreateXMLSignatureRequest to BKU"); + } + } + catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("CertificateValidation has an interal Error.", e); + } + + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java new file mode 100644 index 000000000..c880570b8 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java @@ -0,0 +1,103 @@ +package at.gv.egovernment.moa.id.auth.modules.internal.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.ParseException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Verifies the identity link.

                  + * In detail: + *

                    + *
                  • Renames the moa session id.
                  • + *
                  • Parses the identity link retrieved as {@code InfoBoxReadResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • + *
                  • Verifies the identity link.
                  • + *
                  • Updates moa session.
                  • + *
                  • Puts boolean flag {@code identityLinkAvailable} into {@code ExecutionContext}.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code InfoBoxReadResponse}.
                  • + *
                  + * Result: + *
                    + *
                  • Identity link put into moa session.
                  • + *
                  • Boolean flag {@code identityLinkAvailable} into {@code ExecutionContext}.
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + * + */ +public class VerifyIdentityLinkTask extends AbstractAuthServletTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet + + Logger.debug("POST VerifyIdentityLink"); + + setNoCachingHeaders(resp); + + Map parameters; + String pendingRequestID = null; + + try { + parameters = getParameters(req); + } catch (Exception e) { + Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); + throw new IOException(e.getMessage()); + } + + try { + + String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); + } + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + AuthenticationSession session = AuthenticationServer.getSession(sessionID); + + boolean identityLinkAvailable = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters) != null; + AuthenticationSessionStoreage.storeSession(session); + + executionContext.put("identityLinkAvailable", identityLinkAvailable); + + } catch (ParseException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("IdentityLinkValidation has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java new file mode 100644 index 000000000..140334b36 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java @@ -0,0 +1,27 @@ +package at.gv.egovernment.moa.id.auth.modules.stork; + +import org.apache.commons.lang3.StringUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule; + +public class STORKAuthModuleImpl implements AuthModule { + + @Override + public int getPriority() { + // neutral priority between Integer.MIN_VALUE and Integer.MAX_VALUE + return 0; + } + + @Override + public String selectProcess(ExecutionContext context) { + return StringUtils.isNotBlank((String) context.get("ccc")) ? "STORKAuthentication" : null; + } + + @Override + public String[] getProcessDefinitions() { + return new String[] { "classpath:at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml" }; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java new file mode 100644 index 000000000..9ffcaaa1e --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java @@ -0,0 +1,257 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.security.cert.CertificateException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import javax.activation.DataSource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.JAXBException; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Source; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactoryConfigurationError; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; +import org.xml.sax.SAXException; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.BKUException; +import at.gv.egovernment.moa.id.auth.exception.BuildException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.ParseException; +import at.gv.egovernment.moa.id.auth.exception.ServiceException; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.MOAException; +import at.gv.egovernment.moa.spss.api.SPSSFactory; +import at.gv.egovernment.moa.spss.api.SignatureVerificationService; +import at.gv.egovernment.moa.spss.api.common.Content; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; +import at.gv.egovernment.moa.util.StringUtils; +import at.gv.util.xsd.xmldsig.SignatureType; +import at.gv.util.xsd.xmldsig.X509DataType; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.api.LightweightSourceResolver; +import eu.stork.oasisdss.api.exceptions.ApiUtilsException; +import eu.stork.oasisdss.api.exceptions.UtilsException; +import eu.stork.oasisdss.profile.SignRequest; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; + +public abstract class AbstractPepsConnectorWithLocalSigningTask extends AbstractAuthServletTask { + + String getCitizienSignatureFromSignResponse(SignResponse dssSignResponse) throws IllegalArgumentException, + TransformerConfigurationException, UtilsException, TransformerException, + TransformerFactoryConfigurationError, IOException, ApiUtilsException { + // fetch signed doc + DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); + if (ds == null) { + throw new ApiUtilsException("No datasource found in response"); + } + + InputStream incoming = ds.getInputStream(); + String citizenSignature = IOUtils.toString(incoming); + incoming.close(); + + return citizenSignature; + } + + void SZRGInsertion(AuthenticationSession moaSession, IPersonalAttributeList personalAttributeList, + String authnContextClassRef, String citizenSignature) throws STORKException, MOAIDException { + Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); + Logger.debug("Citizen signature will be verified by SZR Gateway!"); + + Logger.debug("fetching OAParameters from database"); + + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + moaSession.getPublicOAURLPrefix()); + if (oaParam == null) + throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); + + // retrieve target + // TODO: check in case of SSO!!! + String targetType = null; + if (oaParam.getBusinessService()) { + String id = oaParam.getIdentityLinkDomainIdentifier(); + if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) + targetType = id; + else + targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); + } else { + targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); + } + + Logger.debug("Starting connecting SZR Gateway"); + // contact SZR Gateway + IdentityLink identityLink = null; + + identityLink = STORKResponseProcessor.connectToSZRGateway(personalAttributeList, oaParam.getFriendlyName(), + targetType, null, oaParam.getMandateProfiles(), citizenSignature); + Logger.debug("SZR communication was successfull"); + + if (identityLink == null) { + Logger.error("SZR Gateway did not return an identity link."); + throw new MOAIDException("stork.10", null); + } + Logger.info("Received Identity Link from SZR Gateway"); + moaSession.setIdentityLink(identityLink); + + Logger.debug("Adding addtional STORK attributes to MOA session"); + moaSession.setStorkAttributes(personalAttributeList); + + // We don't have BKUURL, setting from null to "Not applicable" + moaSession.setBkuURL("Not applicable (STORK Authentication)"); + + // free for single use + moaSession.setAuthenticatedUsed(false); + + // stork did the authentication step + moaSession.setAuthenticated(true); + + // TODO: found better solution, but QAA Level in response could be not supported yet + try { + if (authnContextClassRef == null) + authnContextClassRef = PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel(); + moaSession.setQAALevel(authnContextClassRef); + + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); + + } + + } + + X509Certificate getSignerCertificate(String citizenSignature) throws CertificateException, JAXBException, + UnsupportedEncodingException { + JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); + SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( + IOUtils.toInputStream(citizenSignature))).getValue(); + + // extract certificate + for (Object current : root.getKeyInfo().getContent()) + if (((JAXBElement) current).getValue() instanceof X509DataType) { + for (Object currentX509Data : ((JAXBElement) current).getValue() + .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { + JAXBElement casted = ((JAXBElement) currentX509Data); + if (casted.getName().getLocalPart().equals("X509Certificate")) { + return new X509Certificate(((String) casted.getValue()).getBytes("UTF-8")); + } + } + } + return null; + } + + VerifyXMLSignatureResponse verifyXMLSignature(String signature) throws AuthenticationException, ParseException, + BKUException, BuildException, ConfigurationException, ServiceException, UnsupportedEncodingException, + SAXException, IOException, ParserConfigurationException, MOAException { + // Based on MOA demo client + // Factory und Service instanzieren + SPSSFactory spssFac = SPSSFactory.getInstance(); + SignatureVerificationService sigVerifyService = SignatureVerificationService.getInstance(); + + Content sigDocContent1 = spssFac.createContent(IOUtils.toInputStream(signature, "UTF-8"), null); + + // Position der zu prüfenden Signatur im Dokument angeben + // (Nachdem im XPath-Ausdruck ein NS-Präfix verwendet wird, muss in einer Lookup-Tabelle + // der damit bezeichnete Namenraum mitgegeben werden) + HashMap nSMap = new HashMap(); + nSMap.put("dsig", "http://www.w3.org/2000/09/xmldsig#"); + VerifySignatureLocation sigLocation = spssFac.createVerifySignatureLocation("//dsig:Signature", nSMap); + + // Zu prüfendes Dokument und Signaturposition zusammenfassen + + VerifySignatureInfo sigInfo = spssFac.createVerifySignatureInfo(sigDocContent1, sigLocation); + + // Prüfrequest zusammenstellen + VerifyXMLSignatureRequest verifyRequest = spssFac.createVerifyXMLSignatureRequest(null, // Wird Prüfzeit nicht + // angegeben, wird + // aktuelle Zeit + // verwendet + sigInfo, null, // Keine Ergänzungsobjekte notwendig + null, // Signaturmanifest-Prüfung soll nicht durchgeführt werden + false, // Hash-Inputdaten, d.h. tatsächlich signierte Daten werden nicht zurückgeliefert + "MOAIDBuergerkartePersonenbindungMitTestkarten");// TODO load from config + // "Test-Signaturdienste"); // ID des verwendeten Vertrauensprofils + + VerifyXMLSignatureResponse verifyResponse = null; + try { + // Aufruf der Signaturprüfung + verifyResponse = sigVerifyService.verifyXMLSignature(verifyRequest); + } catch (MOAException e) { + // Service liefert Fehler + System.err.println("Die Signaturprüfung hat folgenden Fehler geliefert:"); + System.err.println("Fehlercode: " + e.getMessageId()); + System.err.println("Fehlernachricht: " + e.getMessage()); + throw e; + } + + return verifyResponse; + } + + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse convert( + VerifyXMLSignatureResponse xMLVerifySignatureResponse) { + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse response = new at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse(); + response.setCertificateCheckCode(xMLVerifySignatureResponse.getCertificateCheck().getCode()); + response.setPublicAuthority(xMLVerifySignatureResponse.getSignerInfo().isPublicAuthority()); + // response.setPublicAuthorityCode(publicAuthorityCode) + response.setQualifiedCertificate(xMLVerifySignatureResponse.getSignerInfo().isQualifiedCertificate()); + response.setSignatureCheckCode(xMLVerifySignatureResponse.getSignatureCheck().getCode()); + response.setSignatureManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); + // response.setSigningDateTime() + // response.setX509certificate(x509certificate) + response.setXmlDSIGManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); + // response.setXmlDSIGManigest(xMLVerifySignatureResponse.getSignatureManifestCheck()) + // response.setXmlDsigSubjectName(xmlDsigSubjectName) + return response; + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java new file mode 100644 index 000000000..d7480f063 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java @@ -0,0 +1,114 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; +import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.stork.CPEPS; +import at.gv.egovernment.moa.id.config.stork.STORKConfig; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.logging.Logger; + +import com.datentechnik.process_engine.api.ExecutionContext; + +/** + * Creates a SAML2 STORK authentication request, embeds it in a form (in order to satisfy saml post binging) and returns the form withing the HttpServletResponse.

                  + * In detail: + *

                    + *
                  • Validates the stork configuration in order to make sure the selected country is supported.
                  • + *
                  • Puts a flag ({@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}) into the ExecutionContext reflecting the capability of the C-PEPS to create xml signatures.
                  • + *
                  • Invokes {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} which
                  • + *
                      + *
                    • Creates and signs a SAML2 stork authentication request.
                    • + *
                    • Creates a signature request for auth block signature (either to be performed by the C-PEPS or locally).
                    • + *
                    • Using the velocity template engine in order to create a form with the embedded stork request.
                    • + *
                    • Writes the form to the response output stream.
                    • + *
                    + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • + *
                  • Property {@code ccc} set within the moa session.
                  • + *
                  + * Result: + *
                    + *
                  • Form containing a SAML2 Stork authentication request and an action url pointing to the selected C-PEPS.
                  • + *
                  • Assertion consumer URL for C-PEPS set either to {@code /PEPSConnector} in case of a C-PEPS supporting xml signatures or {@code /PEPSConnectorWithLocalSigning} if the selected C-PEPS does not support xml signatures.
                  • + *
                  • In case of a C-PEPS not supporting xml signature: moasession with set signedDoc property (containing the signature request for local signing).
                  • + *
                  • ExecutionContext contains the boolean flag {@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}. + *
                  + * Code taken from {@link StartAuthenticationBuilder#build(AuthenticationSession, HttpServletRequest, HttpServletResponse)}.
                  + * Using {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class CreateStorkAuthRequestFormTask extends AbstractAuthServletTask { + + /** + * Boolean value reflecting the capability of the selected c-peps of creating xml signatures. + */ + public static final String PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED = "C-PEPS:XMLSignatureSupported"; + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + String pendingRequestID = null; + String sessionID = null; + try { + setNoCachingHeaders(resp); + + sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("CreateStorkAuthRequestFormTask", PARAM_SESSIONID, "auth.12"); + } + AuthenticationSession moasession = AuthenticationServer.getSession(sessionID); + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + if (StringUtils.isEmpty(moasession.getCcc())) { + // illegal state; task should not have been executed without a selected country + throw new AuthenticationException("stork.22", new Object[] { sessionID }); + } + STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig(); + if (!storkConfig.isSTORKAuthentication(moasession.getCcc())) { + throw new AuthenticationException("stork.23", new Object[] { moasession.getCcc(), sessionID }); + } + + // STORK authentication + // cpeps cannot be null + CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc()); + Logger.debug("Found C-PEPS configuration for citizen of country: " + moasession.getCcc()); + executionContext.put(PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED, cpeps.isXMLSignatureSupported()); + + Logger.info("Starting STORK authentication for a citizen of country: " + moasession.getCcc()); + AuthenticationServer.startSTORKAuthentication(req, resp, moasession); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("CreateStorkAuthRequestFormTask has an interal Error.", e); + throw new MOAIDException("Internal error.", new Object[] { sessionID }, e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java new file mode 100644 index 000000000..d772a50c0 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java @@ -0,0 +1,218 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PersonalAttribute; + +/** + * Processes the citizen's signature, creates identity link using szr gateway and finalizes authentication. + *

                  + * In detail: + *

                    + *
                  • Changes moa session id.
                  • + *
                  • Decodes and validates the sign response, extracting the citizen's signature.
                  • + *
                  • Verifies the citizen's signature.
                  • + *
                  • Create {@code signedDoc} attribute.
                  • + *
                  • Retrieve identity link from SZR gateway using the citizen's signature.
                  • + *
                  • If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. + * Therefore a form is presented asking for the subject's gender. The form finally submits the user back to the + * {@code /PepsConnectorWithLocalSigning} servlet (this task).
                  • + *
                  • The moa session is updated with authentication information.
                  • + *
                  • Change moa session id.
                  • + *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@code moaSessionID}
                  • + *
                  • HttpServletRequest parameter {@code signresponse}
                  • + *
                  + * Result: + *
                    + *
                  • Updated moa id session (signed auth block, signer certificate etc.)
                  • + *
                  • Redirect to {@code /dispatcher}.
                  • + *
                  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
                  • + *
                  + * Possible branches: + *
                    + *
                  • In case the szr gateway throws exception due to missing gender information: + *
                      + *
                    • Returns a form for gender selection with action url back to this servlet/task.
                    • + *
                    + *
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
                  + * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorHandleLocalSignResponseTask extends AbstractPepsConnectorWithLocalSigningTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + + if (moaSessionID != null && signResponse != null) { + // redirect from oasis with signresponse + handleSignResponse(executionContext, request, response); + } else { + // should not occur + throw new IOException("should not occur"); + } + return; + } + + private void handleSignResponse(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) { + Logger.info("handleSignResponse started"); + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + String pendingRequestID = null; + try { + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + Logger.info("pendingRequestID:" + pendingRequestID); + String signResponseString = new String(Base64.decodeBase64(signResponse), "UTF8"); + Logger.info("RECEIVED signresponse:" + signResponseString); + // create SignResponse object + Source response1 = new StreamSource(new java.io.StringReader(signResponseString)); + SignResponse dssSignResponse = ApiUtils.unmarshal(response1, SignResponse.class); + + // SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource(new + // java.io.StringReader(Base64.signResponse))); + + String citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + X509Certificate cert = getSignerCertificate(citizenSignature); + moaSession.setSignerCertificate(cert); + VerifyXMLSignatureResponse xMLVerifySignatureResponse = verifyXMLSignature(citizenSignature); + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse tmp = convert(xMLVerifySignatureResponse); + + moaSession.setXMLVerifySignatureResponse(tmp); + executionContext.put("identityLinkAvailable", false); + try { + IPersonalAttributeList personalAttributeList = moaSession.getAuthnResponseGetPersonalAttributeList(); + // Add SignResponse TODO Add signature (extracted from signResponse)? + List values = new ArrayList(); + values.add(signResponseString); + // values.add(citizenSignature); + Logger.debug("Assembling signedDoc attribute"); + PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values, "Available"); + personalAttributeList.add(signedDocAttribute); + + String authnContextClassRef = moaSession.getAuthnContextClassRef(); + SZRGInsertion(moaSession, personalAttributeList, authnContextClassRef, citizenSignature); + executionContext.put("identityLinkAvailable", true); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas + // authnResponse? + moaSession.setForeigner(true); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + response.sendRedirect(redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java new file mode 100644 index 000000000..8ed1cf44f --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java @@ -0,0 +1,441 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.StringUtils; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.profile.SignRequest; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; + +/** + * Validates the SAML response from C-PEPS. + *

                  + * In detail: + *

                    + *
                  • Decodes and validates SAML response from C-PEPS.
                  • + *
                  • Retrieves the moa session using the session id provided by HttpServletRequest parameter {@code RelayState} or by {@code inResponseTo} attribute of the saml response.
                  • + *
                  • Store saml response in moa session.
                  • + *
                  • Change moa session id.
                  • + *
                  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@code moaSessionID} to be {@code null}
                  • + *
                  • HttpServletRequest parameter {@code signresponse} to be {@code null}
                  • + *
                  • HttpServletRequest parameter {@code SAMLResponse}
                  • + *
                  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute within the saml response, both reflecting the moa session id.
                  • + *
                  + * Result: + *
                    + *
                  • Updated moa session (with saml response).
                  • + *
                  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
                  + * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPepsConnectorWithLocalSigningTask { + + private String oasisDssWebFormURL = "https://testvidp.buergerkarte.at/oasis-dss/DSSWebFormServlet"; + // load from config below + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + + if (moaSessionID == null && signResponse == null) { + // normal saml response + handleSAMLResponse(executionContext, request, response); + + } else { + // should not occur + throw new IOException("should not occur"); + } + return; + } + + private void handleSAMLResponse(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) { + Logger.info("handleSAMLResponse started"); + String pendingRequestID = null; + + setNoCachingHeaders(response); + try { + Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); + Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); + + Logger.trace("No Caching headers set for HTTP response"); + + // check if https or only http + super.checkIfHTTPisAllowed(request.getRequestURL().toString()); + + Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); + + // extract STORK Response from HTTP Request + // Decodes SAML Response + byte[] decSamlToken; + try { + decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); + Logger.debug("SAMLResponse: " + new String(decSamlToken)); + + } catch (NullPointerException e) { + Logger.error("Unable to retrieve STORK Response", e); + throw new MOAIDException("stork.04", null); + } + + // Get SAMLEngine instance + STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); + + STORKAuthnResponse authnResponse = null; + try { + // validate SAML Token + Logger.debug("Starting validation of SAML response"); + authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); + Logger.info("SAML response succesfully verified!"); + } catch (STORKSAMLEngineException e) { + Logger.error("Failed to verify STORK SAML Response", e); + throw new MOAIDException("stork.05", null); + } + + Logger.info("STORK SAML Response message succesfully extracted"); + Logger.debug("STORK response: "); + Logger.debug(authnResponse.toString()); + + Logger.debug("Trying to find MOA Session-ID ..."); + // String moaSessionID = request.getParameter(PARAM_SESSIONID); + // first use SAML2 relayState + String moaSessionID = request.getParameter("RelayState"); + + // escape parameter strings + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + // check if SAML2 relaystate includes a MOA sessionID + if (StringUtils.isEmpty(moaSessionID)) { + // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier + + moaSessionID = authnResponse.getInResponseTo(); + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + if (StringUtils.isEmpty(moaSessionID)) { + // No authentication session has been started before + Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); + Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); + throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); + + } else + Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); + + } else + // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); + Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); + + /* + * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because + * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter + */ + // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) + // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Found MOA sessionID: " + moaSessionID); + + String statusCodeValue = authnResponse.getStatusCode(); + + if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { + Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); + throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); + } + + Logger.info("Got SAML response with authentication success message."); + + Logger.debug("MOA session is still valid"); + + STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); + + if (storkAuthnRequest == null) { + Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + throw new MOAIDException("stork.07", null); + } + + Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + + // //////////// incorporate gender from parameters if not in stork response + + IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); + + // but first, check if we have a representation case + if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) + || STORKResponseProcessor.hasAttribute("representative", attributeList) + || STORKResponseProcessor.hasAttribute("represented", attributeList)) { + // in a representation case... + moaSession.setUseMandate("true"); + + // and check if we have the gender value + PersonalAttribute gender = attributeList.get("gender"); + if (null == gender) { + String gendervalue = (String) request.getParameter("gender"); + if (null != gendervalue) { + gender = new PersonalAttribute(); + gender.setName("gender"); + ArrayList tmp = new ArrayList(); + tmp.add(gendervalue); + gender.setValue(tmp); + + authnResponse.getPersonalAttributeList().add(gender); + } + } + } + + + + // //////////////////////////////////////////////////////////////////////// + + Logger.debug("Starting extraction of signedDoc attribute"); + // extract signed doc element and citizen signature + String citizenSignature = null; + try { + PersonalAttribute signedDoc = authnResponse.getPersonalAttributeList().get("signedDoc"); + String signatureInfo = null; + // FIXME: Remove nonsense code (signedDoc attribute... (throw Exception for "should not occur" situations)), adjust error messages in order to reflect the true problem... + if (signedDoc != null) { + signatureInfo = signedDoc.getValue().get(0); + // should not occur + } else { + + // store SAMLResponse + moaSession.setSAMLResponse(request.getParameter("SAMLResponse")); + // store authnResponse + + // moaSession.setAuthnResponse(authnResponse);//not serializable + moaSession.setAuthnResponseGetPersonalAttributeList(authnResponse.getPersonalAttributeList()); + + String authnContextClassRef = null; + try { + authnContextClassRef = authnResponse.getAssertions().get(0).getAuthnStatements().get(0) + .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef(); + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + } + + moaSession.setAuthnContextClassRef(authnContextClassRef); + moaSession.setReturnURL(request.getRequestURL()); + + // load signedDoc + String signRequest = moaSession.getSignedDoc(); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + // set return url to PEPSConnectorWithLocalSigningServlet and add newMOASessionID + // signRequest + + String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix(); + String acsURL = issuerValue + + PEPSConnectorWithLocalSigningServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN; + + String url = acsURL + "?moaSessionID=" + newMOASessionID; + // redirect to OASIS module and sign there + + boolean found = false; + try { + List aps = AuthConfigurationProvider.getInstance() + .getOnlineApplicationParameter(moaSession.getPublicOAURLPrefix()).getStorkAPs(); + Logger.info("Found AttributeProviderPlugins:" + aps.size()); + for (AttributeProviderPlugin ap : aps) { + Logger.info("Found AttributeProviderPlugin attribute:" + ap.getAttributes()); + if (ap.getAttributes().equalsIgnoreCase("signedDoc")) { + // FIXME: A servlet's class field is not thread safe!!! + oasisDssWebFormURL = ap.getUrl(); + found = true; + Logger.info("Loaded signedDoc attribute provider url from config:" + oasisDssWebFormURL); + break; + } + } + } catch (Exception e) { + e.printStackTrace(); + Logger.error("Loading the signedDoc attribute provider url from config failed"); + } + if (!found) { + Logger.error("Failed to load the signedDoc attribute provider url from config"); + } + performRedirect(url, request, response, signRequest); + + return; + } + + // FIXME: This servlet/task is intended to handle peps responses without signature, so why do we try to process that signature here? + SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( + new java.io.StringReader(signatureInfo))); + + citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + X509Certificate cert = getSignerCertificate(citizenSignature); + moaSession.setSignerCertificate(cert); + moaSession.setForeigner(true); + + } catch (Throwable e) { + Logger.error("Could not extract citizen signature from C-PEPS", e); + throw new MOAIDException("stork.09", null); + } + + // FIXME: Same here; we do not have the citizen's signature, so this code might be regarded as dead code. + try { + SZRGInsertion(moaSession, authnResponse.getPersonalAttributeList(), authnResponse.getAssertions() + .get(0).getAuthnStatements().get(0).getAuthnContext().getAuthnContextClassRef() + .getAuthnContextClassRef(), citizenSignature); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas + // authnResponse? + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + response.setContentType("text/html"); + response.setStatus(302); + response.addHeader("Location", redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + + private void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, String signRequestString) + throws MOAIDException { + + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/oasis_dss_webform_binding.vm"); + VelocityContext context = new VelocityContext(); + + Logger.debug("performRedirect, signrequest:" + signRequestString); + Source signDoc = new StreamSource(new java.io.StringReader(signRequestString)); + SignRequest signRequest = ApiUtils.unmarshal(signDoc, SignRequest.class); + signRequest.setReturnURL("TODO"); + signRequestString = IOUtils.toString(ApiUtils.marshalToInputStream(signRequest)); + context.put("signrequest", Base64.encodeBase64String(signRequestString.getBytes("UTF8"))); + context.put("clienturl", url); + context.put("action", oasisDssWebFormURL); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + resp.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e) { + Logger.error("Error sending DSS signrequest.", e); + throw new MOAIDException("stork.11", null); + } + } +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java new file mode 100644 index 000000000..296132e76 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java @@ -0,0 +1,567 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + +import javax.activation.DataSource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.namespace.QName; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; + +import com.datentechnik.process_engine.api.ExecutionContext; + +import eu.stork.documentservice.DocumentService; +import eu.stork.documentservice.data.DatabaseConnectorMySQLImpl; +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.api.LightweightSourceResolver; +import eu.stork.oasisdss.api.exceptions.ApiUtilsException; +import eu.stork.oasisdss.profile.DocumentType; +import eu.stork.oasisdss.profile.DocumentWithSignature; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.PersonalAttributeList; +import eu.stork.peps.auth.commons.STORKAttrQueryRequest; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.StringUtils; +import at.gv.util.xsd.xmldsig.SignatureType; +import at.gv.util.xsd.xmldsig.X509DataType; + +/** + * Evaluates the SAML response from the C-PEPS and authenticates the user. + *

                  + * In detail: + *

                    + *
                  • Decodes and validates the SAML response from the C-PEPS.
                  • + *
                  • Change moa session id.
                  • + *
                  • Extracts the subject's gender from request parameter {@code gender} if not available from the saml response.
                  • + *
                  • Extracts the {@code signedDoc} attribute from the response, get signed doc payload using stork attribute query request.
                  • + *
                  • Request SZR gateway for verification of the citizen's signature and for creating of an identity link.
                  • + *
                  • In case of mandate mode: If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. Therefore a form is presented asking for the subject's gender. The form submits the user back to the {@code /PepsConnector} servlet (this task).
                  • + *
                  • The moa session is updated with authentication information.
                  • + *
                  • Change moa session id.
                  • + *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • + *
                  + * Expects: + *
                    + *
                  • HttpServletRequest parameter {@code SAMLResponse}
                  • + *
                  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute from the SAML response (both depicting the moa session id)
                  • + *
                  • HttpServletRequest parameter {@code gender} in case the request comes from the gender selection form
                  • + *
                  • {@code signedDoc} attribute within the SAML response.
                  • + *
                  + * Result: + *
                    + *
                  • Updated moa id session (identity link, stork attributes...)
                  • + *
                  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
                  • + *
                  • Redirect to {@code /dispatcher}.
                  • + *
                  + * Possible branches: + *
                    + *
                  • In case the szr gateway throws exception due to missing gender information: + *
                      + *
                    • Returns a form for gender selection with action url back to this servlet/task.
                    • + *
                    + *
                  • + *
                  + * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet}.
                  + * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorTask extends AbstractAuthServletTask { + + private String dtlUrl = null; + + public PepsConnectorTask() { + super(); + Properties props = new Properties(); + try { + props.load(DatabaseConnectorMySQLImpl.class.getResourceAsStream("docservice.properties")); + dtlUrl = props.getProperty("docservice.url"); + } catch (IOException e) { + dtlUrl = "http://testvidp.buergerkarte.at/DocumentService/DocumentService"; + Logger.error("Loading DTL config failed, using default value:" + dtlUrl); + e.printStackTrace(); + } + } + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String pendingRequestID = null; + + setNoCachingHeaders(response); + + try { + + Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); + Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); + + // check if https or only http + super.checkIfHTTPisAllowed(request.getRequestURL().toString()); + + Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); + + // extract STORK Response from HTTP Request + // Decodes SAML Response + byte[] decSamlToken; + try { + decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); + Logger.debug("SAMLResponse: " + new String(decSamlToken)); + + } catch (NullPointerException e) { + Logger.error("Unable to retrieve STORK Response", e); + throw new MOAIDException("stork.04", null); + } + + // Get SAMLEngine instance + STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); + + STORKAuthnResponse authnResponse = null; + try { + // validate SAML Token + Logger.debug("Starting validation of SAML response"); + authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); + Logger.info("SAML response succesfully verified!"); + } catch (STORKSAMLEngineException e) { + Logger.error("Failed to verify STORK SAML Response", e); + throw new MOAIDException("stork.05", null); + } + + Logger.info("STORK SAML Response message succesfully extracted"); + Logger.debug("STORK response: "); + Logger.debug(authnResponse.toString()); + + Logger.debug("Trying to find MOA Session-ID ..."); + // String moaSessionID = request.getParameter(PARAM_SESSIONID); + // first use SAML2 relayState + String moaSessionID = request.getParameter("RelayState"); + + // escape parameter strings + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + // check if SAML2 relaystate includes a MOA sessionID + if (StringUtils.isEmpty(moaSessionID)) { + // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier + + moaSessionID = authnResponse.getInResponseTo(); + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + if (StringUtils.isEmpty(moaSessionID)) { + // No authentication session has been started before + Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); + Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); + throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); + + } else + Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); + + } else + // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); + Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); + + /* + * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because + * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter + */ + // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) + // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Found MOA sessionID: " + moaSessionID); + + String statusCodeValue = authnResponse.getStatusCode(); + + if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { + Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); + throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); + } + + Logger.info("Got SAML response with authentication success message."); + + Logger.debug("MOA session is still valid"); + + STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); + + if (storkAuthnRequest == null) { + Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + throw new MOAIDException("stork.07", null); + } + + Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + + // //////////// incorporate gender from parameters if not in stork response + + IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); + + // but first, check if we have a representation case + if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) + || STORKResponseProcessor.hasAttribute("representative", attributeList) + || STORKResponseProcessor.hasAttribute("represented", attributeList)) { + // in a representation case... + moaSession.setUseMandate("true"); + + // and check if we have the gender value + PersonalAttribute gender = attributeList.get("gender"); // TODO Do we need to check gender value if + // there is no representation case? + if (null == gender) { + String gendervalue = (String) request.getParameter("gender"); + if (null != gendervalue) { + gender = new PersonalAttribute(); + gender.setName("gender"); + ArrayList tmp = new ArrayList(); + tmp.add(gendervalue); + gender.setValue(tmp); + + authnResponse.getPersonalAttributeList().add(gender); + } + } + } + + // //////////////////////////////////////////////////////////////////////// + + Logger.debug("Starting extraction of signedDoc attribute"); + // extract signed doc element and citizen signature + String citizenSignature = null; + try { + String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0); // TODO ERROR HANDLING + + Logger.debug("signatureInfo:" + signatureInfo); + + SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( + new java.io.StringReader(signatureInfo))); + + // fetch signed doc + DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); + if (ds == null) { + throw new ApiUtilsException("No datasource found in response"); + } + + InputStream incoming = ds.getInputStream(); + citizenSignature = IOUtils.toString(incoming); + incoming.close(); + + Logger.debug("citizenSignature:" + citizenSignature); + if (isDocumentServiceUsed(citizenSignature) == true) { + Logger.debug("Loading document from DocumentService."); + String url = getDtlUrlFromResponse(dssSignResponse); + // get Transferrequest + String transferRequest = getDocTransferRequest(dssSignResponse.getDocUI(), url); + // Load document from DocujmentService + byte[] data = getDocumentFromDtl(transferRequest, url); + citizenSignature = new String(data, "UTF-8"); + Logger.debug("Overridung citizenSignature with:" + citizenSignature); + } + + JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); + SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( + IOUtils.toInputStream(citizenSignature))).getValue(); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + // extract certificate + for (Object current : root.getKeyInfo().getContent()) + if (((JAXBElement) current).getValue() instanceof X509DataType) { + for (Object currentX509Data : ((JAXBElement) current).getValue() + .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { + JAXBElement casted = ((JAXBElement) currentX509Data); + if (casted.getName().getLocalPart().equals("X509Certificate")) { + moaSession.setSignerCertificate(new X509Certificate(((String) casted.getValue()) + .getBytes("UTF-8"))); + break; + } + } + } + + } catch (Throwable e) { + Logger.error("Could not extract citizen signature from C-PEPS", e); + throw new MOAIDException("stork.09", null); + } + Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); + Logger.debug("Citizen signature will be verified by SZR Gateway!"); + + Logger.debug("fetching OAParameters from database"); + + // //read configuration paramters of OA + // AuthenticationSession moasession; + // try { + // moasession = AuthenticationSessionStoreage.getSession(moaSessionID); + // } catch (MOADatabaseException e2) { + // Logger.error("could not retrieve moa session"); + // throw new AuthenticationException("auth.01", null); + // } + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + moaSession.getPublicOAURLPrefix()); + if (oaParam == null) + throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); + + // retrieve target + // TODO: check in case of SSO!!! + String targetType = null; + if (oaParam.getBusinessService()) { + String id = oaParam.getIdentityLinkDomainIdentifier(); + if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) + targetType = id; + else + targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); + } else { + targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); + } + + Logger.debug("Starting connecting SZR Gateway"); + // contact SZR Gateway + IdentityLink identityLink = null; + executionContext.put("identityLinkAvailable", false); + try { + identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(), + oaParam.getFriendlyName(), targetType, null, oaParam.getMandateProfiles(), citizenSignature); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + Logger.debug("SZR communication was successfull"); + + if (identityLink == null) { + Logger.error("SZR Gateway did not return an identity link."); + throw new MOAIDException("stork.10", null); + } + moaSession.setForeigner(true); + + Logger.info("Received Identity Link from SZR Gateway"); + executionContext.put("identityLinkAvailable", true); + moaSession.setIdentityLink(identityLink); + + Logger.debug("Adding addtional STORK attributes to MOA session"); + moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList()); + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse")); + + // We don't have BKUURL, setting from null to "Not applicable" + moaSession.setBkuURL("Not applicable (STORK Authentication)"); + + // free for single use + moaSession.setAuthenticatedUsed(false); + + // stork did the authentication step + moaSession.setAuthenticated(true); + + // TODO: found better solution, but QAA Level in response could be not supported yet + try { + + moaSession.setQAALevel(authnResponse.getAssertions().get(0).getAuthnStatements().get(0) + .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef()); + + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); + + } + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + // response.setContentType("text/html"); + // response.setStatus(302); + // response.addHeader("Location", redirectURL); + response.sendRedirect(redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + + private boolean isDocumentServiceUsed(String citizenSignature) // TODo add better check + { + if (citizenSignature + .contains("
                  Service Name:{http://stork.eu}DocumentService
                  Port Name:{http://stork.eu}DocumentServicePort
                  ")) + return true; + return false; + } + + /** + * Get DTL uril from the oasis sign response + * + * @param signRequest + * The signature response + * @return The URL of DTL service + * @throws SimpleException + */ + private String getDtlUrlFromResponse(SignResponse dssSignResponse) { + List documents = ApiUtils.findNamedElement(dssSignResponse.getOptionalOutputs(), + ApiUtils.OPTIONAL_OUTPUT_DOCUMENTWITHSIGNATURE, DocumentWithSignature.class); + DocumentType sourceDocument = documents.get(0).getDocument(); + + if (sourceDocument.getDocumentURL() != null) + return sourceDocument.getDocumentURL(); + else + return null;// throw new Exception("No document url found"); + } + + // From DTLPEPSUTIL + + /** + * Get document from DTL + * + * @param transferRequest + * The transfer request (attribute query) + * @param eDtlUrl + * The DTL url of external DTL + * @return the document data + * @throws SimpleException + */ + private byte[] getDocumentFromDtl(String transferRequest, String eDtlUrl) throws Exception { + URL url = null; + try { + url = new URL(dtlUrl); + QName qname = new QName("http://stork.eu", "DocumentService"); + + Service service = Service.create(url, qname); + DocumentService docservice = service.getPort(DocumentService.class); + + BindingProvider bp = (BindingProvider) docservice; + SOAPBinding binding = (SOAPBinding) bp.getBinding(); + binding.setMTOMEnabled(true); + + if (eDtlUrl.equalsIgnoreCase(dtlUrl)) + return docservice.getDocument(transferRequest, ""); + else + return docservice.getDocument(transferRequest, eDtlUrl); + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("Error in getDocumentFromDtl", e); + } + } + + /** + * Get a document transfer request (attribute query) + * + * @param docId + * @return + * @throws SimpleException + */ + private String getDocTransferRequest(String docId, String destinationUrl) throws Exception { + String spCountry = docId.substring(0, docId.indexOf("/")); + final STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP"); + STORKAttrQueryRequest req = new STORKAttrQueryRequest(); + req.setAssertionConsumerServiceURL(dtlUrl); + req.setDestination(destinationUrl); + req.setSpCountry(spCountry); + req.setQaa(3);// TODO + PersonalAttributeList pal = new PersonalAttributeList(); + PersonalAttribute attr = new PersonalAttribute(); + attr.setName("docRequest"); + attr.setIsRequired(true); + attr.setValue(Arrays.asList(docId)); + pal.add(attr); + req.setPersonalAttributeList(pal); + + STORKAttrQueryRequest req1; + try { + req1 = engine.generateSTORKAttrQueryRequest(req); + return PEPSUtil.encodeSAMLTokenUrlSafe(req1.getTokenSaml()); + } catch (STORKSAMLEngineException e) { + e.printStackTrace(); + throw new Exception("Error in doc request attribute query generation", e); + } + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java index f8b0dbdab..64899565b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java @@ -69,9 +69,9 @@ import at.gv.egovernment.moa.id.auth.data.IdentityLink; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.GetForeignIDTask; import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser; import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; -import at.gv.egovernment.moa.id.auth.tasks.GetForeignIDTask; import at.gv.egovernment.moa.id.client.SZRGWClientException; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.moduls.ModulUtils; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java index dd5253e77..ffd01299e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java @@ -67,7 +67,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.tasks.GetMISSessionIDTask; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.GetMISSessionIDTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.config.ConnectionParameter; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 02e1cb12d..af4b7ffbb 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -97,7 +97,7 @@ import javax.xml.ws.BindingProvider; /** * Endpoint for receiving STORK response messages - * @deprecated Use {@link at.gv.egovernment.moa.id.auth.tasks.stork.PepsConnectorTask} instead. + * @deprecated Use {@link at.gv.egovernment.moa.id.auth.modules.stork.tasks.PepsConnectorTask} instead. */ public class PEPSConnectorServlet extends AuthServlet { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java index fa80bdab9..c01a356f6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java @@ -109,7 +109,7 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException; /** * Endpoint for receiving STORK response messages - * @deprecated Use {@link at.gv.egovernment.moa.id.auth.tasks.stork.PepsConnectorHandleResponseWithoutSignatureTask} instead. + * @deprecated Use {@link at.gv.egovernment.moa.id.auth.modules.stork.tasks.PepsConnectorHandleResponseWithoutSignatureTask} instead. */ public class PEPSConnectorWithLocalSigningServlet extends AuthServlet { private static final long serialVersionUID = 1L; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java index dc350bfb7..67c42cd07 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java @@ -71,7 +71,7 @@ import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.tasks.VerifyAuthenticationBlockTask; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyAuthenticationBlockTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.ConnectionParameter; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java index 77e401899..82cdb2778 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java @@ -65,7 +65,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.tasks.VerifyCertificateTask; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyCertificateTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java index e94273881..6f2ee2d89 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java @@ -64,7 +64,7 @@ import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.tasks.VerifyIdentityLinkTask; +import at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyIdentityLinkTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java deleted file mode 100644 index 9a5c2baee..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/AbstractAuthServletTask.java +++ /dev/null @@ -1,379 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.lang3.ArrayUtils; - -import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.servlet.AuthServlet; -import at.gv.egovernment.moa.id.config.ConfigurationException; -import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; -import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; -import at.gv.egovernment.moa.id.storage.IExceptionStore; -import at.gv.egovernment.moa.id.util.ServletUtils; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.MiscUtil; - -import com.datentechnik.process_engine.springweb.AbstractSpringWebSupportedTask; - -/** - * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing - * etc.).

                  The code has been taken from {@link AuthServlet}. - */ -public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask { - - protected static final String ERROR_CODE_PARAM = "errorid"; - - protected void handleErrorNoRedirect(String errorMessage, Throwable exceptionThrown, - HttpServletRequest req, HttpServletResponse resp) { - - if (null != errorMessage) { - Logger.error(errorMessage); - req.setAttribute("ErrorMessage", errorMessage); - } - - if (null != exceptionThrown) { - if (null == errorMessage) - errorMessage = exceptionThrown.getMessage(); - Logger.error(errorMessage, exceptionThrown); - req.setAttribute("ExceptionThrown", exceptionThrown); - } - - if (Logger.isDebugEnabled()) { - req.setAttribute("LogLevel", "debug"); - } - - - StatisticLogger logger = StatisticLogger.getInstance(); - logger.logErrorOperation(exceptionThrown); - - - // forward this to errorpage-auth.jsp where the HTML error page is - // generated - ServletContext context = req.getServletContext(); - RequestDispatcher dispatcher = context - .getRequestDispatcher("/errorpage-auth.jsp"); - try { - - resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); - resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); - resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); - - dispatcher.forward(req, resp); - } catch (ServletException e) { - Logger.error(e); - } catch (IOException e) { - Logger.error(e); - } - } - - /** - * Handles an error.
                  > - *
                    - *
                  • Logs the error
                  • - *
                  • Places error message and exception thrown into the request as request - * attributes (to be used by "/errorpage-auth.jsp")
                  • - *
                  • Sets HTTP status 500 (internal server error)
                  • - *
                  - * - * @param errorMessage - * error message - * @param exceptionThrown - * exception thrown - * @param req - * servlet request - * @param resp - * servlet response - */ - protected void handleError(String errorMessage, Throwable exceptionThrown, - HttpServletRequest req, HttpServletResponse resp, String pendingRequestID) { - - if (null != errorMessage) { - Logger.error(errorMessage); - req.setAttribute("ErrorMessage", errorMessage); - } - - if (null != exceptionThrown) { - if (null == errorMessage) - errorMessage = exceptionThrown.getMessage(); - Logger.error(errorMessage, exceptionThrown); - req.setAttribute("ExceptionThrown", exceptionThrown); - } - - if (Logger.isDebugEnabled()) { - req.setAttribute("LogLevel", "debug"); - } - - if (!(exceptionThrown instanceof MOAIDException)) { - Logger.error("Receive an internal error: Message=" + exceptionThrown.getMessage(), exceptionThrown); - - } - - IExceptionStore store = DBExceptionStoreImpl.getStore(); - String id = store.storeException(exceptionThrown); - - if (id != null && MiscUtil.isNotEmpty(pendingRequestID)) { - - String redirectURL = null; - - redirectURL = ServletUtils.getBaseUrl(req); - redirectURL += "/dispatcher?" + ERROR_CODE_PARAM + "=" + id - + "&" + DispatcherServlet.PARAM_TARGET_PENDINGREQUESTID + "=" + pendingRequestID; - - resp.setContentType("text/html"); - resp.setStatus(302); - - resp.addHeader("Location", redirectURL); - Logger.debug("REDIRECT TO: " + redirectURL); - - return; - - } else { - - //Exception can not be stored in database - handleErrorNoRedirect(errorMessage, exceptionThrown, req, resp); - } - } - - /** - * Handles a WrongParametersException. - * - * @param req - * servlet request - * @param resp - * servlet response - */ - protected void handleWrongParameters(WrongParametersException ex, - HttpServletRequest req, HttpServletResponse resp) { - Logger.error(ex.toString()); - req.setAttribute("WrongParameters", ex.getMessage()); - - // forward this to errorpage-auth.jsp where the HTML error page is - // generated - ServletContext context = req.getServletContext(); - RequestDispatcher dispatcher = context - .getRequestDispatcher("/errorpage-auth.jsp"); - try { - setNoCachingHeaders(resp); - dispatcher.forward(req, resp); - } catch (ServletException e) { - Logger.error(e); - } catch (IOException e) { - Logger.error(e); - } - } - - /** - * Logs all servlet parameters for debugging purposes. - */ - protected void logParameters(HttpServletRequest req) { - for (Enumeration params = req.getParameterNames(); params - .hasMoreElements();) { - String parname = (String) params.nextElement(); - Logger.debug("Parameter " + parname + req.getParameter(parname)); - } - } - - /** - * Parses the request input stream for parameters, assuming parameters are - * encoded UTF-8 (no standard exists how browsers should encode them). - * - * @param req - * servlet request - * - * @return mapping parameter name -> value - * - * @throws IOException - * if parsing request parameters fails. - * - * @throws FileUploadException - * if parsing request parameters fails. - */ - protected Map getParameters(HttpServletRequest req) throws IOException, - FileUploadException { - - Map parameters = new HashMap(); - - if (ServletFileUpload.isMultipartContent(req)) { - // request is encoded as mulitpart/form-data - FileItemFactory factory = new DiskFileItemFactory(); - ServletFileUpload upload = null; - upload = new ServletFileUpload(factory); - List items = null; - items = upload.parseRequest(req); - for (int i = 0; i < items.size(); i++) { - FileItem item = (FileItem) items.get(i); - if (item.isFormField()) { - // Process only form fields - no file upload items - String logString = item.getString("UTF-8"); - - // TODO use RegExp - String startS = ""; - String endS = "urn:publicid:gv.at:baseid"; - String logWithMaskedBaseid = logString; - int start = logString.indexOf(startS); - if (start > -1) { - int end = logString.indexOf(endS); - if (end > -1) { - logWithMaskedBaseid = logString.substring(0, start); - logWithMaskedBaseid += startS; - logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; - logWithMaskedBaseid += logString.substring(end, - logString.length()); - } - } - parameters - .put(item.getFieldName(), item.getString("UTF-8")); - Logger.debug("Processed multipart/form-data request parameter: \nName: " - + item.getFieldName() - + "\nValue: " - + logWithMaskedBaseid); - } - } - } - - else { - // request is encoded as application/x-www-urlencoded - // [tknall]: we must not consume request body input stream once servlet-api request parameters have been accessed - - /* - InputStream in = req.getInputStream(); - - String paramName; - String paramValueURLEncoded; - do { - paramName = new String(readBytesUpTo(in, '=')); - if (paramName.length() > 0) { - paramValueURLEncoded = readBytesUpTo(in, '&'); - String paramValue = URLDecoder.decode(paramValueURLEncoded, - "UTF-8"); - parameters.put(paramName, paramValue); - } - } while (paramName.length() > 0); - in.close(); - */ - - Iterator> requestParamIt = req.getParameterMap().entrySet().iterator(); - while (requestParamIt.hasNext()) { - Entry entry = requestParamIt.next(); - String key = entry.getKey(); - String[] values = entry.getValue(); - // take the last value from the value array since the legacy code above also does it this way - parameters.put(key, ArrayUtils.isEmpty(values) ? null : values[values.length-1]); - } - - } - - return parameters; - } - - /** - * Reads bytes up to a delimiter, consuming the delimiter. - * - * @param in - * input stream - * @param delimiter - * delimiter character - * @return String constructed from the read bytes - * @throws IOException - */ - protected String readBytesUpTo(InputStream in, char delimiter) - throws IOException { - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - boolean done = false; - int b; - while (!done && (b = in.read()) >= 0) { - if (b == delimiter) - done = true; - else - bout.write(b); - } - return bout.toString(); - } - - /** - * Sets response headers that prevent caching (code taken from {@link AuthServlet}). - * - * @param resp - * The HttpServletResponse. - */ - public void setNoCachingHeaders(HttpServletResponse resp) { - resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); - resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); - resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); - } - - /** - * Adds a parameter to a URL. - * - * @param url - * the URL - * @param paramname - * parameter name - * @param paramvalue - * parameter value - * @return the URL with parameter added - */ - protected static String addURLParameter(String url, String paramname, - String paramvalue) { - String param = paramname + "=" + paramvalue; - if (url.indexOf("?") < 0) - return url + "?" + param; - else - return url + "&" + param; - } - - /** - * Checks if HTTP requests are allowed - * - * @param authURL - * requestURL - * @throws AuthenticationException - * if HTTP requests are not allowed - * @throws ConfigurationException - */ - protected void checkIfHTTPisAllowed(String authURL) - throws AuthenticationException, ConfigurationException { - // check if HTTP Connection may be allowed (through - // FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY) - - //Removed from MOA-ID 2.0 config -// String boolStr = AuthConfigurationProvider -// .getInstance() -// .getGenericConfigurationParameter( -// AuthConfigurationProvider.FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY); - if ((!authURL.startsWith("https:")) - //&& (false == BoolUtils.valueOf(boolStr)) - ) - throw new AuthenticationException("auth.07", new Object[] { authURL - + "*" }); - - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java deleted file mode 100644 index 8cd0db679..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CertificateReadRequestTask.java +++ /dev/null @@ -1,101 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang3.BooleanUtils; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.ServletUtils; -import at.gv.egovernment.moa.logging.Logger; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Creates {@code InfoBoxReadRequest} in order to read the subject's certificates.
                  • - *
                  • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code /VerifyCertificate}
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  - * Result: - *
                    - *
                  • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code {/VerifyCertificate}
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class CertificateReadRequestTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - // TODO[branch]: Foreign citizen or mandate mode; respond with IRR for certificates, dataURL = "/VerifyCertificate" - Logger.info("Send InfoboxReadRequest to BKU to get signer certificate."); - - setNoCachingHeaders(resp); - - String pendingRequestID = null; - - try { - - String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) { - throw new WrongParametersException("CertificateReadRequestTask", PARAM_SESSIONID, "auth.12"); - } - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - AuthenticationSession session = AuthenticationServer.getSession(sessionID); - - boolean useMandate = session.getUseMandate(); - boolean identityLinkAvailable = BooleanUtils.isTrue((Boolean) executionContext.get("identityLinkAvailable")); - - if (!identityLinkAvailable && useMandate) { - Logger.error("Online-Mandate Mode for foreign citizencs not supported."); - throw new AuthenticationException("auth.13", null); - } - - // change MOASessionID - AuthenticationSessionStoreage.changeSessionID(session); - - // create the InfoboxReadRequest to get the certificate - String infoboxReadRequest = new InfoboxReadRequestBuilderCertificate().build(true); - - // build dataurl (to the VerifyCertificateSerlvet) - String dataurl = new DataURLBuilder().buildDataURL(session.getAuthURL(), REQ_VERIFY_CERTIFICATE, - session.getSessionID()); - - ServletUtils.writeCreateXMLSignatureRequest(resp, infoboxReadRequest, - AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink", dataurl); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - } finally { - ConfigurationDBUtils.closeSession(); - } - - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java deleted file mode 100644 index ff55eedeb..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/CreateIdentityLinkFormTask.java +++ /dev/null @@ -1,120 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import java.io.PrintWriter; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang3.ObjectUtils; - -import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; -import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.MiscUtil; -import at.gv.egovernment.moa.util.StringUtils; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Creates a http form including an embedded {@code InfoBoxReadRequest} for reading the identity link.

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Removes ExecutionContext property {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}.
                  • - *
                  • Creates the http form mentioned above.
                  • - *
                  • Returns the http form via HttpServletResponse.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID} or
                  • - *
                  • ExecutionContext property {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID} (in case of legacy authentication without CCE selection, where the moa session is not provided by request parameter).
                  • - *
                  - * Result: - *
                    - *
                  • The identity link form via HttpServletResponse.
                  • - *
                  - * Possible branches: - *
                    - *
                  • In case of STORK authentication - *
                      - *
                    • Creates STORK auth SAML request.
                    • - *
                    • Creates and returns a form for submitting the SAML request to the CPEPS (post binding).
                    • - *
                    • Returns the form via HttpServletResponse.
                    • - *
                    - *
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class CreateIdentityLinkFormTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - String pendingRequestID = null; - String moasessionid = StringEscapeUtils.escapeHtml(ObjectUtils.defaultIfNull(req.getParameter(PARAM_SESSIONID), (String) executionContext.get(PARAM_SESSIONID))); - AuthenticationSession moasession = null; - try { - - if (MiscUtil.isEmpty(moasessionid)) { - Logger.warn("MOASessionID is empty."); - throw new MOAIDException("auth.18", new Object[] {}); - } - - try { - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moasessionid); - moasession = AuthenticationSessionStoreage.getSession(moasessionid); - AuthenticationSessionStoreage.changeSessionID(moasession); - executionContext.remove(PARAM_SESSIONID); - - } catch (MOADatabaseException e) { - Logger.info("MOASession with SessionID=" + moasessionid + " is not found in Database"); - throw new MOAIDException("init.04", new Object[] { moasessionid }); - - } catch (Throwable e) { - Logger.info("No HTTP Session found!"); - throw new MOAIDException("auth.18", new Object[] {}); - } - - StartAuthenticationBuilder startauth = StartAuthenticationBuilder.getInstance(); - String getIdentityLinkForm = startauth.build(moasession, req, resp); - - if (!StringUtils.isEmpty(getIdentityLinkForm)) { - resp.setContentType("text/html;charset=UTF-8"); - PrintWriter out = new PrintWriter(resp.getOutputStream()); - out.print(getIdentityLinkForm); - out.flush(); - Logger.debug("Finished GET " + GenerateIFrameTemplateServlet.class); - } - - } catch (WrongParametersException ex) { - handleWrongParameters(ex, req, resp); - } - - catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("CreateIdentityLinkFormTask has an interal Error.", e); - - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java deleted file mode 100644 index 2ce6a1ae8..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetForeignIDTask.java +++ /dev/null @@ -1,182 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.security.cert.CertificateException; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.TransformerException; - -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.lang.StringEscapeUtils; -import org.w3c.dom.Element; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse; -import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.ParseException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser; -import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; -import at.gv.egovernment.moa.id.client.SZRGWClientException; -import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.DOMUtils; -import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Evaluates the {@code CreateXMLSignatureResponse}, extracts signature and certificate and asks the SZR Gateway for an identity link.

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Parses the CreateXMLSignatureResponse retrieved from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • - *
                  • Extracts signature and signer certificate.
                  • - *
                  • Send request to SZR Gateway in order to get an identity link.
                  • - *
                  • Updates moa session (sets identity link, QAA level 4, authentication data and foreigner flag).
                  • - *
                  • Redirects back to {@code /dispatcher} in order to finalize authentication.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
                  • - *
                  - * Result: - *
                    - *
                  • Identity link, QAA level 4 and foreigner flag put into moa session.
                  • - *
                  • Redirect to {@code /dispatcher}.
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class GetForeignIDTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - Logger.debug("POST GetForeignIDServlet"); - - setNoCachingHeaders(resp); - - Map parameters; - - try { - parameters = getParameters(req); - } catch (FileUploadException e) { - Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); - throw new IOException(e.getMessage()); - } - - String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - String pendingRequestID = null; - String redirectURL = null; - AuthenticationSession session = null; - try { - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) { - throw new WrongParametersException("GetForeignID", PARAM_SESSIONID, "auth.12"); - } - String xmlCreateXMLSignatureResponse = (String) parameters.get(PARAM_XMLRESPONSE); - if (!ParamValidatorUtils.isValidXMLDocument(xmlCreateXMLSignatureResponse)) { - throw new WrongParametersException("GetForeignID", PARAM_XMLRESPONSE, "auth.12"); - } - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - session = AuthenticationServer.getSession(sessionID); - - // change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - - Logger.debug(xmlCreateXMLSignatureResponse); - - CreateXMLSignatureResponse csresp = new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse) - .parseResponseDsig(); - - try { - String serializedAssertion = DOMUtils.serializeNode(csresp.getDsigSignature()); - session.setAuthBlock(serializedAssertion); - - } catch (TransformerException e) { - throw new ParseException("parser.04", new Object[] { REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE }); - - } catch (IOException e) { - throw new ParseException("parser.04", new Object[] { REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE }); - - } - - Element signature = csresp.getDsigSignature(); - - try { - session.setSignerCertificate(AuthenticationServer.getCertificateFromXML(signature)); - } catch (CertificateException e) { - Logger.error("Could not extract certificate from CreateXMLSignatureResponse"); - throw new MOAIDException("auth.14", null); - } - - // make SZR request to the identity link - CreateIdentityLinkResponse response = AuthenticationServer.getInstance().getIdentityLink(signature); - - if (null != response.getErrorResponse()) { - // TODO fix exception parameter - throw new SZRGWClientException("service.08", (String) response.getErrorResponse().getErrorCode(), - (String) response.getErrorResponse().getInfo()); - } else { - IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream( - response.getIdentityLink())); - IdentityLink identitylink = ilParser.parseIdentityLink(); - session.setIdentityLink(identitylink); - - // set QAA Level four in case of card authentifcation - session.setQAALevel(PVPConstants.STORK_QAA_1_4); - - AuthenticationServer.getInstance().getForeignAuthenticationData(session); - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); - - Logger.info("Changed MOASession " + sessionID + " to Session " + newMOASessionID); - Logger.info("Daten angelegt zu MOASession " + newMOASessionID); - - redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), - ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), - newMOASessionID); - redirectURL = resp.encodeRedirectURL(redirectURL); - - // TODO[branch]: Final step back to /dispatcher - - try { - AuthenticationSessionStoreage.storeSession(session); - } catch (MOADatabaseException e) { - throw new MOAIDException("Session store error", null); - } - - resp.setContentType("text/html"); - resp.setStatus(302); - resp.addHeader("Location", redirectURL); - Logger.debug("REDIRECT TO: " + redirectURL); - } - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("GetForeignIDServlet has an interal Error.", e); - - } - - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java deleted file mode 100644 index a7ee086af..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/GetMISSessionIDTask.java +++ /dev/null @@ -1,181 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; -import iaik.pki.PKIException; - -import java.security.GeneralSecurityException; -import java.util.List; - -import javax.net.ssl.SSLSocketFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.parsers.ParserConfigurationException; - -import org.apache.commons.lang.StringEscapeUtils; -import org.xml.sax.SAXException; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.ConnectionParameter; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.SSLUtils; -import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate; -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.DOMUtils; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Retrieves a mandate from the online mandate issuing service.

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Retrieves the mandate referenced within the moa session from the online (external) mandate issuing service.
                  • - *
                  • Verifies the mandate.
                  • - *
                  • Puts mandate into moa session.
                  • - *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  - * Result: - *
                    - *
                  • Mandate put into moa session.
                  • - *
                  • Redirect to {@code /dispatcher}.
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class GetMISSessionIDTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - Logger.debug("POST GetMISSessionIDServlet"); - - String sessionID = req.getParameter(PARAM_SESSIONID); - - // escape parameter strings - sessionID = StringEscapeUtils.escapeHtml(sessionID); - - AuthenticationSession session = null; - String pendingRequestID = null; - try { - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) - throw new WrongParametersException("VerifyCertificate", - PARAM_SESSIONID, "auth.12"); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - session = AuthenticationServer.getSession(sessionID); - - //change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - - String misSessionID = session.getMISSessionID(); - - AuthConfigurationProvider authConf = AuthConfigurationProvider - .getInstance(); - ConnectionParameter connectionParameters = authConf - .getOnlineMandatesConnectionParameter(); - SSLSocketFactory sslFactory = SSLUtils.getSSLSocketFactory( - AuthConfigurationProvider.getInstance(), - connectionParameters); - - List list = MISSimpleClient.sendGetMandatesRequest( - connectionParameters.getUrl(), misSessionID, sslFactory); - - if (list == null || list.size() == 0) { - Logger.error("Keine Vollmacht gefunden."); - throw new AuthenticationException("auth.15", null); - } - - // for now: list contains only one element - MISMandate mandate = (MISMandate) list.get(0); - - // TODO[tlenz]: UTF-8 ? - String sMandate = new String(mandate.getMandate()); - if (sMandate == null || sMandate.compareToIgnoreCase("") == 0) { - Logger.error("Mandate is empty."); - throw new AuthenticationException("auth.15", - new Object[] { GET_MIS_SESSIONID }); - } - - //check if it is a parsable XML - byte[] byteMandate = mandate.getMandate(); - // TODO[tlenz]: UTF-8 ? - String stringMandate = new String(byteMandate); - DOMUtils.parseDocument(stringMandate, false, - null, null).getDocumentElement(); - - // extract RepresentationType - AuthenticationServer.getInstance().verifyMandate(session, mandate); - - session.setMISMandate(mandate); - session.setAuthenticatedUsed(false); - session.setAuthenticated(true); - - //set QAA Level four in case of card authentifcation - session.setQAALevel(PVPConstants.STORK_QAA_1_4); - - String oldsessionID = session.getSessionID(); - - //Session is implicite stored in changeSessionID!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); - - Logger.info("Changed MOASession " + oldsessionID + " to Session " + newMOASessionID); - Logger.info("Daten angelegt zu MOASession " + newMOASessionID); - - String redirectURL = new DataURLBuilder().buildDataURL( - session.getAuthURL(), - ModulUtils.buildAuthURL(session.getModul(), - session.getAction(), pendingRequestID), newMOASessionID); - redirectURL = resp.encodeRedirectURL(redirectURL); - - // TODO[branch]: Final step back to /dispatcher - - resp.setContentType("text/html"); - resp.setStatus(302); - resp.addHeader("Location", redirectURL); - Logger.debug("REDIRECT TO: " + redirectURL); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (GeneralSecurityException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (PKIException e) { - handleError(null, e, req, resp, pendingRequestID); - - } catch (SAXException e) { - handleError(null, e, req, resp, pendingRequestID); - - } catch (ParserConfigurationException e) { - handleError(null, e, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("MISMandateValidation has an interal Error.", e); - - } - finally { - ConfigurationDBUtils.closeSession(); - } - - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java deleted file mode 100644 index 566616fcd..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/PrepareAuthBlockSignatureTask.java +++ /dev/null @@ -1,102 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringEscapeUtils; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.ServletUtils; -import at.gv.egovernment.moa.logging.Logger; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Creates {@code CreateXMLSignatureRequest} for auth block signature.

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Creates {@code CreateXMLSignatureRequest} for auth block signature.
                  • - *
                  • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  - * Result: - *
                    - *
                  • Responds with {@code CreateXMLSignatureRequest} (for CCE), {@code DataURL} is {@code {/VerifyAuthBlock}
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class PrepareAuthBlockSignatureTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet - - Logger.debug("Process IdentityLink"); - - setNoCachingHeaders(resp); - - String pendingRequestID = null; - - try { - - String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) { - throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); - } - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - AuthenticationSession session = AuthenticationServer.getSession(sessionID); - - // change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - - Logger.info("Normal"); - - // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - session.getPublicOAURLPrefix()); - AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance(); - - String createXMLSignatureRequest = AuthenticationServer.getInstance() - .getCreateXMLSignatureRequestAuthBlockOrRedirect(session, authConf, oaParam); - - AuthenticationSessionStoreage.storeSession(session); - - ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, - createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, - "VerifyIdentityLink"); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("IdentityLinkValidation has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java deleted file mode 100644 index 956ec9c88..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyAuthenticationBlockTask.java +++ /dev/null @@ -1,246 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import iaik.pki.PKIException; - -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.util.List; -import java.util.Map; - -import javax.net.ssl.SSLSocketFactory; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.TransformerException; - -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.lang.StringEscapeUtils; -import org.w3c.dom.Element; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; -import at.gv.egovernment.moa.id.config.ConnectionParameter; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.SSLUtils; -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSessionId; -import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.DOMUtils; - -import com.datentechnik.process_engine.api.ExecutionContext; -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -/** - * Verifies the signed authentication block (provided as {@code CreateXMLSignatureResponse}).

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Takes the {@code CreateXMLSignatureResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • - *
                  • Verifies the {@code CreateXMLSignatureResponse}.
                  • - *
                  • Updates moa session.
                  • - *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code CreateXMLSignatureResponse}.
                  • - *
                  - * Result: - *
                    - *
                  • Authentication data put into moa session.
                  • - *
                  • Redirect to {@code /dispatcher}.
                  • - *
                  - * Possible branches: - *
                    - *
                  • In case of mandate mode - *
                      - *
                    • Creates a mandate session at the external mandate issuing service.
                    • - *
                    • Redirects the user's browser to the online mandate issuing service GUI.
                    • - *
                    - *
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet - - Logger.debug("POST VerifyAuthenticationBlock"); - - String pendingRequestID = null; - - Map parameters; - try - { - parameters = getParameters(req); - } catch (FileUploadException e) - { - Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); - throw new IOException(e.getMessage()); - - } - String sessionID = req.getParameter(PARAM_SESSIONID); - String createXMLSignatureResponse = (String)parameters.get(PARAM_XMLRESPONSE); - - // escape parameter strings - sessionID = StringEscapeUtils.escapeHtml(sessionID); - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - String redirectURL = null; - try { - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) - throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); - if (!ParamValidatorUtils.isValidXMLDocument(createXMLSignatureResponse)) - throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_XMLRESPONSE, "auth.12"); - - AuthenticationSession session = AuthenticationServer.getSession(sessionID); - - //change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - - String authenticatedMOASessionId = AuthenticationServer.getInstance().verifyAuthenticationBlock(session, createXMLSignatureResponse); - - if (authenticatedMOASessionId == null) { - //mandate Mode - - AuthConfigurationProvider authConf= AuthConfigurationProvider.getInstance(); - ConnectionParameter connectionParameters = authConf.getOnlineMandatesConnectionParameter(); - SSLSocketFactory sslFactory = SSLUtils.getSSLSocketFactory(AuthConfigurationProvider.getInstance(), connectionParameters); - - // get identitity link as byte[] - Element elem = session.getIdentityLink().getSamlAssertion(); - String s = DOMUtils.serializeNode(elem); - - //System.out.println("IDL: " + s); - - byte[] idl = s.getBytes("UTF-8"); - - // redirect url - // build redirect(to the GetMISSessionIdSerlvet) - - //change MOASessionID before MIS request - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); - - redirectURL = - new DataURLBuilder().buildDataURL( - session.getAuthURL(), - GET_MIS_SESSIONID, - newMOASessionID); - - String oaURL = session.getOAURLRequested(); - OAAuthParameter oaParam = authConf.getOnlineApplicationParameter(oaURL); - List profiles = oaParam.getMandateProfiles(); - - if (profiles == null) { - Logger.error("No Mandate/Profile for OA configured."); - throw new AuthenticationException("config.21", new Object[] { GET_MIS_SESSIONID}); - } - - String oaFriendlyName = oaParam.getFriendlyName(); - String mandateReferenceValue = session.getMandateReferenceValue(); - byte[] cert = session.getEncodedSignerCertificate(); - byte[] authBlock = session.getAuthBlock().getBytes("UTF-8"); - - //TODO: check in case of SSO!!! - String targetType = null; - if(oaParam.getBusinessService()) { - String id = oaParam.getIdentityLinkDomainIdentifier(); - if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) - targetType = id; - else - targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_+session.getDomainIdentifier(); - - } else { - targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); - } - - MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest( - connectionParameters.getUrl(), - idl, - cert, - oaFriendlyName, - redirectURL, - mandateReferenceValue, - profiles, - targetType, - authBlock, - sslFactory); - - if (misSessionID == null) { - Logger.error("Fehler bei Anfrage an Vollmachten Service. MIS Session ID ist null."); - throw new MISSimpleClientException("Fehler bei Anfrage an Vollmachten Service."); - } - - String redirectMISGUI = misSessionID.getRedirectURL(); - session.setMISSessionID(misSessionID.getSessiondId()); - - try { - AuthenticationSessionStoreage.storeSession(session); - } catch (MOADatabaseException e) { - throw new MOAIDException("Session store error", null); - } - - // TODO[branch]: Mandate; redirect to MIS website; website redirects back to "/GetMISSessionID" - - resp.setStatus(302); - resp.addHeader("Location", redirectMISGUI); - Logger.debug("REDIRECT TO: " + redirectURL); - } - else { - // TODO[branch]: Final step back to /dispatcher - redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), - ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID), authenticatedMOASessionId); - - resp.setContentType("text/html"); - resp.setStatus(302); - - resp.addHeader("Location", redirectURL); - Logger.debug("REDIRECT TO: " + redirectURL); - - } - - } - - catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (GeneralSecurityException e) { - handleError(null, e, req, resp, pendingRequestID); - - } catch (PKIException e) { - handleError(null, e, req, resp, pendingRequestID); - - } catch (TransformerException e) { - handleError(null, e, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("AuthBlockValidation has an interal Error.", e); - } - - - finally { - ConfigurationDBUtils.closeSession(); - } - - - - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java deleted file mode 100644 index 854c78161..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyCertificateTask.java +++ /dev/null @@ -1,164 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.lang.StringEscapeUtils; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.id.util.ServletUtils; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.spss.util.CertificateUtils; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Parses the certificate from {@code InfoBoxReadResponse} (via POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}), creates the auth block to be signed and returns a {@code CreateXMLSignatureRequest} for auth block signature.

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Retrieves the certificate via {@code InfoBoxReadResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • - *
                  • Verifies the certificate.
                  • - *
                  • Creates the auth block to be signed using information from the certificate (Organwalter, foreign citizen.
                  • - *
                  • Puts it in a {@code CreateXMLSignatureRequest}.
                  • - *
                  • Updates moa session.
                  • - *
                  • Responds with {@code CreateXMLSignatureRequest}.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_SESSIONID} containing a {@code InfoBoxReadResponse}.
                  • - *
                  - * Result: - *
                    - *
                  • {@code CreateXMLSignatureRequest} send as HttpServletResponse (for CCE).
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class VerifyCertificateTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet - - Logger.debug("POST VerifyCertificateServlet"); - - String pendingRequestID = null; - - Map parameters; - try - { - parameters = getParameters(req); - } catch (FileUploadException e) - { - Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); - throw new IOException(e.getMessage()); - } - String sessionID = req.getParameter(PARAM_SESSIONID); - - // escape parameter strings - sessionID = StringEscapeUtils.escapeHtml(sessionID); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - AuthenticationSession session = null; - try { - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) - throw new WrongParametersException("VerifyCertificate", PARAM_SESSIONID, "auth.12"); - - session = AuthenticationServer.getSession(sessionID); - - //change MOASessionID - sessionID = AuthenticationSessionStoreage.changeSessionID(session); - - X509Certificate cert = AuthenticationServer.getInstance().getCertificate(sessionID, parameters); - if (cert == null) { - Logger.error("Certificate could not be read."); - throw new AuthenticationException("auth.14", null); - } - - boolean useMandate = session.getUseMandate(); - - if (useMandate) { - - // verify certificate for OrganWalter - String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyCertificate(session, cert); - - try { - AuthenticationSessionStoreage.storeSession(session); - } catch (MOADatabaseException e) { - throw new MOAIDException("session store error", null); - } - - // TODO[branch]: Mandate; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyCertificate"); - - } - else { - - - String countrycode = CertificateUtils.getIssuerCountry(cert); - if (countrycode != null) { - if (countrycode.compareToIgnoreCase("AT") == 0) { - Logger.error("Certificate issuer country code is \"AT\". Login not support in foreign identities mode."); - throw new AuthenticationException("auth.22", null); - } - } - - // Foreign Identities Modus - String createXMLSignatureRequest = AuthenticationServer.getInstance().createXMLSignatureRequestForeignID(session, cert); - // build dataurl (to the GetForeignIDSerlvet) - String dataurl = - new DataURLBuilder().buildDataURL( - session.getAuthURL(), - REQ_GET_FOREIGN_ID, - session.getSessionID()); - - try { - AuthenticationSessionStoreage.storeSession(session); - } catch (MOADatabaseException e) { - throw new MOAIDException("session store error", null); - } - - // TODO[branch]: Foreign citizen; respond with CXSR for authblock signature, dataURL "/GetForeignID" - ServletUtils.writeCreateXMLSignatureRequest(resp, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl); - - Logger.debug("Send CreateXMLSignatureRequest to BKU"); - } - } - catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("CertificateValidation has an interal Error.", e); - } - - - finally { - ConfigurationDBUtils.closeSession(); - } - - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java deleted file mode 100644 index eb884e9db..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/VerifyIdentityLinkTask.java +++ /dev/null @@ -1,103 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import java.io.IOException; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringEscapeUtils; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.ParseException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.logging.Logger; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Verifies the identity link.

                  - * In detail: - *

                    - *
                  • Renames the moa session id.
                  • - *
                  • Parses the identity link retrieved as {@code InfoBoxReadResponse} from POST parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE}.
                  • - *
                  • Verifies the identity link.
                  • - *
                  • Updates moa session.
                  • - *
                  • Puts boolean flag {@code identityLinkAvailable} into {@code ExecutionContext}.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_XMLRESPONSE PARAM_XMLRESPONSE} containing a {@code InfoBoxReadResponse}.
                  • - *
                  - * Result: - *
                    - *
                  • Identity link put into moa session.
                  • - *
                  • Boolean flag {@code identityLinkAvailable} into {@code ExecutionContext}.
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - * - */ -public class VerifyIdentityLinkTask extends AbstractAuthServletTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - // note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet - - Logger.debug("POST VerifyIdentityLink"); - - setNoCachingHeaders(resp); - - Map parameters; - String pendingRequestID = null; - - try { - parameters = getParameters(req); - } catch (Exception e) { - Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage()); - throw new IOException(e.getMessage()); - } - - try { - - String sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) { - throw new WrongParametersException("VerifyIdentityLink", PARAM_SESSIONID, "auth.12"); - } - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - AuthenticationSession session = AuthenticationServer.getSession(sessionID); - - boolean identityLinkAvailable = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters) != null; - AuthenticationSessionStoreage.storeSession(session); - - executionContext.put("identityLinkAvailable", identityLinkAvailable); - - } catch (ParseException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("IdentityLinkValidation has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java deleted file mode 100644 index eff7fe43f..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/AbstractPepsConnectorWithLocalSigningTask.java +++ /dev/null @@ -1,258 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks.stork; - -import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.security.cert.CertificateException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import javax.activation.DataSource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactoryConfigurationError; -import javax.xml.transform.stream.StreamSource; - -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.opensaml.saml2.core.StatusCode; -import org.xml.sax.SAXException; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.BKUException; -import at.gv.egovernment.moa.id.auth.exception.BuildException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.ParseException; -import at.gv.egovernment.moa.id.auth.exception.ServiceException; -import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; -import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; -import at.gv.egovernment.moa.id.config.ConfigurationException; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.HTTPUtils; -import at.gv.egovernment.moa.id.util.VelocityProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.spss.MOAException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.SignatureVerificationService; -import at.gv.egovernment.moa.spss.api.common.Content; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; -import at.gv.egovernment.moa.util.StringUtils; -import at.gv.util.xsd.xmldsig.SignatureType; -import at.gv.util.xsd.xmldsig.X509DataType; - -import com.datentechnik.process_engine.api.ExecutionContext; - -import eu.stork.oasisdss.api.ApiUtils; -import eu.stork.oasisdss.api.LightweightSourceResolver; -import eu.stork.oasisdss.api.exceptions.ApiUtilsException; -import eu.stork.oasisdss.api.exceptions.UtilsException; -import eu.stork.oasisdss.profile.SignRequest; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.STORKAuthnRequest; -import eu.stork.peps.auth.commons.STORKAuthnResponse; -import eu.stork.peps.auth.engine.STORKSAMLEngine; -import eu.stork.peps.exceptions.STORKSAMLEngineException; - -public abstract class AbstractPepsConnectorWithLocalSigningTask extends AbstractAuthServletTask { - - String getCitizienSignatureFromSignResponse(SignResponse dssSignResponse) throws IllegalArgumentException, - TransformerConfigurationException, UtilsException, TransformerException, - TransformerFactoryConfigurationError, IOException, ApiUtilsException { - // fetch signed doc - DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); - if (ds == null) { - throw new ApiUtilsException("No datasource found in response"); - } - - InputStream incoming = ds.getInputStream(); - String citizenSignature = IOUtils.toString(incoming); - incoming.close(); - - return citizenSignature; - } - - void SZRGInsertion(AuthenticationSession moaSession, IPersonalAttributeList personalAttributeList, - String authnContextClassRef, String citizenSignature) throws STORKException, MOAIDException { - Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); - Logger.debug("Citizen signature will be verified by SZR Gateway!"); - - Logger.debug("fetching OAParameters from database"); - - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - moaSession.getPublicOAURLPrefix()); - if (oaParam == null) - throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); - - // retrieve target - // TODO: check in case of SSO!!! - String targetType = null; - if (oaParam.getBusinessService()) { - String id = oaParam.getIdentityLinkDomainIdentifier(); - if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) - targetType = id; - else - targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); - } else { - targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); - } - - Logger.debug("Starting connecting SZR Gateway"); - // contact SZR Gateway - IdentityLink identityLink = null; - - identityLink = STORKResponseProcessor.connectToSZRGateway(personalAttributeList, oaParam.getFriendlyName(), - targetType, null, oaParam.getMandateProfiles(), citizenSignature); - Logger.debug("SZR communication was successfull"); - - if (identityLink == null) { - Logger.error("SZR Gateway did not return an identity link."); - throw new MOAIDException("stork.10", null); - } - Logger.info("Received Identity Link from SZR Gateway"); - moaSession.setIdentityLink(identityLink); - - Logger.debug("Adding addtional STORK attributes to MOA session"); - moaSession.setStorkAttributes(personalAttributeList); - - // We don't have BKUURL, setting from null to "Not applicable" - moaSession.setBkuURL("Not applicable (STORK Authentication)"); - - // free for single use - moaSession.setAuthenticatedUsed(false); - - // stork did the authentication step - moaSession.setAuthenticated(true); - - // TODO: found better solution, but QAA Level in response could be not supported yet - try { - if (authnContextClassRef == null) - authnContextClassRef = PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel(); - moaSession.setQAALevel(authnContextClassRef); - - } catch (Throwable e) { - Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); - moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); - - } - - } - - X509Certificate getSignerCertificate(String citizenSignature) throws CertificateException, JAXBException, - UnsupportedEncodingException { - JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); - SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( - IOUtils.toInputStream(citizenSignature))).getValue(); - - // extract certificate - for (Object current : root.getKeyInfo().getContent()) - if (((JAXBElement) current).getValue() instanceof X509DataType) { - for (Object currentX509Data : ((JAXBElement) current).getValue() - .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { - JAXBElement casted = ((JAXBElement) currentX509Data); - if (casted.getName().getLocalPart().equals("X509Certificate")) { - return new X509Certificate(((String) casted.getValue()).getBytes("UTF-8")); - } - } - } - return null; - } - - VerifyXMLSignatureResponse verifyXMLSignature(String signature) throws AuthenticationException, ParseException, - BKUException, BuildException, ConfigurationException, ServiceException, UnsupportedEncodingException, - SAXException, IOException, ParserConfigurationException, MOAException { - // Based on MOA demo client - // Factory und Service instanzieren - SPSSFactory spssFac = SPSSFactory.getInstance(); - SignatureVerificationService sigVerifyService = SignatureVerificationService.getInstance(); - - Content sigDocContent1 = spssFac.createContent(IOUtils.toInputStream(signature, "UTF-8"), null); - - // Position der zu prüfenden Signatur im Dokument angeben - // (Nachdem im XPath-Ausdruck ein NS-Präfix verwendet wird, muss in einer Lookup-Tabelle - // der damit bezeichnete Namenraum mitgegeben werden) - HashMap nSMap = new HashMap(); - nSMap.put("dsig", "http://www.w3.org/2000/09/xmldsig#"); - VerifySignatureLocation sigLocation = spssFac.createVerifySignatureLocation("//dsig:Signature", nSMap); - - // Zu prüfendes Dokument und Signaturposition zusammenfassen - - VerifySignatureInfo sigInfo = spssFac.createVerifySignatureInfo(sigDocContent1, sigLocation); - - // Prüfrequest zusammenstellen - VerifyXMLSignatureRequest verifyRequest = spssFac.createVerifyXMLSignatureRequest(null, // Wird Prüfzeit nicht - // angegeben, wird - // aktuelle Zeit - // verwendet - sigInfo, null, // Keine Ergänzungsobjekte notwendig - null, // Signaturmanifest-Prüfung soll nicht durchgeführt werden - false, // Hash-Inputdaten, d.h. tatsächlich signierte Daten werden nicht zurückgeliefert - "MOAIDBuergerkartePersonenbindungMitTestkarten");// TODO load from config - // "Test-Signaturdienste"); // ID des verwendeten Vertrauensprofils - - VerifyXMLSignatureResponse verifyResponse = null; - try { - // Aufruf der Signaturprüfung - verifyResponse = sigVerifyService.verifyXMLSignature(verifyRequest); - } catch (MOAException e) { - // Service liefert Fehler - System.err.println("Die Signaturprüfung hat folgenden Fehler geliefert:"); - System.err.println("Fehlercode: " + e.getMessageId()); - System.err.println("Fehlernachricht: " + e.getMessage()); - throw e; - } - - return verifyResponse; - } - - at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse convert( - VerifyXMLSignatureResponse xMLVerifySignatureResponse) { - at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse response = new at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse(); - response.setCertificateCheckCode(xMLVerifySignatureResponse.getCertificateCheck().getCode()); - response.setPublicAuthority(xMLVerifySignatureResponse.getSignerInfo().isPublicAuthority()); - // response.setPublicAuthorityCode(publicAuthorityCode) - response.setQualifiedCertificate(xMLVerifySignatureResponse.getSignerInfo().isQualifiedCertificate()); - response.setSignatureCheckCode(xMLVerifySignatureResponse.getSignatureCheck().getCode()); - response.setSignatureManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); - // response.setSigningDateTime() - // response.setX509certificate(x509certificate) - response.setXmlDSIGManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); - // response.setXmlDSIGManigest(xMLVerifySignatureResponse.getSignatureManifestCheck()) - // response.setXmlDsigSubjectName(xmlDsigSubjectName) - return response; - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java deleted file mode 100644 index 3894567ed..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/CreateStorkAuthRequestFormTask.java +++ /dev/null @@ -1,114 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks.stork; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; -import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.stork.CPEPS; -import at.gv.egovernment.moa.id.config.stork.STORKConfig; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.logging.Logger; - -import com.datentechnik.process_engine.api.ExecutionContext; - -/** - * Creates a SAML2 STORK authentication request, embeds it in a form (in order to satisfy saml post binging) and returns the form withing the HttpServletResponse.

                  - * In detail: - *

                    - *
                  • Validates the stork configuration in order to make sure the selected country is supported.
                  • - *
                  • Puts a flag ({@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}) into the ExecutionContext reflecting the capability of the C-PEPS to create xml signatures.
                  • - *
                  • Invokes {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} which
                  • - *
                      - *
                    • Creates and signs a SAML2 stork authentication request.
                    • - *
                    • Creates a signature request for auth block signature (either to be performed by the C-PEPS or locally).
                    • - *
                    • Using the velocity template engine in order to create a form with the embedded stork request.
                    • - *
                    • Writes the form to the response output stream.
                    • - *
                    - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
                  • - *
                  • Property {@code ccc} set within the moa session.
                  • - *
                  - * Result: - *
                    - *
                  • Form containing a SAML2 Stork authentication request and an action url pointing to the selected C-PEPS.
                  • - *
                  • Assertion consumer URL for C-PEPS set either to {@code /PEPSConnector} in case of a C-PEPS supporting xml signatures or {@code /PEPSConnectorWithLocalSigning} if the selected C-PEPS does not support xml signatures.
                  • - *
                  • In case of a C-PEPS not supporting xml signature: moasession with set signedDoc property (containing the signature request for local signing).
                  • - *
                  • ExecutionContext contains the boolean flag {@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}. - *
                  - * Code taken from {@link StartAuthenticationBuilder#build(AuthenticationSession, HttpServletRequest, HttpServletResponse)}.
                  - * Using {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class CreateStorkAuthRequestFormTask extends AbstractAuthServletTask { - - /** - * Boolean value reflecting the capability of the selected c-peps of creating xml signatures. - */ - public static final String PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED = "C-PEPS:XMLSignatureSupported"; - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - String pendingRequestID = null; - String sessionID = null; - try { - setNoCachingHeaders(resp); - - sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) { - throw new WrongParametersException("CreateStorkAuthRequestFormTask", PARAM_SESSIONID, "auth.12"); - } - AuthenticationSession moasession = AuthenticationServer.getSession(sessionID); - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - if (StringUtils.isEmpty(moasession.getCcc())) { - // illegal state; task should not have been executed without a selected country - throw new AuthenticationException("stork.22", new Object[] { sessionID }); - } - STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig(); - if (!storkConfig.isSTORKAuthentication(moasession.getCcc())) { - throw new AuthenticationException("stork.23", new Object[] { moasession.getCcc(), sessionID }); - } - - // STORK authentication - // cpeps cannot be null - CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc()); - Logger.debug("Found C-PEPS configuration for citizen of country: " + moasession.getCcc()); - executionContext.put(PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED, cpeps.isXMLSignatureSupported()); - - Logger.info("Starting STORK authentication for a citizen of country: " + moasession.getCcc()); - AuthenticationServer.startSTORKAuthentication(req, resp, moasession); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("CreateStorkAuthRequestFormTask has an interal Error.", e); - throw new MOAIDException("Internal error.", new Object[] { sessionID }, e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java deleted file mode 100644 index 738988ff7..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleLocalSignResponseTask.java +++ /dev/null @@ -1,218 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks.stork; - -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - -import org.apache.commons.codec.binary.Base64; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.VelocityProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; - -import com.datentechnik.process_engine.api.ExecutionContext; - -import eu.stork.oasisdss.api.ApiUtils; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PersonalAttribute; - -/** - * Processes the citizen's signature, creates identity link using szr gateway and finalizes authentication. - *

                  - * In detail: - *

                    - *
                  • Changes moa session id.
                  • - *
                  • Decodes and validates the sign response, extracting the citizen's signature.
                  • - *
                  • Verifies the citizen's signature.
                  • - *
                  • Create {@code signedDoc} attribute.
                  • - *
                  • Retrieve identity link from SZR gateway using the citizen's signature.
                  • - *
                  • If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. - * Therefore a form is presented asking for the subject's gender. The form finally submits the user back to the - * {@code /PepsConnectorWithLocalSigning} servlet (this task).
                  • - *
                  • The moa session is updated with authentication information.
                  • - *
                  • Change moa session id.
                  • - *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@code moaSessionID}
                  • - *
                  • HttpServletRequest parameter {@code signresponse}
                  • - *
                  - * Result: - *
                    - *
                  • Updated moa id session (signed auth block, signer certificate etc.)
                  • - *
                  • Redirect to {@code /dispatcher}.
                  • - *
                  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
                  • - *
                  - * Possible branches: - *
                    - *
                  • In case the szr gateway throws exception due to missing gender information: - *
                      - *
                    • Returns a form for gender selection with action url back to this servlet/task.
                    • - *
                    - *
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
                  - * - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class PepsConnectorHandleLocalSignResponseTask extends AbstractPepsConnectorWithLocalSigningTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) - throws Exception { - String moaSessionID = request.getParameter("moaSessionID"); - String signResponse = request.getParameter("signresponse"); - Logger.info("moaSessionID:" + moaSessionID); - Logger.info("signResponse:" + signResponse); - - if (moaSessionID != null && signResponse != null) { - // redirect from oasis with signresponse - handleSignResponse(executionContext, request, response); - } else { - // should not occur - throw new IOException("should not occur"); - } - return; - } - - private void handleSignResponse(ExecutionContext executionContext, HttpServletRequest request, - HttpServletResponse response) { - Logger.info("handleSignResponse started"); - String moaSessionID = request.getParameter("moaSessionID"); - String signResponse = request.getParameter("signresponse"); - Logger.info("moaSessionID:" + moaSessionID); - Logger.info("signResponse:" + signResponse); - String pendingRequestID = null; - try { - - // load MOASession from database - AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); - // change MOASessionID - moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); - Logger.info("pendingRequestID:" + pendingRequestID); - String signResponseString = new String(Base64.decodeBase64(signResponse), "UTF8"); - Logger.info("RECEIVED signresponse:" + signResponseString); - // create SignResponse object - Source response1 = new StreamSource(new java.io.StringReader(signResponseString)); - SignResponse dssSignResponse = ApiUtils.unmarshal(response1, SignResponse.class); - - // SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource(new - // java.io.StringReader(Base64.signResponse))); - - String citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); - - // memorize signature into authblock - moaSession.setAuthBlock(citizenSignature); - - X509Certificate cert = getSignerCertificate(citizenSignature); - moaSession.setSignerCertificate(cert); - VerifyXMLSignatureResponse xMLVerifySignatureResponse = verifyXMLSignature(citizenSignature); - at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse tmp = convert(xMLVerifySignatureResponse); - - moaSession.setXMLVerifySignatureResponse(tmp); - executionContext.put("identityLinkAvailable", false); - try { - IPersonalAttributeList personalAttributeList = moaSession.getAuthnResponseGetPersonalAttributeList(); - // Add SignResponse TODO Add signature (extracted from signResponse)? - List values = new ArrayList(); - values.add(signResponseString); - // values.add(citizenSignature); - Logger.debug("Assembling signedDoc attribute"); - PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values, "Available"); - personalAttributeList.add(signedDocAttribute); - - String authnContextClassRef = moaSession.getAuthnContextClassRef(); - SZRGInsertion(moaSession, personalAttributeList, authnContextClassRef, citizenSignature); - executionContext.put("identityLinkAvailable", true); - } catch (STORKException e) { - // this is really nasty but we work against the system here. We are supposed to get the gender attribute - // from - // stork. If we do not, we cannot register the person in the ERnP - we have to have the - // gender for the represented person. So here comes the dirty hack. - if (e.getCause() instanceof STORKException - && e.getCause().getMessage().equals("gender not found in response")) { - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); - VelocityContext context = new VelocityContext(); - context.put("SAMLResponse", request.getParameter("SAMLResponse")); - context.put("action", request.getRequestURL()); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - response.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e1) { - Logger.error("Error sending gender retrival form.", e1); - // httpSession.invalidate(); - throw new MOAIDException("stork.10", null); - } - - return; - } - - Logger.error("Error connecting SZR Gateway", e); - throw new MOAIDException("stork.10", null); - } - - Logger.debug("Add full STORK AuthnResponse to MOA session"); - moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas - // authnResponse? - moaSession.setForeigner(true); - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); - - // redirect - String redirectURL = null; - redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), - ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), - newMOASessionID); - redirectURL = response.encodeRedirectURL(redirectURL); - - response.sendRedirect(redirectURL); - Logger.info("REDIRECT TO: " + redirectURL); - - } catch (AuthenticationException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (MOAIDException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (Exception e) { - Logger.error("PEPSConnector has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java deleted file mode 100644 index 31bc28f5a..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorHandleResponseWithoutSignatureTask.java +++ /dev/null @@ -1,441 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks.stork; - -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.opensaml.saml2.core.StatusCode; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.HTTPUtils; -import at.gv.egovernment.moa.id.util.VelocityProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.StringUtils; - -import com.datentechnik.process_engine.api.ExecutionContext; - -import eu.stork.oasisdss.api.ApiUtils; -import eu.stork.oasisdss.profile.SignRequest; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.STORKAuthnRequest; -import eu.stork.peps.auth.commons.STORKAuthnResponse; -import eu.stork.peps.auth.engine.STORKSAMLEngine; -import eu.stork.peps.exceptions.STORKSAMLEngineException; - -/** - * Validates the SAML response from C-PEPS. - *

                  - * In detail: - *

                    - *
                  • Decodes and validates SAML response from C-PEPS.
                  • - *
                  • Retrieves the moa session using the session id provided by HttpServletRequest parameter {@code RelayState} or by {@code inResponseTo} attribute of the saml response.
                  • - *
                  • Store saml response in moa session.
                  • - *
                  • Change moa session id.
                  • - *
                  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@code moaSessionID} to be {@code null}
                  • - *
                  • HttpServletRequest parameter {@code signresponse} to be {@code null}
                  • - *
                  • HttpServletRequest parameter {@code SAMLResponse}
                  • - *
                  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute within the saml response, both reflecting the moa session id.
                  • - *
                  - * Result: - *
                    - *
                  • Updated moa session (with saml response).
                  • - *
                  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
                  - * - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPepsConnectorWithLocalSigningTask { - - private String oasisDssWebFormURL = "https://testvidp.buergerkarte.at/oasis-dss/DSSWebFormServlet"; - // load from config below - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) - throws Exception { - String moaSessionID = request.getParameter("moaSessionID"); - String signResponse = request.getParameter("signresponse"); - Logger.info("moaSessionID:" + moaSessionID); - Logger.info("signResponse:" + signResponse); - - if (moaSessionID == null && signResponse == null) { - // normal saml response - handleSAMLResponse(executionContext, request, response); - - } else { - // should not occur - throw new IOException("should not occur"); - } - return; - } - - private void handleSAMLResponse(ExecutionContext executionContext, HttpServletRequest request, - HttpServletResponse response) { - Logger.info("handleSAMLResponse started"); - String pendingRequestID = null; - - setNoCachingHeaders(response); - try { - Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); - Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); - - Logger.trace("No Caching headers set for HTTP response"); - - // check if https or only http - super.checkIfHTTPisAllowed(request.getRequestURL().toString()); - - Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); - - // extract STORK Response from HTTP Request - // Decodes SAML Response - byte[] decSamlToken; - try { - decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); - Logger.debug("SAMLResponse: " + new String(decSamlToken)); - - } catch (NullPointerException e) { - Logger.error("Unable to retrieve STORK Response", e); - throw new MOAIDException("stork.04", null); - } - - // Get SAMLEngine instance - STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); - - STORKAuthnResponse authnResponse = null; - try { - // validate SAML Token - Logger.debug("Starting validation of SAML response"); - authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); - Logger.info("SAML response succesfully verified!"); - } catch (STORKSAMLEngineException e) { - Logger.error("Failed to verify STORK SAML Response", e); - throw new MOAIDException("stork.05", null); - } - - Logger.info("STORK SAML Response message succesfully extracted"); - Logger.debug("STORK response: "); - Logger.debug(authnResponse.toString()); - - Logger.debug("Trying to find MOA Session-ID ..."); - // String moaSessionID = request.getParameter(PARAM_SESSIONID); - // first use SAML2 relayState - String moaSessionID = request.getParameter("RelayState"); - - // escape parameter strings - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - // check if SAML2 relaystate includes a MOA sessionID - if (StringUtils.isEmpty(moaSessionID)) { - // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier - - moaSessionID = authnResponse.getInResponseTo(); - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - if (StringUtils.isEmpty(moaSessionID)) { - // No authentication session has been started before - Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); - Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); - throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); - - } else - Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); - - } else - // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); - Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); - - /* - * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because - * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter - */ - // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) - // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); - - // load MOASession from database - AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); - // change MOASessionID - moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Found MOA sessionID: " + moaSessionID); - - String statusCodeValue = authnResponse.getStatusCode(); - - if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { - Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); - throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); - } - - Logger.info("Got SAML response with authentication success message."); - - Logger.debug("MOA session is still valid"); - - STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); - - if (storkAuthnRequest == null) { - Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - throw new MOAIDException("stork.07", null); - } - - Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - - // //////////// incorporate gender from parameters if not in stork response - - IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); - - // but first, check if we have a representation case - if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) - || STORKResponseProcessor.hasAttribute("representative", attributeList) - || STORKResponseProcessor.hasAttribute("represented", attributeList)) { - // in a representation case... - moaSession.setUseMandate("true"); - - // and check if we have the gender value - PersonalAttribute gender = attributeList.get("gender"); - if (null == gender) { - String gendervalue = (String) request.getParameter("gender"); - if (null != gendervalue) { - gender = new PersonalAttribute(); - gender.setName("gender"); - ArrayList tmp = new ArrayList(); - tmp.add(gendervalue); - gender.setValue(tmp); - - authnResponse.getPersonalAttributeList().add(gender); - } - } - } - - - - // //////////////////////////////////////////////////////////////////////// - - Logger.debug("Starting extraction of signedDoc attribute"); - // extract signed doc element and citizen signature - String citizenSignature = null; - try { - PersonalAttribute signedDoc = authnResponse.getPersonalAttributeList().get("signedDoc"); - String signatureInfo = null; - // FIXME: Remove nonsense code (signedDoc attribute... (throw Exception for "should not occur" situations)), adjust error messages in order to reflect the true problem... - if (signedDoc != null) { - signatureInfo = signedDoc.getValue().get(0); - // should not occur - } else { - - // store SAMLResponse - moaSession.setSAMLResponse(request.getParameter("SAMLResponse")); - // store authnResponse - - // moaSession.setAuthnResponse(authnResponse);//not serializable - moaSession.setAuthnResponseGetPersonalAttributeList(authnResponse.getPersonalAttributeList()); - - String authnContextClassRef = null; - try { - authnContextClassRef = authnResponse.getAssertions().get(0).getAuthnStatements().get(0) - .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef(); - } catch (Throwable e) { - Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); - } - - moaSession.setAuthnContextClassRef(authnContextClassRef); - moaSession.setReturnURL(request.getRequestURL()); - - // load signedDoc - String signRequest = moaSession.getSignedDoc(); - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - // set return url to PEPSConnectorWithLocalSigningServlet and add newMOASessionID - // signRequest - - String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix(); - String acsURL = issuerValue - + PEPSConnectorWithLocalSigningServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN; - - String url = acsURL + "?moaSessionID=" + newMOASessionID; - // redirect to OASIS module and sign there - - boolean found = false; - try { - List aps = AuthConfigurationProvider.getInstance() - .getOnlineApplicationParameter(moaSession.getPublicOAURLPrefix()).getStorkAPs(); - Logger.info("Found AttributeProviderPlugins:" + aps.size()); - for (AttributeProviderPlugin ap : aps) { - Logger.info("Found AttributeProviderPlugin attribute:" + ap.getAttributes()); - if (ap.getAttributes().equalsIgnoreCase("signedDoc")) { - // FIXME: A servlet's class field is not thread safe!!! - oasisDssWebFormURL = ap.getUrl(); - found = true; - Logger.info("Loaded signedDoc attribute provider url from config:" + oasisDssWebFormURL); - break; - } - } - } catch (Exception e) { - e.printStackTrace(); - Logger.error("Loading the signedDoc attribute provider url from config failed"); - } - if (!found) { - Logger.error("Failed to load the signedDoc attribute provider url from config"); - } - performRedirect(url, request, response, signRequest); - - return; - } - - // FIXME: This servlet/task is intended to handle peps responses without signature, so why do we try to process that signature here? - SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( - new java.io.StringReader(signatureInfo))); - - citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); - - // memorize signature into authblock - moaSession.setAuthBlock(citizenSignature); - - X509Certificate cert = getSignerCertificate(citizenSignature); - moaSession.setSignerCertificate(cert); - moaSession.setForeigner(true); - - } catch (Throwable e) { - Logger.error("Could not extract citizen signature from C-PEPS", e); - throw new MOAIDException("stork.09", null); - } - - // FIXME: Same here; we do not have the citizen's signature, so this code might be regarded as dead code. - try { - SZRGInsertion(moaSession, authnResponse.getPersonalAttributeList(), authnResponse.getAssertions() - .get(0).getAuthnStatements().get(0).getAuthnContext().getAuthnContextClassRef() - .getAuthnContextClassRef(), citizenSignature); - } catch (STORKException e) { - // this is really nasty but we work against the system here. We are supposed to get the gender attribute - // from - // stork. If we do not, we cannot register the person in the ERnP - we have to have the - // gender for the represented person. So here comes the dirty hack. - if (e.getCause() instanceof STORKException - && e.getCause().getMessage().equals("gender not found in response")) { - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); - VelocityContext context = new VelocityContext(); - context.put("SAMLResponse", request.getParameter("SAMLResponse")); - context.put("action", request.getRequestURL()); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - - response.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e1) { - Logger.error("Error sending gender retrival form.", e1); - // httpSession.invalidate(); - throw new MOAIDException("stork.10", null); - } - - return; - } - - Logger.error("Error connecting SZR Gateway", e); - throw new MOAIDException("stork.10", null); - } - - Logger.debug("Add full STORK AuthnResponse to MOA session"); - moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas - // authnResponse? - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); - - // redirect - String redirectURL = null; - redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), - ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), - newMOASessionID); - redirectURL = response.encodeRedirectURL(redirectURL); - - response.setContentType("text/html"); - response.setStatus(302); - response.addHeader("Location", redirectURL); - Logger.info("REDIRECT TO: " + redirectURL); - - } catch (AuthenticationException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (MOAIDException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (Exception e) { - Logger.error("PEPSConnector has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - - } - - private void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, String signRequestString) - throws MOAIDException { - - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/oasis_dss_webform_binding.vm"); - VelocityContext context = new VelocityContext(); - - Logger.debug("performRedirect, signrequest:" + signRequestString); - Source signDoc = new StreamSource(new java.io.StringReader(signRequestString)); - SignRequest signRequest = ApiUtils.unmarshal(signDoc, SignRequest.class); - signRequest.setReturnURL("TODO"); - signRequestString = IOUtils.toString(ApiUtils.marshalToInputStream(signRequest)); - context.put("signrequest", Base64.encodeBase64String(signRequestString.getBytes("UTF8"))); - context.put("clienturl", url); - context.put("action", oasisDssWebFormURL); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - - resp.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e) { - Logger.error("Error sending DSS signrequest.", e); - throw new MOAIDException("stork.11", null); - } - } -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java deleted file mode 100644 index 0e4e2a0f7..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/tasks/stork/PepsConnectorTask.java +++ /dev/null @@ -1,567 +0,0 @@ -package at.gv.egovernment.moa.id.auth.tasks.stork; - -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -import javax.activation.DataSource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.namespace.QName; -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.opensaml.saml2.core.StatusCode; - -import com.datentechnik.process_engine.api.ExecutionContext; - -import eu.stork.documentservice.DocumentService; -import eu.stork.documentservice.data.DatabaseConnectorMySQLImpl; -import eu.stork.oasisdss.api.ApiUtils; -import eu.stork.oasisdss.api.LightweightSourceResolver; -import eu.stork.oasisdss.api.exceptions.ApiUtilsException; -import eu.stork.oasisdss.profile.DocumentType; -import eu.stork.oasisdss.profile.DocumentWithSignature; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.PersonalAttributeList; -import eu.stork.peps.auth.commons.STORKAttrQueryRequest; -import eu.stork.peps.auth.commons.STORKAuthnRequest; -import eu.stork.peps.auth.commons.STORKAuthnResponse; -import eu.stork.peps.auth.engine.STORKSAMLEngine; -import eu.stork.peps.exceptions.STORKSAMLEngineException; -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; -import at.gv.egovernment.moa.id.auth.tasks.AbstractAuthServletTask; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.HTTPUtils; -import at.gv.egovernment.moa.id.util.VelocityProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.StringUtils; -import at.gv.util.xsd.xmldsig.SignatureType; -import at.gv.util.xsd.xmldsig.X509DataType; - -/** - * Evaluates the SAML response from the C-PEPS and authenticates the user. - *

                  - * In detail: - *

                    - *
                  • Decodes and validates the SAML response from the C-PEPS.
                  • - *
                  • Change moa session id.
                  • - *
                  • Extracts the subject's gender from request parameter {@code gender} if not available from the saml response.
                  • - *
                  • Extracts the {@code signedDoc} attribute from the response, get signed doc payload using stork attribute query request.
                  • - *
                  • Request SZR gateway for verification of the citizen's signature and for creating of an identity link.
                  • - *
                  • In case of mandate mode: If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. Therefore a form is presented asking for the subject's gender. The form submits the user back to the {@code /PepsConnector} servlet (this task).
                  • - *
                  • The moa session is updated with authentication information.
                  • - *
                  • Change moa session id.
                  • - *
                  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
                  • - *
                  - * Expects: - *
                    - *
                  • HttpServletRequest parameter {@code SAMLResponse}
                  • - *
                  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute from the SAML response (both depicting the moa session id)
                  • - *
                  • HttpServletRequest parameter {@code gender} in case the request comes from the gender selection form
                  • - *
                  • {@code signedDoc} attribute within the SAML response.
                  • - *
                  - * Result: - *
                    - *
                  • Updated moa id session (identity link, stork attributes...)
                  • - *
                  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
                  • - *
                  • Redirect to {@code /dispatcher}.
                  • - *
                  - * Possible branches: - *
                    - *
                  • In case the szr gateway throws exception due to missing gender information: - *
                      - *
                    • Returns a form for gender selection with action url back to this servlet/task.
                    • - *
                    - *
                  • - *
                  - * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet}.
                  - * - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class PepsConnectorTask extends AbstractAuthServletTask { - - private String dtlUrl = null; - - public PepsConnectorTask() { - super(); - Properties props = new Properties(); - try { - props.load(DatabaseConnectorMySQLImpl.class.getResourceAsStream("docservice.properties")); - dtlUrl = props.getProperty("docservice.url"); - } catch (IOException e) { - dtlUrl = "http://testvidp.buergerkarte.at/DocumentService/DocumentService"; - Logger.error("Loading DTL config failed, using default value:" + dtlUrl); - e.printStackTrace(); - } - } - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) - throws Exception { - String pendingRequestID = null; - - setNoCachingHeaders(response); - - try { - - Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); - Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); - - // check if https or only http - super.checkIfHTTPisAllowed(request.getRequestURL().toString()); - - Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); - - // extract STORK Response from HTTP Request - // Decodes SAML Response - byte[] decSamlToken; - try { - decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); - Logger.debug("SAMLResponse: " + new String(decSamlToken)); - - } catch (NullPointerException e) { - Logger.error("Unable to retrieve STORK Response", e); - throw new MOAIDException("stork.04", null); - } - - // Get SAMLEngine instance - STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); - - STORKAuthnResponse authnResponse = null; - try { - // validate SAML Token - Logger.debug("Starting validation of SAML response"); - authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); - Logger.info("SAML response succesfully verified!"); - } catch (STORKSAMLEngineException e) { - Logger.error("Failed to verify STORK SAML Response", e); - throw new MOAIDException("stork.05", null); - } - - Logger.info("STORK SAML Response message succesfully extracted"); - Logger.debug("STORK response: "); - Logger.debug(authnResponse.toString()); - - Logger.debug("Trying to find MOA Session-ID ..."); - // String moaSessionID = request.getParameter(PARAM_SESSIONID); - // first use SAML2 relayState - String moaSessionID = request.getParameter("RelayState"); - - // escape parameter strings - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - // check if SAML2 relaystate includes a MOA sessionID - if (StringUtils.isEmpty(moaSessionID)) { - // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier - - moaSessionID = authnResponse.getInResponseTo(); - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - if (StringUtils.isEmpty(moaSessionID)) { - // No authentication session has been started before - Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); - Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); - throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); - - } else - Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); - - } else - // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); - Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); - - /* - * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because - * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter - */ - // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) - // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); - - // load MOASession from database - AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); - // change MOASessionID - moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Found MOA sessionID: " + moaSessionID); - - String statusCodeValue = authnResponse.getStatusCode(); - - if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { - Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); - throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); - } - - Logger.info("Got SAML response with authentication success message."); - - Logger.debug("MOA session is still valid"); - - STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); - - if (storkAuthnRequest == null) { - Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - throw new MOAIDException("stork.07", null); - } - - Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - - // //////////// incorporate gender from parameters if not in stork response - - IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); - - // but first, check if we have a representation case - if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) - || STORKResponseProcessor.hasAttribute("representative", attributeList) - || STORKResponseProcessor.hasAttribute("represented", attributeList)) { - // in a representation case... - moaSession.setUseMandate("true"); - - // and check if we have the gender value - PersonalAttribute gender = attributeList.get("gender"); // TODO Do we need to check gender value if - // there is no representation case? - if (null == gender) { - String gendervalue = (String) request.getParameter("gender"); - if (null != gendervalue) { - gender = new PersonalAttribute(); - gender.setName("gender"); - ArrayList tmp = new ArrayList(); - tmp.add(gendervalue); - gender.setValue(tmp); - - authnResponse.getPersonalAttributeList().add(gender); - } - } - } - - // //////////////////////////////////////////////////////////////////////// - - Logger.debug("Starting extraction of signedDoc attribute"); - // extract signed doc element and citizen signature - String citizenSignature = null; - try { - String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0); // TODO ERROR HANDLING - - Logger.debug("signatureInfo:" + signatureInfo); - - SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( - new java.io.StringReader(signatureInfo))); - - // fetch signed doc - DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); - if (ds == null) { - throw new ApiUtilsException("No datasource found in response"); - } - - InputStream incoming = ds.getInputStream(); - citizenSignature = IOUtils.toString(incoming); - incoming.close(); - - Logger.debug("citizenSignature:" + citizenSignature); - if (isDocumentServiceUsed(citizenSignature) == true) { - Logger.debug("Loading document from DocumentService."); - String url = getDtlUrlFromResponse(dssSignResponse); - // get Transferrequest - String transferRequest = getDocTransferRequest(dssSignResponse.getDocUI(), url); - // Load document from DocujmentService - byte[] data = getDocumentFromDtl(transferRequest, url); - citizenSignature = new String(data, "UTF-8"); - Logger.debug("Overridung citizenSignature with:" + citizenSignature); - } - - JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); - SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( - IOUtils.toInputStream(citizenSignature))).getValue(); - - // memorize signature into authblock - moaSession.setAuthBlock(citizenSignature); - - // extract certificate - for (Object current : root.getKeyInfo().getContent()) - if (((JAXBElement) current).getValue() instanceof X509DataType) { - for (Object currentX509Data : ((JAXBElement) current).getValue() - .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { - JAXBElement casted = ((JAXBElement) currentX509Data); - if (casted.getName().getLocalPart().equals("X509Certificate")) { - moaSession.setSignerCertificate(new X509Certificate(((String) casted.getValue()) - .getBytes("UTF-8"))); - break; - } - } - } - - } catch (Throwable e) { - Logger.error("Could not extract citizen signature from C-PEPS", e); - throw new MOAIDException("stork.09", null); - } - Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); - Logger.debug("Citizen signature will be verified by SZR Gateway!"); - - Logger.debug("fetching OAParameters from database"); - - // //read configuration paramters of OA - // AuthenticationSession moasession; - // try { - // moasession = AuthenticationSessionStoreage.getSession(moaSessionID); - // } catch (MOADatabaseException e2) { - // Logger.error("could not retrieve moa session"); - // throw new AuthenticationException("auth.01", null); - // } - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - moaSession.getPublicOAURLPrefix()); - if (oaParam == null) - throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); - - // retrieve target - // TODO: check in case of SSO!!! - String targetType = null; - if (oaParam.getBusinessService()) { - String id = oaParam.getIdentityLinkDomainIdentifier(); - if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) - targetType = id; - else - targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); - } else { - targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); - } - - Logger.debug("Starting connecting SZR Gateway"); - // contact SZR Gateway - IdentityLink identityLink = null; - executionContext.put("identityLinkAvailable", false); - try { - identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(), - oaParam.getFriendlyName(), targetType, null, oaParam.getMandateProfiles(), citizenSignature); - } catch (STORKException e) { - // this is really nasty but we work against the system here. We are supposed to get the gender attribute - // from - // stork. If we do not, we cannot register the person in the ERnP - we have to have the - // gender for the represented person. So here comes the dirty hack. - if (e.getCause() instanceof STORKException - && e.getCause().getMessage().equals("gender not found in response")) { - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); - VelocityContext context = new VelocityContext(); - context.put("SAMLResponse", request.getParameter("SAMLResponse")); - context.put("action", request.getRequestURL()); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - - response.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e1) { - Logger.error("Error sending gender retrival form.", e1); - // httpSession.invalidate(); - throw new MOAIDException("stork.10", null); - } - - return; - } - - Logger.error("Error connecting SZR Gateway", e); - throw new MOAIDException("stork.10", null); - } - Logger.debug("SZR communication was successfull"); - - if (identityLink == null) { - Logger.error("SZR Gateway did not return an identity link."); - throw new MOAIDException("stork.10", null); - } - moaSession.setForeigner(true); - - Logger.info("Received Identity Link from SZR Gateway"); - executionContext.put("identityLinkAvailable", true); - moaSession.setIdentityLink(identityLink); - - Logger.debug("Adding addtional STORK attributes to MOA session"); - moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList()); - - Logger.debug("Add full STORK AuthnResponse to MOA session"); - moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse")); - - // We don't have BKUURL, setting from null to "Not applicable" - moaSession.setBkuURL("Not applicable (STORK Authentication)"); - - // free for single use - moaSession.setAuthenticatedUsed(false); - - // stork did the authentication step - moaSession.setAuthenticated(true); - - // TODO: found better solution, but QAA Level in response could be not supported yet - try { - - moaSession.setQAALevel(authnResponse.getAssertions().get(0).getAuthnStatements().get(0) - .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef()); - - } catch (Throwable e) { - Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); - moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); - - } - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); - - // redirect - String redirectURL = null; - redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), - ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), - newMOASessionID); - redirectURL = response.encodeRedirectURL(redirectURL); - - // response.setContentType("text/html"); - // response.setStatus(302); - // response.addHeader("Location", redirectURL); - response.sendRedirect(redirectURL); - Logger.info("REDIRECT TO: " + redirectURL); - - } catch (AuthenticationException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (MOAIDException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (Exception e) { - Logger.error("PEPSConnector has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - - } - - private boolean isDocumentServiceUsed(String citizenSignature) // TODo add better check - { - if (citizenSignature - .contains("
                  Service Name:{http://stork.eu}DocumentService
                  Port Name:{http://stork.eu}DocumentServicePort
                  ")) - return true; - return false; - } - - /** - * Get DTL uril from the oasis sign response - * - * @param signRequest - * The signature response - * @return The URL of DTL service - * @throws SimpleException - */ - private String getDtlUrlFromResponse(SignResponse dssSignResponse) { - List documents = ApiUtils.findNamedElement(dssSignResponse.getOptionalOutputs(), - ApiUtils.OPTIONAL_OUTPUT_DOCUMENTWITHSIGNATURE, DocumentWithSignature.class); - DocumentType sourceDocument = documents.get(0).getDocument(); - - if (sourceDocument.getDocumentURL() != null) - return sourceDocument.getDocumentURL(); - else - return null;// throw new Exception("No document url found"); - } - - // From DTLPEPSUTIL - - /** - * Get document from DTL - * - * @param transferRequest - * The transfer request (attribute query) - * @param eDtlUrl - * The DTL url of external DTL - * @return the document data - * @throws SimpleException - */ - private byte[] getDocumentFromDtl(String transferRequest, String eDtlUrl) throws Exception { - URL url = null; - try { - url = new URL(dtlUrl); - QName qname = new QName("http://stork.eu", "DocumentService"); - - Service service = Service.create(url, qname); - DocumentService docservice = service.getPort(DocumentService.class); - - BindingProvider bp = (BindingProvider) docservice; - SOAPBinding binding = (SOAPBinding) bp.getBinding(); - binding.setMTOMEnabled(true); - - if (eDtlUrl.equalsIgnoreCase(dtlUrl)) - return docservice.getDocument(transferRequest, ""); - else - return docservice.getDocument(transferRequest, eDtlUrl); - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("Error in getDocumentFromDtl", e); - } - } - - /** - * Get a document transfer request (attribute query) - * - * @param docId - * @return - * @throws SimpleException - */ - private String getDocTransferRequest(String docId, String destinationUrl) throws Exception { - String spCountry = docId.substring(0, docId.indexOf("/")); - final STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP"); - STORKAttrQueryRequest req = new STORKAttrQueryRequest(); - req.setAssertionConsumerServiceURL(dtlUrl); - req.setDestination(destinationUrl); - req.setSpCountry(spCountry); - req.setQaa(3);// TODO - PersonalAttributeList pal = new PersonalAttributeList(); - PersonalAttribute attr = new PersonalAttribute(); - attr.setName("docRequest"); - attr.setIsRequired(true); - attr.setValue(Arrays.asList(docId)); - pal.add(attr); - req.setPersonalAttributeList(pal); - - STORKAttrQueryRequest req1; - try { - req1 = engine.generateSTORKAttrQueryRequest(req); - return PEPSUtil.encodeSAMLTokenUrlSafe(req1.getTokenSaml()); - } catch (STORKSAMLEngineException e) { - e.printStackTrace(); - throw new Exception("Error in doc request attribute query generation", e); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java deleted file mode 100644 index cbe5c5932..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModuleImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package at.gv.egovernment.moa.id.moduls.moduleregistration; - -import com.datentechnik.process_engine.api.ExecutionContext; - -public class AuthModuleImpl implements AuthModule { - - @Override - public int getPriority() { - // neutral priority between Integer.MIN_VALUE and Integer.MAX_VALUE - return 0; - } - - @Override - public String selectProcess(ExecutionContext context) { - return context.get("ccc") == null ? "DefaultAuthentication" : null; - } - - @Override - public String[] getProcessDefinitions() { - return new String[] { "DefaultAuthentication" }; - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java index b90e0d94f..35fbce053 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java @@ -32,13 +32,13 @@ public class ModuleRegistration { private static ModuleRegistration instance = new ModuleRegistration(); - private List orderedModules = new ArrayList<>(); + private List priorizedModules = new ArrayList<>(); @Autowired private ApplicationContext ctx; @Autowired - ProcessEngine processEngine; + private ProcessEngine processEngine; private Logger log = LoggerFactory.getLogger(getClass()); @@ -58,20 +58,21 @@ public class ModuleRegistration { initSpringModules(); // order modules according to their priority - orderModules(); + priorizeModules(); } /** * Discovers modules which use the ServiceLoader mechanism. */ private void initServiceLoaderModules() { - log.debug("Discovering modules which use the ServiceLoader mechanism."); + log.info("Looking for auth modules."); ServiceLoader loader = ServiceLoader.load(AuthModule.class); Iterator modules = loader.iterator(); while (modules.hasNext()) { AuthModule module = modules.next(); + log.info("Detected module {}", module.getClass().getName()); registerResourceUris(module); - orderedModules.add(module); + priorizedModules.add(module); } } @@ -83,7 +84,7 @@ public class ModuleRegistration { Map modules = ctx.getBeansOfType(AuthModule.class); for (AuthModule module : modules.values()) { registerResourceUris(module); - orderedModules.add(module); + priorizedModules.add(module); } } @@ -96,17 +97,17 @@ public class ModuleRegistration { private void registerResourceUris(AuthModule module) { for (String uri : module.getProcessDefinitions()) { Resource resource = ctx.getResource(uri); - if (resource.exists()) { - log.debug("Registering process definition resource uri: '{}'.", resource); + if (resource.isReadable()) { + log.info("Registering process definition resource: '{}'.", resource); try (InputStream processDefinitionInputStream = resource.getInputStream()) { processEngine.registerProcessDefinition(processDefinitionInputStream); } catch (IOException e) { - log.info("Resource uri: '{}' could NOT be read.", resource); + log.error("Resource uri: '{}' could NOT be read.", uri, e); } catch (ProcessDefinitionParserException e) { - log.warn("Error while parsing process definition in '{}'", resource); + log.error("Error while parsing process definition in '{}'", uri, e); } } else { - log.info("Resource uri: '{}' does NOT exist.", resource); + log.error("Resource uri: '{}' cannot be read.", uri); } } } @@ -114,8 +115,8 @@ public class ModuleRegistration { /** * Order the modules in descending order according to their priority. */ - private void orderModules() { - Collections.sort(orderedModules, new Comparator() { + private void priorizeModules() { + Collections.sort(priorizedModules, new Comparator() { @Override public int compare(AuthModule thisAuthModule, AuthModule otherAuthModule) { int thisOrder = thisAuthModule.getPriority(); @@ -135,7 +136,7 @@ public class ModuleRegistration { * @return the process id or {@code null} */ public String selectProcess(ExecutionContext context) { - for (AuthModule module : orderedModules) { + for (AuthModule module : priorizedModules) { String id = module.selectProcess(context); if (StringUtils.isNotEmpty(id)) { log.debug("Process with id '{}' selected, for context '{}'.", id, context); diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule new file mode 100644 index 000000000..03cb2c631 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule @@ -0,0 +1,3 @@ +# The default moaid process +at.gv.egovernment.moa.id.auth.modules.internal.DefaultAuthModuleImpl +at.gv.egovernment.moa.id.auth.modules.stork.STORKAuthModuleImpl diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule deleted file mode 100644 index 0d7e98006..000000000 --- a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.modulregistration.AuthModule +++ /dev/null @@ -1,2 +0,0 @@ -# The default moaid process -at.gv.egovernment.moa.id.moduls.modulregistration.AuthModuleImpl \ No newline at end of file diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml new file mode 100644 index 000000000..f58fd3c02 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthentication.process.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml new file mode 100644 index 000000000..04fc476fe --- /dev/null +++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml deleted file mode 100644 index b7d0d0f8b..000000000 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml deleted file mode 100644 index 592603457..000000000 --- a/id/server/idserverlib/src/main/resources/resources/processes/STORKAuthentication.process.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From c6f543e06c02c0a2635eac2e9b99c2554e6e27bd Mon Sep 17 00:00:00 2001 From: Christian Wagner Date: Thu, 29 Jan 2015 14:39:11 +0100 Subject: integrate process engine from project 'dti-process-engine' - fix unit tests - correct namespaces - refactor package name --- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../moa/id/process/ProcessDefinitionParser.java | 2 +- .../moa/id/process/ProcessDefinition.xsd | 4 +- .../processes/DefaultAuthentication.process.xml | 2 +- .../test/BooleanStringExpressionEvaluator.java | 24 ---- .../process/process_engine/test/HalloWeltTask.java | 19 --- .../process_engine/test/HelloWorldTask.java | 19 --- .../test/ProcessDefinitionParserTest.java | 137 --------------------- .../process_engine/test/ProcessEngineTest.java | 67 ---------- .../SpringExpressionAwareProcessEngineTest.java | 25 +++- .../test/BooleanStringExpressionEvaluator.java | 24 ++++ .../moa/id/process/test/HalloWeltTask.java | 19 +++ .../moa/id/process/test/HelloWorldTask.java | 19 +++ .../process/test/ProcessDefinitionParserTest.java | 137 +++++++++++++++++++++ .../moa/id/process/test/ProcessEngineTest.java | 67 ++++++++++ ...nvalidProcessDefinition_MultipleStartEvents.xml | 22 ---- .../InvalidProcessDefinition_NoStartEvents.xml | 16 --- .../InvalidProcessDefinition_TransitionLoop.xml | 21 ---- ...dProcessDefinition_TransitionRefsTransition.xml | 19 --- ...cessDefinition_TransitionStartsFromEndEvent.xml | 19 --- .../test/SampleProcessDefinition1.xml | 18 --- .../test/SampleProcessDefinition2.xml | 21 ---- ...mpleProcessDefinitionForSAML1Authentication.xml | 14 +-- .../SampleProcessDefinitionWithExpression1.xml | 2 +- ...ingExpressionAwareProcessEngineTest-context.xml | 10 +- .../test/SpringExpressionEvaluatorTest-context.xml | 4 +- ...nvalidProcessDefinition_MultipleStartEvents.xml | 22 ++++ .../InvalidProcessDefinition_NoStartEvents.xml | 16 +++ .../InvalidProcessDefinition_TransitionLoop.xml | 21 ++++ ...dProcessDefinition_TransitionRefsTransition.xml | 19 +++ ...cessDefinition_TransitionStartsFromEndEvent.xml | 19 +++ .../id/process/test/SampleProcessDefinition1.xml | 18 +++ .../id/process/test/SampleProcessDefinition2.xml | 21 ++++ 33 files changed, 445 insertions(+), 424 deletions(-) delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index ce8fe8971..a251064f6 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -11,7 +11,7 @@ - + - - - diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml deleted file mode 100644 index 564bf9040..000000000 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml deleted file mode 100644 index b3d2d2ebc..000000000 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml deleted file mode 100644 index ab033fb8f..000000000 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml deleted file mode 100644 index ca2617ce8..000000000 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml index 6525fb0cd..764ad6405 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml @@ -1,41 +1,41 @@ - - + - + - + - + - + - + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml index ef71026ec..dfe186423 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml @@ -1,5 +1,5 @@ - diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml index eb62d1ae2..1b6b7658e 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml @@ -5,21 +5,23 @@ xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml index dadc6bf81..95b88ca1a 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml @@ -3,12 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml new file mode 100644 index 000000000..17fa17cb4 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml new file mode 100644 index 000000000..008309e3a --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml new file mode 100644 index 000000000..14b281192 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml new file mode 100644 index 000000000..1152f3503 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml new file mode 100644 index 000000000..94bd25c9a --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml new file mode 100644 index 000000000..c161900c5 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml new file mode 100644 index 000000000..9e419e124 --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 28c91fd13c97e679666a43a57012d27518768dfd Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Thu, 29 Jan 2015 15:24:47 +0100 Subject: add inital (empty) implementation of the ProcessInstanceStoreDAO --- .../moa/id/process/dao/ProcessInstanceStore.java | 13 ++++++++++- .../id/process/dao/ProcessInstanceStoreDAO.java | 26 ++++++++++++++++++++++ .../process/dao/ProcessInstanceStoreDAOImpl.java | 25 +++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index 5270e036a..ab71ef54d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -10,13 +10,16 @@ import javax.persistence.Table; @Table(name = "process_instance") public class ProcessInstanceStore { - @Column(name = "id", unique = true, nullable = false) + @Column(name = "id") @Id private String id; @Column(name = "processDefinitionID", unique = true, nullable = false) private String processDefinitionID; + @Column(name = "pointer", nullable = false) + private String pointer; + @Column(name = "executionContextData", nullable = false) @Lob private byte[] executionContextData; @@ -29,6 +32,10 @@ public class ProcessInstanceStore { return processDefinitionID; } + public String getPointer() { + return pointer; + } + public byte[] getExecutionContextData() { return executionContextData; } @@ -41,6 +48,10 @@ public class ProcessInstanceStore { this.processDefinitionID = processDefinitionID; } + public void setPointer(String pointer) { + this.pointer = pointer; + } + public void setExecutionContextData(byte[] executionContextData) { this.executionContextData = executionContextData; } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java new file mode 100644 index 000000000..5e2b12349 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java @@ -0,0 +1,26 @@ +package at.gv.egovernment.moa.id.process.dao; + +import at.gv.egovernment.moa.id.process.ProcessInstance; + +public interface ProcessInstanceStoreDAO { + + /** + * Stores a {@link ProcessInstance} defined by {@code pIStore} in the + * database. + * + * @param pIStore + * the {@link ProcessInstanceStore} to persist. + */ + public void save(ProcessInstanceStore pIStore); + + /** + * Loads a {@link ProcessInstanceStore}, defined by + * {@code processInstanceID} from the database. + * + * @param processInstanceID + * the id of the {@code ProcessInstanceStore} to retrieve. + * @return a ProcessInstanceStore. + */ + public ProcessInstanceStore load(String processInstanceID); + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java new file mode 100644 index 000000000..3480c4cfc --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -0,0 +1,25 @@ +package at.gv.egovernment.moa.id.process.dao; + + + +public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { + + private static ProcessInstanceStoreDAO instance = new ProcessInstanceStoreDAOImpl(); + + public static ProcessInstanceStoreDAO getInstance() { + return instance; + } + + @Override + public void save(ProcessInstanceStore pIStore) { + // TODO Auto-generated method stub + + } + + @Override + public ProcessInstanceStore load(String processInstanceID) { + // TODO Auto-generated method stub + return null; + } + +} -- cgit v1.2.3 From fca585327afd4fd3dc0b5f1146cbb5d8648c3a41 Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Thu, 29 Jan 2015 16:54:28 +0100 Subject: add new methods to the dao interface, enhance db entity --- .../moa/id/process/dao/ProcessInstanceStore.java | 64 +++++++++++++++------- .../id/process/dao/ProcessInstanceStoreDAO.java | 34 +++++++++++- .../process/dao/ProcessInstanceStoreDAOImpl.java | 34 ++++++++++-- 3 files changed, 105 insertions(+), 27 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index ab71ef54d..c94c95516 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -1,58 +1,80 @@ package at.gv.egovernment.moa.id.process.dao; +import java.io.Serializable; +import java.util.Map; + import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.Id; import javax.persistence.Lob; import javax.persistence.Table; +import at.gv.egovernment.moa.id.process.ProcessInstanceState; + @Entity -@Table(name = "process_instance") +@Table(name = "processinstance") public class ProcessInstanceStore { @Column(name = "id") @Id - private String id; + private int id; + + @Column(name = "processInstanceId", unique = true, nullable = false) + private String processInstanceId; + + @Column(name = "processDefinitionId", nullable = false) + private String processDefinitionId; - @Column(name = "processDefinitionID", unique = true, nullable = false) - private String processDefinitionID; + @Column(name = "nextTaskId", nullable = false) + private String nextTaskId; - @Column(name = "pointer", nullable = false) - private String pointer; + @Column(name = "processState", nullable = false) + @Enumerated(value = EnumType.STRING) + private Enum processState; @Column(name = "executionContextData", nullable = false) @Lob - private byte[] executionContextData; + private Map executionContextData; - public String getId() { - return id; + public String getProcessInstanceId() { + return processInstanceId; } - public String getProcessDefinitionID() { - return processDefinitionID; + public String getProcessDefinitionId() { + return processDefinitionId; } - public String getPointer() { - return pointer; + public String getNextTaskId() { + return nextTaskId; } - public byte[] getExecutionContextData() { + public Enum getProcessState() { + return processState; + } + + public Map getExecutionContextData() { return executionContextData; } - public void setId(String id) { - this.id = id; + public void setProcessInstanceId(String processInstanceId) { + this.processInstanceId = processInstanceId; + } + + public void setProcessDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; } - public void setProcessDefinitionID(String processDefinitionID) { - this.processDefinitionID = processDefinitionID; + public void setNextTaskId(String nextTaskId) { + this.nextTaskId = nextTaskId; } - public void setPointer(String pointer) { - this.pointer = pointer; + public void setProcessState(Enum processState) { + this.processState = processState; } - public void setExecutionContextData(byte[] executionContextData) { + public void setExecutionContextData(Map executionContextData) { this.executionContextData = executionContextData; } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java index 5e2b12349..57489c33e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java @@ -1,5 +1,7 @@ package at.gv.egovernment.moa.id.process.dao; +import java.util.List; + import at.gv.egovernment.moa.id.process.ProcessInstance; public interface ProcessInstanceStoreDAO { @@ -11,7 +13,7 @@ public interface ProcessInstanceStoreDAO { * @param pIStore * the {@link ProcessInstanceStore} to persist. */ - public void save(ProcessInstanceStore pIStore); + void save(ProcessInstanceStore pIStore); /** * Loads a {@link ProcessInstanceStore}, defined by @@ -21,6 +23,34 @@ public interface ProcessInstanceStoreDAO { * the id of the {@code ProcessInstanceStore} to retrieve. * @return a ProcessInstanceStore. */ - public ProcessInstanceStore load(String processInstanceID); + ProcessInstanceStore load(String processInstanceId); + + /** + * Deletes the {@link ProcessInstance} corresponding with the + * {@code processInstanceId}. + * + * @param processInstanceID + * the id of the {@code ProcessInstance} to be deleted. + */ + void remove(String processInstanceId); + + /** + * Returns all {@link ProcessInstanceStore} objects stored in the database. + * The returned list may be empty, but never {@code null}. + * + * @return a list of {@link ProcessInstanceStore} (never {@code null}). + */ + List getAllProcessInstanceStores(); + + /** + * Returns the specific {@link ProcessInstanceStore} object corresponding to + * the given {@code processInstanceId}, or {@code null} if the object could + * not be found. + * + * @param processInstanceId + * the processInstanceId to search. + * @return the ProcessInstanceStore for the given id, or {@code null}. + */ + ProcessInstanceStore getProcessInstance(String processInstanceId); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java index 3480c4cfc..cde34acd1 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -1,19 +1,27 @@ package at.gv.egovernment.moa.id.process.dao; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +/** + * Database backed implementation of the {@link ProcessInstanceStoreDAO} + * interface. + */ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { - + + private Logger log = LoggerFactory.getLogger(getClass()); + private static ProcessInstanceStoreDAO instance = new ProcessInstanceStoreDAOImpl(); - + public static ProcessInstanceStoreDAO getInstance() { return instance; } - + @Override public void save(ProcessInstanceStore pIStore) { // TODO Auto-generated method stub - } @Override @@ -22,4 +30,22 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { return null; } + @Override + public void remove(String processInstanceId) { + // TODO Auto-generated method stub + + } + + @Override + public List getAllProcessInstanceStores() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ProcessInstanceStore getProcessInstance(String processInstanceId) { + // TODO Auto-generated method stub + return null; + } + } -- cgit v1.2.3 From 88f2ac75cf316c755e35303cf2d6faa2343b9408 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 29 Jan 2015 17:13:21 +0100 Subject: Perform some cleanup - Remove ProcessDefinitionFactoryBean from applicationContext.xml. - Minor code cleanup. --- id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 7 ++----- id/server/auth/src/main/webapp/WEB-INF/web.xml | 2 ++ .../moa/id/moduls/moduleregistration/ModuleRegistration.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index 65a9e7176..818524e49 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -17,11 +17,6 @@ - - - - - @@ -30,5 +25,7 @@ + + diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 2dbceb4e9..10c772aca 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -138,6 +138,8 @@ ProcessEngineSignal + /signalProcess + /GetMISSessionID /GetForeignID /VerifyAuthBlock diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java index 35fbce053..7e16cf637 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java @@ -98,7 +98,7 @@ public class ModuleRegistration { for (String uri : module.getProcessDefinitions()) { Resource resource = ctx.getResource(uri); if (resource.isReadable()) { - log.info("Registering process definition resource: '{}'.", resource); + log.info("Registering process definition resource: '{}'.", uri); try (InputStream processDefinitionInputStream = resource.getInputStream()) { processEngine.registerProcessDefinition(processDefinitionInputStream); } catch (IOException e) { -- cgit v1.2.3 From 6371e01c520de77b0f37f59c72dbe20fce88c91a Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 30 Jan 2015 08:53:27 +0100 Subject: Add Spring based discovery for STORKAuthModule - Add wildcard import to applicationContext.xml - Add some javadoc to AuthModule interface. - Remove STORKAuthModuleImpl from serviceloader based registration. --- .../src/main/webapp/WEB-INF/applicationContext.xml | 3 +++ id/server/auth/src/main/webapp/WEB-INF/web.xml | 3 ++- .../modules/internal/DefaultAuthModuleImpl.java | 4 +++- .../auth/modules/stork/STORK.authmodule.beans.xml | 14 +++++++++++++ .../id/auth/modules/stork/STORKAuthModuleImpl.java | 17 ++++++++++++++-- .../id/moduls/moduleregistration/AuthModule.java | 23 +++++++++++----------- ...ent.moa.id.moduls.moduleregistration.AuthModule | 1 - 7 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index 818524e49..d9e254451 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -27,5 +27,8 @@ + + + diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 10c772aca..f81e01ccd 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -138,8 +138,9 @@ ProcessEngineSignal + /signalProcess - + /GetMISSessionID /GetForeignID /VerifyAuthBlock diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java index 99c28fd7f..35c7e5c79 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java @@ -6,11 +6,13 @@ import at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule; import com.datentechnik.process_engine.api.ExecutionContext; +/** + * Module descriptor + */ public class DefaultAuthModuleImpl implements AuthModule { @Override public int getPriority() { - // neutral priority between Integer.MIN_VALUE and Integer.MAX_VALUE return 0; } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml new file mode 100644 index 000000000..2e924bdd0 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java index 140334b36..52423166a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java @@ -6,12 +6,25 @@ import com.datentechnik.process_engine.api.ExecutionContext; import at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule; +/** + * Module descriptor for an auth module providing stork authentication related processes. + * @author tknall + */ public class STORKAuthModuleImpl implements AuthModule { + + private int priority = 0; @Override public int getPriority() { - // neutral priority between Integer.MIN_VALUE and Integer.MAX_VALUE - return 0; + return priority; + } + + /** + * Sets the priority of this module. Default value is {@code 0}. + * @param priority The priority. + */ + public void setPriority(int priority) { + this.priority = priority; } @Override diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java index 35273cd2b..fa0149c17 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java @@ -9,31 +9,32 @@ import com.datentechnik.process_engine.model.ProcessDefinition; public interface AuthModule { /** - * Returns the priority of the module. The priority defines the place in the - * order of modules. The module with a highest priority is asked first, if - * it has a process which can do an authentication. + * Returns the priority of the module. The priority defines the order of the respective module within the chain of + * discovered modules. Higher priorized modules are asked before lower priorized modules for a process that they can + * handle. + *

                  + * Internal default modules are priorized neutral ({@code 0}. Use a higher priority ({@code 1...Integer.MAX_VALUE}) + * in order to have your module(s) priorized or a lower priority ({@code Integer.MIN_VALUE...-1}) in order to put + * your modules behind default modules. * * @return the priority of the module. */ int getPriority(); /** - * Checks if the module has a process, which is able to perform an authentication - * with the given {@link ExecutionContext}. + * Checks if the module has a process, which is able to perform an authentication with the given + * {@link ExecutionContext}. * * @param context * an ExecutionContext for a process. - * @return the process-ID of a process which is able to work with the given - * ExecutionContext, or {@code null}. + * @return the process-ID of a process which is able to work with the given ExecutionContext, or {@code null}. */ String selectProcess(ExecutionContext context); /** - * Returns the an Array of {@link ProcessDefinition}s of the processes - * included in this module. + * Returns the an Array of {@link ProcessDefinition}s of the processes included in this module. * - * @return an array of resource uris of the processes included in this - * module. + * @return an array of resource uris of the processes included in this module. */ String[] getProcessDefinitions(); diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule index 03cb2c631..865096055 100644 --- a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule +++ b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule @@ -1,3 +1,2 @@ # The default moaid process at.gv.egovernment.moa.id.auth.modules.internal.DefaultAuthModuleImpl -at.gv.egovernment.moa.id.auth.modules.stork.STORKAuthModuleImpl -- cgit v1.2.3 From 373641cfb0e404e89f4d9a011ae53d8b8cfc06c5 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 30 Jan 2015 10:45:59 +0100 Subject: Add dynamic servlet registration for STORK processes. - Add STORKWebApplicationInitializer.java - Adjust web.xml - Move STORK.authmodule.beans.xml to src/main/resources/... --- id/server/auth/src/main/webapp/WEB-INF/web.xml | 5 ++- .../auth/modules/stork/STORK.authmodule.beans.xml | 14 -------- .../stork/STORKWebApplicationInitializer.java | 37 ++++++++++++++++++++++ .../auth/modules/stork/STORK.authmodule.beans.xml | 14 ++++++++ 4 files changed, 55 insertions(+), 15 deletions(-) delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java create mode 100644 id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index f81e01ccd..41c46bd22 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -140,14 +140,17 @@ ProcessEngineSignal /signalProcess - + /GetMISSessionID /GetForeignID /VerifyAuthBlock /VerifyCertificate /VerifyIdentityLink + + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml deleted file mode 100644 index 2e924bdd0..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java new file mode 100644 index 000000000..7478a57c3 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java @@ -0,0 +1,37 @@ +package at.gv.egovernment.moa.id.auth.modules.stork; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; + +import org.springframework.web.WebApplicationInitializer; + +import at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet; + +/** + * Spring automatically discovers {@link WebApplicationInitializer} implementations at startup.
                  + * This STORK webapp initializer adds the required servlet mappings: + *

                    + *
                  • {@code /PEPSConnector}
                  • + *
                  • {@code /PEPSConnectorWithLocalSigning}
                  • + *
                  + * for the {@linkplain ProcessEngineSignalServlet process engine servlet} (named {@code ProcessEngineSignal}) that wakes + * up a process in order to execute asynchronous tasks. Therefore the servlet mappings mentioned above do not need to be + * declared in {@code web.xml}. + * + * @author tknall + * @see ProcessEngineSignalServlet + */ +public class STORKWebApplicationInitializer implements WebApplicationInitializer { + + @Override + public void onStartup(ServletContext servletContext) throws ServletException { + ServletRegistration servletRegistration = servletContext.getServletRegistration("ProcessEngineSignal"); + if (servletRegistration == null) { + throw new IllegalStateException("Servlet 'ProcessEngineSignal' expected to be registered."); + } + servletRegistration.addMapping("/PEPSConnectorWithLocalSigning"); + servletRegistration.addMapping("/PEPSConnector"); + } + +} diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml new file mode 100644 index 000000000..2e924bdd0 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml @@ -0,0 +1,14 @@ + + + + + + + + + + -- cgit v1.2.3 From 4b8f2b481636ef71146d382f386f9c297da7a64b Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Fri, 30 Jan 2015 11:11:40 +0100 Subject: implement DAO methods, add exeptions to ProcessInstanceStoreDAO interface --- .../id/config/auth/AuthConfigurationProvider.java | 3 +- .../id/process/dao/ProcessInstanceStoreDAO.java | 35 ++++----- .../process/dao/ProcessInstanceStoreDAOImpl.java | 91 ++++++++++++++++++---- 3 files changed, 95 insertions(+), 34 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java index a67badf49..0dfd2236f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java @@ -110,10 +110,10 @@ import at.gv.egovernment.moa.id.config.auth.data.ProtocolAllowed; import at.gv.egovernment.moa.id.config.legacy.BuildFromLegacyConfig; import at.gv.egovernment.moa.id.config.stork.STORKConfig; import at.gv.egovernment.moa.id.data.IssuerAndSerial; +import at.gv.egovernment.moa.id.process.dao.ProcessInstanceStore; import at.gv.egovernment.moa.id.protocols.pvp2x.config.MOADefaultBootstrap; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.util.MiscUtil; -import at.gv.util.config.EgovUtilConfiguration; import at.gv.util.config.EgovUtilPropertiesConfiguration; /** @@ -344,6 +344,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider { config.addAnnotatedClass(OldSSOSessionIDStore.class); config.addAnnotatedClass(ExceptionStore.class); config.addAnnotatedClass(InterfederationSessionStore.class); + config.addAnnotatedClass(ProcessInstanceStore.class); config.addProperties(moaSessionProp); MOASessionDBUtils.initHibernate(config, moaSessionProp); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java index 57489c33e..0aa6f80cd 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java @@ -2,6 +2,7 @@ package at.gv.egovernment.moa.id.process.dao; import java.util.List; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.process.ProcessInstance; public interface ProcessInstanceStoreDAO { @@ -12,18 +13,23 @@ public interface ProcessInstanceStoreDAO { * * @param pIStore * the {@link ProcessInstanceStore} to persist. + * @throws MOADatabaseException + * is thrown if a problem occurs while accessing the database. */ - void save(ProcessInstanceStore pIStore); + void save(ProcessInstanceStore pIStore) throws MOADatabaseException; /** - * Loads a {@link ProcessInstanceStore}, defined by - * {@code processInstanceID} from the database. + * Returns a {@link ProcessInstanceStore}, defined by + * {@code processInstanceID} from the database, or {@code null} if the + * object could not be found. * * @param processInstanceID * the id of the {@code ProcessInstanceStore} to retrieve. - * @return a ProcessInstanceStore. + * @return a ProcessInstanceStore, or {@code null}. + * @throws MOADatabaseException + * is thrown if a problem occurs while accessing the database. */ - ProcessInstanceStore load(String processInstanceId); + ProcessInstanceStore load(String processInstanceId) throws MOADatabaseException; /** * Deletes the {@link ProcessInstance} corresponding with the @@ -31,26 +37,19 @@ public interface ProcessInstanceStoreDAO { * * @param processInstanceID * the id of the {@code ProcessInstance} to be deleted. + * @throws MOADatabaseException + * is thrown if a problem occurs while accessing the database. */ - void remove(String processInstanceId); + void remove(String processInstanceId) throws MOADatabaseException; /** * Returns all {@link ProcessInstanceStore} objects stored in the database. * The returned list may be empty, but never {@code null}. * * @return a list of {@link ProcessInstanceStore} (never {@code null}). + * @throws MOADatabaseException + * is thrown if a problem occurs while accessing the database. */ - List getAllProcessInstanceStores(); - - /** - * Returns the specific {@link ProcessInstanceStore} object corresponding to - * the given {@code processInstanceId}, or {@code null} if the object could - * not be found. - * - * @param processInstanceId - * the processInstanceId to search. - * @return the ProcessInstanceStore for the given id, or {@code null}. - */ - ProcessInstanceStore getProcessInstance(String processInstanceId); + List getAllProcessInstanceStores() throws MOADatabaseException; } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java index cde34acd1..f5fb71145 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -1,10 +1,18 @@ package at.gv.egovernment.moa.id.process.dao; +import java.util.Collections; import java.util.List; +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; + /** * Database backed implementation of the {@link ProcessInstanceStoreDAO} * interface. @@ -20,32 +28,85 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { } @Override - public void save(ProcessInstanceStore pIStore) { - // TODO Auto-generated method stub + public void save(ProcessInstanceStore pIStore) throws MOADatabaseException { + try { + MOASessionDBUtils.saveOrUpdate(pIStore); + log.debug("Store process instance with='{}' in the database.", pIStore.getProcessInstanceId()); + } catch (MOADatabaseException e) { + log.warn("ProcessInstanceStore could not be persisted to the database."); + throw e; + } } @Override - public ProcessInstanceStore load(String processInstanceID) { - // TODO Auto-generated method stub - return null; - } + public ProcessInstanceStore load(String processInstanceId) throws MOADatabaseException { - @Override - public void remove(String processInstanceId) { - // TODO Auto-generated method stub + log.debug("Retrieve the ProcessInstanceStore for id='{}' from the database.", processInstanceId); + Session session = MOASessionDBUtils.getCurrentSession(); + ProcessInstanceStore result = null; + Transaction tx = null; + try { + synchronized (session) { + tx = session.beginTransaction(); + // select all where processInstanceId equals processInstanceId + Criteria criteria = session.createCriteria(ProcessInstanceStore.class); + criteria.add(Restrictions.eq("processInstanceId", processInstanceId)); + result = (ProcessInstanceStore) criteria.uniqueResult(); + tx.commit(); + } + } catch (Exception e) { + log.error("There are multiple persisted processes with the same process instance id '{}'", + processInstanceId); + if (tx != null) { + tx.rollback(); + } + throw e; + } finally { + MOASessionDBUtils.closeSession(); + } + return result; } @Override - public List getAllProcessInstanceStores() { - // TODO Auto-generated method stub - return null; + public void remove(String processInstanceId) throws MOADatabaseException { + + log.debug("Delete the ProcessInstanceStore for id='{}' from the database.", processInstanceId); + + ProcessInstanceStore toBeDeleted = load(processInstanceId); + boolean result = MOASessionDBUtils.delete(toBeDeleted); + if (result == false) { + log.warn("Could not delete the ProcessInstanceStore with process instance id '{}'", processInstanceId); + throw new MOADatabaseException("Could not delete the ProcessInstanceStore with process instance id '" + + processInstanceId + "'."); + } } + @SuppressWarnings("unchecked") @Override - public ProcessInstanceStore getProcessInstance(String processInstanceId) { - // TODO Auto-generated method stub - return null; + public List getAllProcessInstanceStores() throws MOADatabaseException { + log.debug("Retrieve a list with all ProcessInstanceStores from the database."); + Session session = MOASessionDBUtils.getCurrentSession(); + + List result = Collections.emptyList(); + Transaction tx = null; + try { + synchronized (session) { + tx = session.beginTransaction(); + // select all + result = session.createCriteria(ProcessInstanceStore.class).list(); + tx.commit(); + } + } catch (Exception e) { + log.error("A problem occured while retrieving all stored ProcessInstanceStores."); + if (tx != null) { + tx.rollback(); + } + throw e; + } finally { + MOASessionDBUtils.closeSession(); + } + return result; } } -- cgit v1.2.3 From 78a3caea21bdd5475007b958d59b23b1d3deccfb Mon Sep 17 00:00:00 2001 From: Gerwin Gsenger Date: Fri, 30 Jan 2015 12:27:45 +0100 Subject: small DAO code review from Thomas --- .../process/dao/ProcessInstanceStoreDAOImpl.java | 50 ++++++++++++---------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java index f5fb71145..4b7468013 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -46,24 +46,26 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { ProcessInstanceStore result = null; Transaction tx = null; - try { - synchronized (session) { + synchronized (session) { + try { + tx = session.beginTransaction(); // select all where processInstanceId equals processInstanceId Criteria criteria = session.createCriteria(ProcessInstanceStore.class); criteria.add(Restrictions.eq("processInstanceId", processInstanceId)); result = (ProcessInstanceStore) criteria.uniqueResult(); tx.commit(); + + } catch (Exception e) { + log.error("There are multiple persisted processes with the same process instance id '{}'", + processInstanceId); + if (tx != null) { + tx.rollback(); + } + throw e; + } finally { + MOASessionDBUtils.closeSession(); } - } catch (Exception e) { - log.error("There are multiple persisted processes with the same process instance id '{}'", - processInstanceId); - if (tx != null) { - tx.rollback(); - } - throw e; - } finally { - MOASessionDBUtils.closeSession(); } return result; } @@ -74,8 +76,8 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { log.debug("Delete the ProcessInstanceStore for id='{}' from the database.", processInstanceId); ProcessInstanceStore toBeDeleted = load(processInstanceId); - boolean result = MOASessionDBUtils.delete(toBeDeleted); - if (result == false) { + boolean deleted = MOASessionDBUtils.delete(toBeDeleted); + if (!deleted) { log.warn("Could not delete the ProcessInstanceStore with process instance id '{}'", processInstanceId); throw new MOADatabaseException("Could not delete the ProcessInstanceStore with process instance id '" + processInstanceId + "'."); @@ -90,21 +92,23 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { List result = Collections.emptyList(); Transaction tx = null; - try { - synchronized (session) { + synchronized (session) { + try { + tx = session.beginTransaction(); // select all result = session.createCriteria(ProcessInstanceStore.class).list(); tx.commit(); + + } catch (Exception e) { + log.error("A problem occured while retrieving all stored ProcessInstanceStores."); + if (tx != null) { + tx.rollback(); + } + throw e; + } finally { + MOASessionDBUtils.closeSession(); } - } catch (Exception e) { - log.error("A problem occured while retrieving all stored ProcessInstanceStores."); - if (tx != null) { - tx.rollback(); - } - throw e; - } finally { - MOASessionDBUtils.closeSession(); } return result; } -- cgit v1.2.3 From c17a374c8996c2ac7496b9ab324a2645be60dfb2 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 30 Jan 2015 12:33:52 +0100 Subject: update handbook and default configuration --- id/server/data/deploy/conf/moa-id/moa-id.properties | 1 + id/server/doc/handbook/config/config.html | 7 +++++++ 2 files changed, 8 insertions(+) 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 a160ea1ff..c330758c8 100644 --- a/id/server/data/deploy/conf/moa-id/moa-id.properties +++ b/id/server/data/deploy/conf/moa-id/moa-id.properties @@ -48,6 +48,7 @@ service.foreignidentities.clientKeyStorePassword= stork.fakeIdL.active=false stork.fakeIdL.countries= stork.fakeIdL.keygroup= +stork.documentservice.url= ##Protocol configuration## diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html index a4278034e..f5292f76a 100644 --- a/id/server/doc/handbook/config/config.html +++ b/id/server/doc/handbook/config/config.html @@ -77,6 +77,7 @@
                • Testing
                • SZR Client für STORK <-> PVP Gateway Betrieb
                • +
                • STORK 2.0
@@ -1061,6 +1062,12 @@ https://<host>:<port>/moa-id-auth/MonitoringServlet IDL_signing MOA-SS Schlüsselgruppe, welche für die Signatur des Fake-Identitilinks verwendet werden soll. + + stork.documentservice.url + http://testvidp.buergerkarte.at/
+ DocumentService/DocumentService?wsdl + URL zum STORK 2 Dokumentenservice +

 

2.3 Konfiguration des Loggings

-- cgit v1.2.3 From 9c76562c98ff7ec8ccb2749ccd85309bfd3096b6 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 30 Jan 2015 13:47:25 +0100 Subject: Fix applicationContext.xml and STORKAuthentication.process.xml --- id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../moa/id/auth/modules/stork/STORKAuthentication.process.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index 2c699f24d..df59c2739 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -11,7 +11,7 @@ - + diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml index 73f4837e1..60989e638 100644 --- a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml @@ -1,8 +1,8 @@ -"> + - -- cgit v1.2.3 From 23fc42a3c273ceb05938c741508537bfaedab00a Mon Sep 17 00:00:00 2001 From: Christian Wagner Date: Fri, 30 Jan 2015 14:24:45 +0100 Subject: add persistence to process-engine additionally remove unnecessary method in the DAO --- .../src/main/webapp/WEB-INF/applicationContext.xml | 13 -- .../servlet/GenerateIFrameTemplateServlet.java | 15 +- .../auth/servlet/ProcessEngineSignalServlet.java | 3 +- .../moa/id/moduls/AuthenticationManager.java | 12 +- .../egovernment/moa/id/process/ProcessEngine.java | 57 +++--- .../moa/id/process/ProcessEngineImpl.java | 191 ++++++++++++++------- .../moa/id/process/dao/ProcessInstanceStore.java | 6 +- .../id/process/dao/ProcessInstanceStoreDAO.java | 10 -- .../process/dao/ProcessInstanceStoreDAOImpl.java | 29 ---- .../id/storage/AuthenticationSessionStoreage.java | 20 ++- 10 files changed, 176 insertions(+), 180 deletions(-) diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index a251064f6..c7b4e6419 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -13,21 +13,8 @@ - - - - - - - diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java index 7f53a1a13..d6c15c658 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java @@ -155,7 +155,7 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { // select and create process instance String processDefinitionId = ModuleRegistration.getInstance().selectProcess(ec); - ProcessInstance pi = getProcessEngine().createProcessInstance(processDefinitionId, ec); + String processInstanceId = getProcessEngine().createProcessInstance(processDefinitionId, ec); if (processDefinitionId == null) { Logger.warn("No suitable process found for SessionID " + moasession.getSessionID()); @@ -163,21 +163,20 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { } // keep process instance id in moa session - moasession.setProcessInstanceId(pi.getId()); + moasession.setProcessInstanceId(processInstanceId); // make sure moa session has been persisted before running the process try { AuthenticationSessionStoreage.storeSession(moasession); } catch (MOADatabaseException e) { Logger.error("Database Error! MOASession is not stored!"); - throw new MOAIDException("init.04", new Object[] { - moasession.getSessionID()}); + throw new MOAIDException("init.04", new Object[] { moasession.getSessionID() }); } - - // start process - getProcessEngine().start(pi); - } + // start process + getProcessEngine().start(processInstanceId); + + } catch (WrongParametersException ex) { handleWrongParameters(ex, req, resp); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java index c172124d2..4aff6ba38 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java @@ -72,8 +72,7 @@ public class ProcessEngineSignalServlet extends AuthServlet { } // wake up next task - ProcessInstance pi = getProcessEngine().getProcessInstance(session.getProcessInstanceId()); - getProcessEngine().signal(pi); + getProcessEngine().signal(session.getProcessInstanceId()); } catch (Exception ex) { handleError(null, ex, req, resp, null); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java index ffb5e3d65..0a7f71713 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java @@ -80,7 +80,6 @@ import at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration; import at.gv.egovernment.moa.id.process.ExecutionContextImpl; import at.gv.egovernment.moa.id.process.ProcessEngine; import at.gv.egovernment.moa.id.process.ProcessExecutionException; -import at.gv.egovernment.moa.id.process.ProcessInstance; import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.protocols.pvp2x.PVPTargetConfiguration; import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IEncoder; @@ -324,7 +323,7 @@ public class AuthenticationManager implements MOAIDAuthConstants { try { authSession = AuthenticationSessionStoreage .getSession(moaSessionID); - + if(authSession == null) { Logger.info("NO MOA Authentication data for ID " + moaSessionID); return; @@ -562,9 +561,10 @@ public class AuthenticationManager implements MOAIDAuthConstants { moasession.getSessionID()}); } - ProcessInstance pi = processEngine.createProcessInstance(processDefinitionId, executionContext); + String processInstanceId = processEngine.createProcessInstance(processDefinitionId, executionContext); + // keep process instance id in moa session - moasession.setProcessInstanceId(pi.getId()); + moasession.setProcessInstanceId(processInstanceId); // make sure moa session has been persisted before running the process try { @@ -574,9 +574,9 @@ public class AuthenticationManager implements MOAIDAuthConstants { throw new MOAIDException("init.04", new Object[] { moasession.getSessionID()}); } - + // start process - processEngine.start(pi); + processEngine.start(processInstanceId); } else { //load Parameters from OnlineApplicationConfiguration diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java index 2d9dcff8e..535070107 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java @@ -31,35 +31,35 @@ public interface ProcessEngine { void registerProcessDefinition(InputStream processDefinitionInputStream) throws ProcessDefinitionParserException; /** - * Creates a process instance according to the referenced process definition. + * Creates a process instance according to the referenced process definition, persists it into the database and returns it identifier. *

- * Note that the method returns a process instance which will be needed in order to start a process or to continue - * process execution after asynchronous task execution (refer to {@link #start(ProcessInstance)} and - * {@link #signal(ProcessInstance)} for further information). + * Note that the method returns the identifier of a process instance which will be needed in order to start a process or to continue + * process execution after asynchronous task execution (refer to {@link #start(String)} and + * {@link #signal(String)} for further information). * * @param processDefinitionId * The identifier of the respective process definition. * @param executionContext The execution context (may be {@code null}). - * @return The newly created process instance (never {@code null}). + * @return The id of the newly created process instance (never {@code null}). * @throws ProcessExecutionException * Thrown in case of error, e.g. when a {@code processDefinitionId} is referenced that does not exist. */ - ProcessInstance createProcessInstance(String processDefinitionId, ExecutionContext executionContext) throws ProcessExecutionException; + String createProcessInstance(String processDefinitionId, ExecutionContext executionContext) throws ProcessExecutionException; /** - * Creates a process instance according to the referenced process definition. + * Creates a process instance according to the referenced process definition, persists it into the database and returns it identifier. *

- * Note that the method returns a process instance which will be needed in order to start a process or to continue - * process execution after asynchronous task execution (refer to {@link #start(ProcessInstance)} and - * {@link #signal(ProcessInstance)} for further information). + * Note that the method returns the identifier of a process instance which will be needed in order to start a process or to continue + * process execution after asynchronous task execution (refer to {@link #start(String))} and + * {@link #signal(String)} for further information). * * @param processDefinitionId * The identifier of the respective process definition. - * @return The newly created process instance (never {@code null}). + * @return The id of the newly created process instance (never {@code null}). * @throws ProcessExecutionException * Thrown in case of error, e.g. when a {@code processDefinitionId} is referenced that does not exist. */ - ProcessInstance createProcessInstance(String processDefinitionId) throws ProcessExecutionException; + String createProcessInstance(String processDefinitionId) throws ProcessExecutionException; /** * Returns the process instance with a given {@code processInstanceId}. @@ -73,41 +73,24 @@ public interface ProcessEngine { ProcessInstance getProcessInstance(String processInstanceId); /** - * Starts the process using the given {@code processInstance}. + * Starts the process using the given {@code processInstanceId}. * - * @param processInstance - * The process instance. + * @param processInstanceId + * The process instance id. * @throws ProcessExecutionException * Thrown in case of error. */ - void start(ProcessInstance processInstance) throws ProcessExecutionException; + void start(String processInstanceId) throws ProcessExecutionException; + /** * Resumes process execution after an asynchronous task has been executed. * - * @param processInstance - * The process instance. + * @param processInstanceId + * The process instance id. * @throws ProcessExecutionException * Thrown in case of error. */ - void signal(ProcessInstance processInstance) throws ProcessExecutionException; - - /** - * Performs cleanup, removing all process instances that have not been used for a certain time. - * - * @see #setProcessInstanceMaxIdleTimeSeconds(long) - */ - void cleanup(); - - /** - * Returns the first process instance with a process context containing some {@code value} stored under key {@code key}. - * - * @param key - * The key. - * @param value - * The value that needs to match. - * @return The process instance or {@code null} in case no process instance was found. - */ - ProcessInstance findProcessInstanceWith(String key, Serializable value); + void signal(String processInstanceId) throws ProcessExecutionException; } \ No newline at end of file diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java index 3ba8fb9ed..8af9e1b69 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java @@ -2,11 +2,8 @@ package at.gv.egovernment.moa.id.process; import java.io.InputStream; import java.io.Serializable; -import java.util.Date; -import java.util.Iterator; +import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.collections4.CollectionUtils; @@ -16,10 +13,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; +import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext; import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator; import at.gv.egovernment.moa.id.process.api.Task; +import at.gv.egovernment.moa.id.process.dao.ProcessInstanceStore; +import at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAO; +import at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAOImpl; import at.gv.egovernment.moa.id.process.model.EndEvent; import at.gv.egovernment.moa.id.process.model.ProcessDefinition; import at.gv.egovernment.moa.id.process.model.ProcessNode; @@ -33,21 +34,20 @@ import at.gv.egovernment.moa.id.process.model.Transition; * */ public class ProcessEngineImpl implements ProcessEngine { - + private Logger log = LoggerFactory.getLogger(getClass()); - + private ProcessDefinitionParser pdp = new ProcessDefinitionParser(); + ProcessInstanceStoreDAO piStoreDao = ProcessInstanceStoreDAOImpl.getInstance(); + private Map processDefinitions = new ConcurrentHashMap(); - private Map processInstances = new ConcurrentHashMap(); - + private final static String MDC_CTX_PI_NAME = "processInstanceId"; private final static String MDC_CTX_TASK_NAME = "taskId"; - - private static final long DEFAULT_PROCESS_INSTANCE_MAX_AGE_SECONDS = 3600; - private long processInstanceIdleTimeSeconds = DEFAULT_PROCESS_INSTANCE_MAX_AGE_SECONDS; + private ExpressionEvaluator transitionConditionExpressionEvaluator; - + @Override public void registerProcessDefinition(ProcessDefinition processDefinition) { log.info("Registering process definition '{}'.", processDefinition.getId()); @@ -61,7 +61,7 @@ public class ProcessEngineImpl implements ProcessEngine { /** * Sets the process definitions. - * + * * @param processDefinitions * The process definitions. * @throws IllegalArgumentException @@ -76,19 +76,6 @@ public class ProcessEngineImpl implements ProcessEngine { registerProcessDefinition(pd); } } - - /** - * Defines the time frame in seconds an idle process instance will be managed by the process engine. A process - * instance with an idle time larger than the given time will be removed. - *

- * Note that {@link #cleanup()} needs to be called in order to remove expired process instances. - * - * @param processInstanceMaxIdleTimeSeconds - * The maximum idle time in seconds. - */ - public void setProcessInstanceMaxIdleTimeSeconds(long processInstanceMaxIdleTimeSeconds) { - this.processInstanceIdleTimeSeconds = processInstanceMaxIdleTimeSeconds; - } /** * Sets an expression evaluator that should be used to process transition condition expressions. @@ -98,10 +85,10 @@ public class ProcessEngineImpl implements ProcessEngine { ExpressionEvaluator transitionConditionExpressionEvaluator) { this.transitionConditionExpressionEvaluator = transitionConditionExpressionEvaluator; } - + @Override - public ProcessInstance createProcessInstance(String processDefinitionId, ExecutionContext executionContext) throws ProcessExecutionException { + public String createProcessInstance(String processDefinitionId, ExecutionContext executionContext) throws ProcessExecutionException { // look for respective process definition ProcessDefinition pd = processDefinitions.get(processDefinitionId); if (pd == null) { @@ -110,19 +97,32 @@ public class ProcessEngineImpl implements ProcessEngine { // create and keep process instance ProcessInstance pi = new ProcessInstance(pd, executionContext); log.info("Creating process instance from process definition '{}': {}", processDefinitionId, pi.getId()); - processInstances.put(pi.getId(), pi); - return pi; + + try { + saveProcessInstance(pi); + } catch (MOADatabaseException e) { + throw new ProcessExecutionException(e.getMessage(), e.getCause()); + } + + return pi.getId(); } @Override - public ProcessInstance createProcessInstance(String processDefinitionId) throws ProcessExecutionException { + public String createProcessInstance(String processDefinitionId) throws ProcessExecutionException { return createProcessInstance(processDefinitionId, null); } @Override - public void start(ProcessInstance pi) throws ProcessExecutionException { - MDC.put(MDC_CTX_PI_NAME, pi.getId()); + public void start(String processInstanceId) throws ProcessExecutionException { + + boolean mdcEntryAdded = false; + try { + ProcessInstance pi = loadProcessInstance(processInstanceId); + + MDC.put(MDC_CTX_PI_NAME, pi.getId()); + mdcEntryAdded = true; + if (!ProcessInstanceState.NOT_STARTED.equals(pi.getState())) { throw new ProcessExecutionException("Process instance '" + pi.getId() + "' has already been started (current state is " + pi.getState() + ")."); } @@ -130,45 +130,49 @@ public class ProcessEngineImpl implements ProcessEngine { // execute process pi.setState(ProcessInstanceState.STARTED); execute(pi); + + saveProcessInstance(pi); + } catch (MOADatabaseException e) { + throw new ProcessExecutionException(e.getMessage(), e.getCause()); + } finally { - MDC.remove(MDC_CTX_PI_NAME); + if (mdcEntryAdded) + MDC.remove(MDC_CTX_PI_NAME); } } @Override - public void signal(ProcessInstance pi) throws ProcessExecutionException { - MDC.put(MDC_CTX_PI_NAME, pi.getId()); + public void signal(String processInstanceId) throws ProcessExecutionException { + + boolean mdcEntryAdded = false; + try { + ProcessInstance pi = loadProcessInstance(processInstanceId); + + MDC.put(MDC_CTX_PI_NAME, pi.getId()); + mdcEntryAdded = true; + if (!ProcessInstanceState.SUSPENDED.equals(pi.getState())) { throw new ProcessExecutionException("Process instance '" + pi.getId() + "' has not been suspended (current state is " + pi.getState() + ")."); } + log.info("Waking up process instance '{}'.", pi.getId()); pi.setState(ProcessInstanceState.STARTED); execute(pi); + + saveProcessInstance(pi); + } catch (MOADatabaseException e) { + throw new ProcessExecutionException(e.getMessage(), e.getCause()); + } finally { - MDC.remove(MDC_CTX_PI_NAME); + if (mdcEntryAdded) + MDC.remove(MDC_CTX_PI_NAME); } } - @Override - public synchronized void cleanup() { - log.trace("Cleanup job started."); - Iterator> it = processInstances.entrySet().iterator(); - while (it.hasNext()) { - Entry entry = it.next(); - ProcessInstance pi = entry.getValue(); - log.trace("Checking process instance {}.", pi); - long ageMillis = new Date().getTime() - pi.getLru().getTime(); - if (ageMillis > processInstanceIdleTimeSeconds * 1000) { - log.info("Removing process instance '{}'.", pi.getId()); - processInstances.remove(entry.getKey()); - } - } - log.trace("Cleanup job completed."); - } /** - * Instantates a task implementation given by a {@link TaskInfo}. + * Instantiates a task implementation given by a {@link TaskInfo}. * @param ti The task info. * @return A Task implementation or {@code null} if the task info does not reference any task implementing classes. * @throws ProcessExecutionException Thrown in case of error (when the referenced class does not implement {@link Task} for instance). @@ -194,7 +198,7 @@ public class ProcessEngineImpl implements ProcessEngine { throw new ProcessExecutionException("Unable to instantiate class '" + clazz + "' associated with task '" + ti.getId() + "' .", e); } } - + return task; } @@ -239,7 +243,12 @@ public class ProcessEngineImpl implements ProcessEngine { } else if (processNode instanceof EndEvent) { log.info("Finishing process instance '{}'.", pi.getId()); - processInstances.remove(pi.getId()); + + try { + piStoreDao.remove(pi.getId()); + } catch (MOADatabaseException e) { + throw new ProcessExecutionException(e.getMessage(), e.getCause()); + } pi.setState(ProcessInstanceState.ENDED); log.debug("Final process context: {}", pi.getExecutionContext().keySet()); return; @@ -282,23 +291,73 @@ public class ProcessEngineImpl implements ProcessEngine { @Override public ProcessInstance getProcessInstance(String processInstanceId) { - ProcessInstance processInstance = processInstances.get(processInstanceId); + + ProcessInstance processInstance; + try { + processInstance = loadProcessInstance(processInstanceId); + + } catch (MOADatabaseException e) { + throw new IllegalArgumentException("The process instance '" + processInstanceId + "' could not be retrieved."); + } + if (processInstance == null) { throw new IllegalArgumentException("The process instance '" + processInstanceId + "' does not/no longer exist."); } + return processInstance; } - @Override - public ProcessInstance findProcessInstanceWith(String key, Serializable value) { - Iterator it = processInstances.values().iterator(); - while (it.hasNext()) { - ProcessInstance pi = it.next(); - if (Objects.equals(pi.getExecutionContext().get(key), value)) { - return pi; - } + /** + * Persists a {@link ProcessInstance} to the database. + * @param processInstance The object to persist. + * @throws MOADatabaseException Thrown if an error occurs while accessing the database. + */ + private void saveProcessInstance(ProcessInstance processInstance) throws MOADatabaseException { + ProcessInstanceStore store = new ProcessInstanceStore(); + + ExecutionContext ctx = processInstance.getExecutionContext(); + + Map ctxData = new HashMap(); + for (String key : ctx.keySet()) { + ctxData.put(key, ctx.get(key)); + } + store.setExecutionContextData(ctxData); + + store.setNextTaskId(processInstance.getNextId()); + store.setProcessDefinitionId(processInstance.getProcessDefinition().getId()); + + store.setProcessInstanceId(processInstance.getId()); + store.setProcessState(processInstance.getState()); + + piStoreDao.save(store); + } + + /** + * Load a {@link ProcessInstance} with a certain id from the database. + * @param processInstanceId The process instance id + * @return The process instance corresponding to the id or {@code null} if no such object is found. + * @throws MOADatabaseException Thrown if an error occurs while accessing the database. + */ + private ProcessInstance loadProcessInstance(String processInstanceId) throws MOADatabaseException { + + ProcessInstanceStore piStore = piStoreDao.load(processInstanceId); + + if (piStore == null) { + return null; } - return null; + + ExecutionContext executionContext = new ExecutionContextImpl(piStore.getProcessInstanceId()); + + Map executionContextData = piStore.getExecutionContextData(); + for (String key : executionContextData.keySet()) { + executionContext.put(key, executionContextData.get(key)); + } + + ProcessInstance pi = new ProcessInstance(processDefinitions.get(piStore.getProcessDefinitionId()), executionContext); + pi.setNextId(piStore.getNextTaskId()); + pi.setState(piStore.getProcessState()); + + return pi; } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index c94c95516..c86d0de3d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -32,7 +32,7 @@ public class ProcessInstanceStore { @Column(name = "processState", nullable = false) @Enumerated(value = EnumType.STRING) - private Enum processState; + private ProcessInstanceState processState; @Column(name = "executionContextData", nullable = false) @Lob @@ -50,7 +50,7 @@ public class ProcessInstanceStore { return nextTaskId; } - public Enum getProcessState() { + public ProcessInstanceState getProcessState() { return processState; } @@ -70,7 +70,7 @@ public class ProcessInstanceStore { this.nextTaskId = nextTaskId; } - public void setProcessState(Enum processState) { + public void setProcessState(ProcessInstanceState processState) { this.processState = processState; } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java index 0aa6f80cd..999a9b82b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java @@ -42,14 +42,4 @@ public interface ProcessInstanceStoreDAO { */ void remove(String processInstanceId) throws MOADatabaseException; - /** - * Returns all {@link ProcessInstanceStore} objects stored in the database. - * The returned list may be empty, but never {@code null}. - * - * @return a list of {@link ProcessInstanceStore} (never {@code null}). - * @throws MOADatabaseException - * is thrown if a problem occurs while accessing the database. - */ - List getAllProcessInstanceStores() throws MOADatabaseException; - } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java index 4b7468013..e9e977d53 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -84,33 +84,4 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { } } - @SuppressWarnings("unchecked") - @Override - public List getAllProcessInstanceStores() throws MOADatabaseException { - log.debug("Retrieve a list with all ProcessInstanceStores from the database."); - Session session = MOASessionDBUtils.getCurrentSession(); - - List result = Collections.emptyList(); - Transaction tx = null; - synchronized (session) { - try { - - tx = session.beginTransaction(); - // select all - result = session.createCriteria(ProcessInstanceStore.class).list(); - tx.commit(); - - } catch (Exception e) { - log.error("A problem occured while retrieving all stored ProcessInstanceStores."); - if (tx != null) { - tx.rollback(); - } - throw e; - } finally { - MOASessionDBUtils.closeSession(); - } - } - return result; - } - } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java index a9f5ed60a..9ee29c260 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java @@ -48,6 +48,7 @@ import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.data.EncryptedData; import at.gv.egovernment.moa.id.data.SLOInformationInterface; import at.gv.egovernment.moa.id.moduls.IRequest; +import at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAOImpl; import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.AssertionAttributeExtractorExeption; import at.gv.egovernment.moa.id.protocols.pvp2x.utils.AssertionAttributeExtractor; import at.gv.egovernment.moa.id.util.Random; @@ -912,19 +913,26 @@ public class AuthenticationSessionStoreage { } - private static void cleanDelete(AuthenticatedSessionStore result) { + private static void cleanDelete(AuthenticatedSessionStore result) { + + try { + AuthenticationSession session = getSession(result.getSessionid()); + ProcessInstanceStoreDAOImpl.getInstance().remove(session.getProcessInstanceId()); + + } catch (MOADatabaseException e) { + Logger.warn("Removing process with processID=" + result.getSessionid() + " FAILED.", e); + } + try { result.setSession("blank".getBytes()); MOASessionDBUtils.saveOrUpdate(result); - + } catch (MOADatabaseException e) { Logger.warn("Blank authenticated session with sessionID=" + result.getSessionid() + " FAILED.", e); - + } finally { if (!MOASessionDBUtils.delete(result)) - Logger.error("Authenticated session with sessionID=" + result.getSessionid() - + " not removed! (Error during Database communication)"); - + Logger.error("Authenticated session with sessionID=" + result.getSessionid() + " not removed! (Error during Database communication)"); } } -- cgit v1.2.3 From 730cb523e5d29dee54c7fb1c0219efa879362813 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 30 Jan 2015 15:09:35 +0100 Subject: Exclude non-working tests. - exclude at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest - exclude at/gv/egovernment/moa/id/process/test/ProcessEngineTest --- id/server/idserverlib/pom.xml | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 7666db141..102bec7bd 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -489,15 +489,30 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + default-testCompile + test-compile + + + at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java + at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java + + + + testCompile + + + + org.apache.maven.plugins @@ -557,7 +572,9 @@ + + -- cgit v1.2.3 From 2e27b939251017882b323b6478c345439d486494 Mon Sep 17 00:00:00 2001 From: Christian Wagner Date: Mon, 2 Feb 2015 12:45:40 +0100 Subject: fix process instance persistence --- .../moa/id/process/ProcessInstance.java | 26 ++++++++++------------ .../moa/id/process/dao/ProcessInstanceStore.java | 3 +++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java index ef69451eb..a6cf3b57f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessInstance.java @@ -5,6 +5,8 @@ import java.util.Date; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.time.DurationFormatUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.process.model.ProcessDefinition; @@ -27,21 +29,12 @@ public class ProcessInstance implements Serializable { private ExecutionContext executionContext; private ProcessInstanceState state = ProcessInstanceState.NOT_STARTED; - /** - * Creates a new process instance, based on a given process definition.

- * An execution context will be created internally. - * - * @param processDefinition - * The process definition. - */ - ProcessInstance(ProcessDefinition processDefinition) { - this(processDefinition, null); - } + private Logger log = LoggerFactory.getLogger(getClass()); /** * Creates a new process instance, based on a given process definition and a * given execution context. If the given execution context is {@code null} a new execution context will be created.

- * The process instance id of the execution context will automatically be set (and overwritten if already set). + * The process instance id of the execution context will be newly generated if it is {@code null} in the execution context. * * @param processDefinition * The process definition. @@ -51,12 +44,17 @@ public class ProcessInstance implements Serializable { ProcessInstance(ProcessDefinition processDefinition, ExecutionContext executionContext) { this.processDefinition = processDefinition; nextId = processDefinition.getStartEvent().getId(); - String pdIdLocalPart = RandomStringUtils.random(RND_ID_LENGTH, 0, 0, true, true, null, - SecureRandomHolder.getInstance()); if (executionContext == null) { executionContext = new ExecutionContextImpl(); } - executionContext.setProcessInstanceId(this.processDefinition.getId() + "-" + pdIdLocalPart); + if (executionContext.getProcessInstanceId() == null) { + String pdIdLocalPart = RandomStringUtils.random(RND_ID_LENGTH, 0, 0, true, true, null, + SecureRandomHolder.getInstance()); + executionContext.setProcessInstanceId(this.processDefinition.getId() + "-" + pdIdLocalPart); + } else { + log.debug("Using process instance id from execution context."); + } + log.debug("Creating process instance with id '{}'.", executionContext.getProcessInstanceId()); this.executionContext = executionContext; touch(); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index c86d0de3d..010f8d984 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -4,9 +4,11 @@ import java.io.Serializable; import java.util.Map; import javax.persistence.Column; +import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.Lob; import javax.persistence.Table; @@ -36,6 +38,7 @@ public class ProcessInstanceStore { @Column(name = "executionContextData", nullable = false) @Lob + @ElementCollection(fetch=FetchType.EAGER) private Map executionContextData; public String getProcessInstanceId() { -- cgit v1.2.3 From 036c31a1dcff04784946159c2612e48bf2ec9e0e Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Mon, 2 Feb 2015 14:03:17 +0100 Subject: Fix persistence. --- .../moa/id/process/dao/ProcessInstanceStore.java | 3 ++- .../id/process/dao/ProcessInstanceStoreDAOImpl.java | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index 010f8d984..625199cd2 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -1,6 +1,7 @@ package at.gv.egovernment.moa.id.process.dao; import java.io.Serializable; +import java.util.HashMap; import java.util.Map; import javax.persistence.Column; @@ -39,7 +40,7 @@ public class ProcessInstanceStore { @Column(name = "executionContextData", nullable = false) @Lob @ElementCollection(fetch=FetchType.EAGER) - private Map executionContextData; + private Map executionContextData = new HashMap<>(); public String getProcessInstanceId() { return processInstanceId; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java index e9e977d53..0a50afc6c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -67,6 +67,11 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { MOASessionDBUtils.closeSession(); } } + if (result != null) { + log.debug("Found process instance store for instance '{}'.", processInstanceId); + } else { + log.debug("Unable to find process instance store for instance '{}'.", processInstanceId); + } return result; } @@ -74,14 +79,15 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { public void remove(String processInstanceId) throws MOADatabaseException { log.debug("Delete the ProcessInstanceStore for id='{}' from the database.", processInstanceId); - ProcessInstanceStore toBeDeleted = load(processInstanceId); - boolean deleted = MOASessionDBUtils.delete(toBeDeleted); - if (!deleted) { - log.warn("Could not delete the ProcessInstanceStore with process instance id '{}'", processInstanceId); - throw new MOADatabaseException("Could not delete the ProcessInstanceStore with process instance id '" - + processInstanceId + "'."); - } + if (toBeDeleted != null) { + if (!MOASessionDBUtils.delete(toBeDeleted)) { + log.warn("Could not delete the ProcessInstanceStore with process instance id '{}'", processInstanceId); + throw new MOADatabaseException("Could not delete the ProcessInstanceStore with process instance id '" + + processInstanceId + "'."); + } + } else + log.trace("ProcessInstanceStore for id='{}' was not found and could therefore not be deleted.", processInstanceId); } } -- cgit v1.2.3 From 9a94ecf85e323321e23df8a93ad206c4a699d3fd Mon Sep 17 00:00:00 2001 From: Christian Wagner Date: Tue, 3 Feb 2015 09:17:14 +0100 Subject: serialize ExecutionContext data in a single database field --- .../moa/id/process/dao/ProcessInstanceStore.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index 625199cd2..c6bf86823 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -1,19 +1,18 @@ package at.gv.egovernment.moa.id.process.dao; import java.io.Serializable; -import java.util.HashMap; import java.util.Map; import javax.persistence.Column; -import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; -import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.Lob; import javax.persistence.Table; +import org.hibernate.internal.util.SerializationHelper; + import at.gv.egovernment.moa.id.process.ProcessInstanceState; @Entity @@ -39,8 +38,7 @@ public class ProcessInstanceStore { @Column(name = "executionContextData", nullable = false) @Lob - @ElementCollection(fetch=FetchType.EAGER) - private Map executionContextData = new HashMap<>(); + private byte[] executionContextData; public String getProcessInstanceId() { return processInstanceId; @@ -58,8 +56,9 @@ public class ProcessInstanceStore { return processState; } + @SuppressWarnings("unchecked") public Map getExecutionContextData() { - return executionContextData; + return (Map) SerializationHelper.deserialize(executionContextData); } public void setProcessInstanceId(String processInstanceId) { @@ -79,7 +78,7 @@ public class ProcessInstanceStore { } public void setExecutionContextData(Map executionContextData) { - this.executionContextData = executionContextData; + this.executionContextData = SerializationHelper.serialize((Serializable) executionContextData); } } -- cgit v1.2.3 From 4b6fd327b29ff84f61914f33b6361fa31441c92e Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 4 Feb 2015 11:31:43 +0100 Subject: Create separate module STORK (MOAID-67) - Add new maven module moa-id-modules and sub module moa-id-module-stork. - Move stork relates processes and task to module moa-id-module-stork. - Move module registration to modules package. --- id/server/auth/pom.xml | 4 + .../src/main/webapp/WEB-INF/applicationContext.xml | 4 +- .../id/auth/modules/AbstractAuthServletTask.java | 378 ++++++++++++++ .../moa/id/auth/modules/AuthModule.java | 41 ++ .../modules/internal/DefaultAuthModuleImpl.java | 2 +- .../internal/tasks/AbstractAuthServletTask.java | 378 -------------- .../internal/tasks/CertificateReadRequestTask.java | 4 +- .../internal/tasks/CreateIdentityLinkFormTask.java | 1 + .../modules/internal/tasks/GetForeignIDTask.java | 1 + .../internal/tasks/GetMISSessionIDTask.java | 1 + .../tasks/PrepareAuthBlockSignatureTask.java | 1 + .../tasks/VerifyAuthenticationBlockTask.java | 1 + .../internal/tasks/VerifyCertificateTask.java | 1 + .../internal/tasks/VerifyIdentityLinkTask.java | 1 + .../modules/registration/ModuleRegistration.java | 149 ++++++ .../id/auth/modules/stork/STORKAuthModuleImpl.java | 39 -- .../stork/STORKWebApplicationInitializer.java | 37 -- .../AbstractPepsConnectorWithLocalSigningTask.java | 223 -------- .../tasks/CreateStorkAuthRequestFormTask.java | 112 ---- .../PepsConnectorHandleLocalSignResponseTask.java | 216 -------- ...onnectorHandleResponseWithoutSignatureTask.java | 439 ---------------- .../modules/stork/tasks/PepsConnectorTask.java | 566 --------------------- .../servlet/GenerateIFrameTemplateServlet.java | 2 +- .../moa/id/moduls/AuthenticationManager.java | 2 +- .../id/moduls/moduleregistration/AuthModule.java | 41 -- .../moduleregistration/ModuleRegistration.java | 149 ------ .../egovernment/moa/id/process/ProcessEngine.java | 3 +- .../moa/id/process/ProcessEngineImpl.java | 6 +- ...t.gv.egovernment.moa.id.auth.modules.AuthModule | 2 + ...ent.moa.id.moduls.moduleregistration.AuthModule | 2 - .../auth/modules/stork/STORK.authmodule.beans.xml | 14 - .../modules/stork/STORKAuthentication.process.xml | 29 -- id/server/modules/module-stork/pom.xml | 22 + .../id/auth/modules/stork/STORKAuthModuleImpl.java | 39 ++ .../stork/STORKWebApplicationInitializer.java | 37 ++ .../AbstractPepsConnectorWithLocalSigningTask.java | 223 ++++++++ .../tasks/CreateStorkAuthRequestFormTask.java | 112 ++++ .../PepsConnectorHandleLocalSignResponseTask.java | 216 ++++++++ ...onnectorHandleResponseWithoutSignatureTask.java | 439 ++++++++++++++++ .../modules/stork/tasks/PepsConnectorTask.java | 566 +++++++++++++++++++++ .../auth/modules/stork/STORK.authmodule.beans.xml | 14 + .../modules/stork/STORKAuthentication.process.xml | 29 ++ id/server/modules/pom.xml | 48 ++ id/server/pom.xml | 1 + pom.xml | 7 +- 45 files changed, 2346 insertions(+), 2256 deletions(-) create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AuthModule.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java create mode 100644 id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule delete mode 100644 id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule delete mode 100644 id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml delete mode 100644 id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml create mode 100644 id/server/modules/module-stork/pom.xml create mode 100644 id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java create mode 100644 id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java create mode 100644 id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java create mode 100644 id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java create mode 100644 id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java create mode 100644 id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java create mode 100644 id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java create mode 100644 id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml create mode 100644 id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml create mode 100644 id/server/modules/pom.xml diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 529737820..df45568dc 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -137,6 +137,10 @@ oasis-dss-api 1.0.0-RELEASE + + MOA.id.server.modules + moa-id-module-stork + diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index 1fe3b4254..fabe6cd9c 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -15,9 +15,9 @@ - - + + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java new file mode 100644 index 000000000..3b20e85d7 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java @@ -0,0 +1,378 @@ +package at.gv.egovernment.moa.id.auth.modules; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.lang3.ArrayUtils; + +import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.servlet.AuthServlet; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; +import at.gv.egovernment.moa.id.process.springweb.AbstractSpringWebSupportedTask; +import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; +import at.gv.egovernment.moa.id.storage.IExceptionStore; +import at.gv.egovernment.moa.id.util.ServletUtils; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; + +/** + * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing + * etc.).

The code has been taken from {@link AuthServlet}. + */ +public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask { + + protected static final String ERROR_CODE_PARAM = "errorid"; + + protected void handleErrorNoRedirect(String errorMessage, Throwable exceptionThrown, + HttpServletRequest req, HttpServletResponse resp) { + + if (null != errorMessage) { + Logger.error(errorMessage); + req.setAttribute("ErrorMessage", errorMessage); + } + + if (null != exceptionThrown) { + if (null == errorMessage) + errorMessage = exceptionThrown.getMessage(); + Logger.error(errorMessage, exceptionThrown); + req.setAttribute("ExceptionThrown", exceptionThrown); + } + + if (Logger.isDebugEnabled()) { + req.setAttribute("LogLevel", "debug"); + } + + + StatisticLogger logger = StatisticLogger.getInstance(); + logger.logErrorOperation(exceptionThrown); + + + // forward this to errorpage-auth.jsp where the HTML error page is + // generated + ServletContext context = req.getServletContext(); + RequestDispatcher dispatcher = context + .getRequestDispatcher("/errorpage-auth.jsp"); + try { + + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + + dispatcher.forward(req, resp); + } catch (ServletException e) { + Logger.error(e); + } catch (IOException e) { + Logger.error(e); + } + } + + /** + * Handles an error.
> + *
    + *
  • Logs the error
  • + *
  • Places error message and exception thrown into the request as request + * attributes (to be used by "/errorpage-auth.jsp")
  • + *
  • Sets HTTP status 500 (internal server error)
  • + *
+ * + * @param errorMessage + * error message + * @param exceptionThrown + * exception thrown + * @param req + * servlet request + * @param resp + * servlet response + */ + protected void handleError(String errorMessage, Throwable exceptionThrown, + HttpServletRequest req, HttpServletResponse resp, String pendingRequestID) { + + if (null != errorMessage) { + Logger.error(errorMessage); + req.setAttribute("ErrorMessage", errorMessage); + } + + if (null != exceptionThrown) { + if (null == errorMessage) + errorMessage = exceptionThrown.getMessage(); + Logger.error(errorMessage, exceptionThrown); + req.setAttribute("ExceptionThrown", exceptionThrown); + } + + if (Logger.isDebugEnabled()) { + req.setAttribute("LogLevel", "debug"); + } + + if (!(exceptionThrown instanceof MOAIDException)) { + Logger.error("Receive an internal error: Message=" + exceptionThrown.getMessage(), exceptionThrown); + + } + + IExceptionStore store = DBExceptionStoreImpl.getStore(); + String id = store.storeException(exceptionThrown); + + if (id != null && MiscUtil.isNotEmpty(pendingRequestID)) { + + String redirectURL = null; + + redirectURL = ServletUtils.getBaseUrl(req); + redirectURL += "/dispatcher?" + ERROR_CODE_PARAM + "=" + id + + "&" + DispatcherServlet.PARAM_TARGET_PENDINGREQUESTID + "=" + pendingRequestID; + + resp.setContentType("text/html"); + resp.setStatus(302); + + resp.addHeader("Location", redirectURL); + Logger.debug("REDIRECT TO: " + redirectURL); + + return; + + } else { + + //Exception can not be stored in database + handleErrorNoRedirect(errorMessage, exceptionThrown, req, resp); + } + } + + /** + * Handles a WrongParametersException. + * + * @param req + * servlet request + * @param resp + * servlet response + */ + protected void handleWrongParameters(WrongParametersException ex, + HttpServletRequest req, HttpServletResponse resp) { + Logger.error(ex.toString()); + req.setAttribute("WrongParameters", ex.getMessage()); + + // forward this to errorpage-auth.jsp where the HTML error page is + // generated + ServletContext context = req.getServletContext(); + RequestDispatcher dispatcher = context + .getRequestDispatcher("/errorpage-auth.jsp"); + try { + setNoCachingHeaders(resp); + dispatcher.forward(req, resp); + } catch (ServletException e) { + Logger.error(e); + } catch (IOException e) { + Logger.error(e); + } + } + + /** + * Logs all servlet parameters for debugging purposes. + */ + protected void logParameters(HttpServletRequest req) { + for (Enumeration params = req.getParameterNames(); params + .hasMoreElements();) { + String parname = (String) params.nextElement(); + Logger.debug("Parameter " + parname + req.getParameter(parname)); + } + } + + /** + * Parses the request input stream for parameters, assuming parameters are + * encoded UTF-8 (no standard exists how browsers should encode them). + * + * @param req + * servlet request + * + * @return mapping parameter name -> value + * + * @throws IOException + * if parsing request parameters fails. + * + * @throws FileUploadException + * if parsing request parameters fails. + */ + protected Map getParameters(HttpServletRequest req) throws IOException, + FileUploadException { + + Map parameters = new HashMap(); + + if (ServletFileUpload.isMultipartContent(req)) { + // request is encoded as mulitpart/form-data + FileItemFactory factory = new DiskFileItemFactory(); + ServletFileUpload upload = null; + upload = new ServletFileUpload(factory); + List items = null; + items = upload.parseRequest(req); + for (int i = 0; i < items.size(); i++) { + FileItem item = (FileItem) items.get(i); + if (item.isFormField()) { + // Process only form fields - no file upload items + String logString = item.getString("UTF-8"); + + // TODO use RegExp + String startS = ""; + String endS = "urn:publicid:gv.at:baseid"; + String logWithMaskedBaseid = logString; + int start = logString.indexOf(startS); + if (start > -1) { + int end = logString.indexOf(endS); + if (end > -1) { + logWithMaskedBaseid = logString.substring(0, start); + logWithMaskedBaseid += startS; + logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; + logWithMaskedBaseid += logString.substring(end, + logString.length()); + } + } + parameters + .put(item.getFieldName(), item.getString("UTF-8")); + Logger.debug("Processed multipart/form-data request parameter: \nName: " + + item.getFieldName() + + "\nValue: " + + logWithMaskedBaseid); + } + } + } + + else { + // request is encoded as application/x-www-urlencoded + // [tknall]: we must not consume request body input stream once servlet-api request parameters have been accessed + + /* + InputStream in = req.getInputStream(); + + String paramName; + String paramValueURLEncoded; + do { + paramName = new String(readBytesUpTo(in, '=')); + if (paramName.length() > 0) { + paramValueURLEncoded = readBytesUpTo(in, '&'); + String paramValue = URLDecoder.decode(paramValueURLEncoded, + "UTF-8"); + parameters.put(paramName, paramValue); + } + } while (paramName.length() > 0); + in.close(); + */ + + Iterator> requestParamIt = req.getParameterMap().entrySet().iterator(); + while (requestParamIt.hasNext()) { + Entry entry = requestParamIt.next(); + String key = entry.getKey(); + String[] values = entry.getValue(); + // take the last value from the value array since the legacy code above also does it this way + parameters.put(key, ArrayUtils.isEmpty(values) ? null : values[values.length-1]); + } + + } + + return parameters; + } + + /** + * Reads bytes up to a delimiter, consuming the delimiter. + * + * @param in + * input stream + * @param delimiter + * delimiter character + * @return String constructed from the read bytes + * @throws IOException + */ + protected String readBytesUpTo(InputStream in, char delimiter) + throws IOException { + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + boolean done = false; + int b; + while (!done && (b = in.read()) >= 0) { + if (b == delimiter) + done = true; + else + bout.write(b); + } + return bout.toString(); + } + + /** + * Sets response headers that prevent caching (code taken from {@link AuthServlet}). + * + * @param resp + * The HttpServletResponse. + */ + public void setNoCachingHeaders(HttpServletResponse resp) { + resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); + resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); + resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); + resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); + } + + /** + * Adds a parameter to a URL. + * + * @param url + * the URL + * @param paramname + * parameter name + * @param paramvalue + * parameter value + * @return the URL with parameter added + */ + protected static String addURLParameter(String url, String paramname, + String paramvalue) { + String param = paramname + "=" + paramvalue; + if (url.indexOf("?") < 0) + return url + "?" + param; + else + return url + "&" + param; + } + + /** + * Checks if HTTP requests are allowed + * + * @param authURL + * requestURL + * @throws AuthenticationException + * if HTTP requests are not allowed + * @throws ConfigurationException + */ + protected void checkIfHTTPisAllowed(String authURL) + throws AuthenticationException, ConfigurationException { + // check if HTTP Connection may be allowed (through + // FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY) + + //Removed from MOA-ID 2.0 config +// String boolStr = AuthConfigurationProvider +// .getInstance() +// .getGenericConfigurationParameter( +// AuthConfigurationProvider.FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY); + if ((!authURL.startsWith("https:")) + //&& (false == BoolUtils.valueOf(boolStr)) + ) + throw new AuthenticationException("auth.07", new Object[] { authURL + + "*" }); + + } + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AuthModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AuthModule.java new file mode 100644 index 000000000..a31f3ceb0 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AuthModule.java @@ -0,0 +1,41 @@ +package at.gv.egovernment.moa.id.auth.modules; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.model.ProcessDefinition; + +/** + * Provides metadata of a certain module. Uses for module discovery and process selection. + */ +public interface AuthModule { + + /** + * Returns the priority of the module. The priority defines the order of the respective module within the chain of + * discovered modules. Higher priorized modules are asked before lower priorized modules for a process that they can + * handle. + *

+ * Internal default modules are priorized neutral ({@code 0}. Use a higher priority ({@code 1...Integer.MAX_VALUE}) + * in order to have your module(s) priorized or a lower priority ({@code Integer.MIN_VALUE...-1}) in order to put + * your modules behind default modules. + * + * @return the priority of the module. + */ + int getPriority(); + + /** + * Checks if the module has a process, which is able to perform an authentication with the given + * {@link ExecutionContext}. + * + * @param context + * an ExecutionContext for a process. + * @return the process-ID of a process which is able to work with the given ExecutionContext, or {@code null}. + */ + String selectProcess(ExecutionContext context); + + /** + * Returns the an Array of {@link ProcessDefinition}s of the processes included in this module. + * + * @return an array of resource uris of the processes included in this module. + */ + String[] getProcessDefinitions(); + +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java index a3b105cfd..8ae4a9999 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/DefaultAuthModuleImpl.java @@ -2,7 +2,7 @@ package at.gv.egovernment.moa.id.auth.modules.internal; import org.apache.commons.lang3.StringUtils; -import at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule; +import at.gv.egovernment.moa.id.auth.modules.AuthModule; import at.gv.egovernment.moa.id.process.api.ExecutionContext; /** diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java deleted file mode 100644 index 088ec59d4..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/AbstractAuthServletTask.java +++ /dev/null @@ -1,378 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.internal.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.lang3.ArrayUtils; - -import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.servlet.AuthServlet; -import at.gv.egovernment.moa.id.config.ConfigurationException; -import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; -import at.gv.egovernment.moa.id.process.springweb.AbstractSpringWebSupportedTask; -import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; -import at.gv.egovernment.moa.id.storage.IExceptionStore; -import at.gv.egovernment.moa.id.util.ServletUtils; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.MiscUtil; - -/** - * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing - * etc.).

The code has been taken from {@link AuthServlet}. - */ -public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask { - - protected static final String ERROR_CODE_PARAM = "errorid"; - - protected void handleErrorNoRedirect(String errorMessage, Throwable exceptionThrown, - HttpServletRequest req, HttpServletResponse resp) { - - if (null != errorMessage) { - Logger.error(errorMessage); - req.setAttribute("ErrorMessage", errorMessage); - } - - if (null != exceptionThrown) { - if (null == errorMessage) - errorMessage = exceptionThrown.getMessage(); - Logger.error(errorMessage, exceptionThrown); - req.setAttribute("ExceptionThrown", exceptionThrown); - } - - if (Logger.isDebugEnabled()) { - req.setAttribute("LogLevel", "debug"); - } - - - StatisticLogger logger = StatisticLogger.getInstance(); - logger.logErrorOperation(exceptionThrown); - - - // forward this to errorpage-auth.jsp where the HTML error page is - // generated - ServletContext context = req.getServletContext(); - RequestDispatcher dispatcher = context - .getRequestDispatcher("/errorpage-auth.jsp"); - try { - - resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); - resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); - resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); - - dispatcher.forward(req, resp); - } catch (ServletException e) { - Logger.error(e); - } catch (IOException e) { - Logger.error(e); - } - } - - /** - * Handles an error.
> - *
    - *
  • Logs the error
  • - *
  • Places error message and exception thrown into the request as request - * attributes (to be used by "/errorpage-auth.jsp")
  • - *
  • Sets HTTP status 500 (internal server error)
  • - *
- * - * @param errorMessage - * error message - * @param exceptionThrown - * exception thrown - * @param req - * servlet request - * @param resp - * servlet response - */ - protected void handleError(String errorMessage, Throwable exceptionThrown, - HttpServletRequest req, HttpServletResponse resp, String pendingRequestID) { - - if (null != errorMessage) { - Logger.error(errorMessage); - req.setAttribute("ErrorMessage", errorMessage); - } - - if (null != exceptionThrown) { - if (null == errorMessage) - errorMessage = exceptionThrown.getMessage(); - Logger.error(errorMessage, exceptionThrown); - req.setAttribute("ExceptionThrown", exceptionThrown); - } - - if (Logger.isDebugEnabled()) { - req.setAttribute("LogLevel", "debug"); - } - - if (!(exceptionThrown instanceof MOAIDException)) { - Logger.error("Receive an internal error: Message=" + exceptionThrown.getMessage(), exceptionThrown); - - } - - IExceptionStore store = DBExceptionStoreImpl.getStore(); - String id = store.storeException(exceptionThrown); - - if (id != null && MiscUtil.isNotEmpty(pendingRequestID)) { - - String redirectURL = null; - - redirectURL = ServletUtils.getBaseUrl(req); - redirectURL += "/dispatcher?" + ERROR_CODE_PARAM + "=" + id - + "&" + DispatcherServlet.PARAM_TARGET_PENDINGREQUESTID + "=" + pendingRequestID; - - resp.setContentType("text/html"); - resp.setStatus(302); - - resp.addHeader("Location", redirectURL); - Logger.debug("REDIRECT TO: " + redirectURL); - - return; - - } else { - - //Exception can not be stored in database - handleErrorNoRedirect(errorMessage, exceptionThrown, req, resp); - } - } - - /** - * Handles a WrongParametersException. - * - * @param req - * servlet request - * @param resp - * servlet response - */ - protected void handleWrongParameters(WrongParametersException ex, - HttpServletRequest req, HttpServletResponse resp) { - Logger.error(ex.toString()); - req.setAttribute("WrongParameters", ex.getMessage()); - - // forward this to errorpage-auth.jsp where the HTML error page is - // generated - ServletContext context = req.getServletContext(); - RequestDispatcher dispatcher = context - .getRequestDispatcher("/errorpage-auth.jsp"); - try { - setNoCachingHeaders(resp); - dispatcher.forward(req, resp); - } catch (ServletException e) { - Logger.error(e); - } catch (IOException e) { - Logger.error(e); - } - } - - /** - * Logs all servlet parameters for debugging purposes. - */ - protected void logParameters(HttpServletRequest req) { - for (Enumeration params = req.getParameterNames(); params - .hasMoreElements();) { - String parname = (String) params.nextElement(); - Logger.debug("Parameter " + parname + req.getParameter(parname)); - } - } - - /** - * Parses the request input stream for parameters, assuming parameters are - * encoded UTF-8 (no standard exists how browsers should encode them). - * - * @param req - * servlet request - * - * @return mapping parameter name -> value - * - * @throws IOException - * if parsing request parameters fails. - * - * @throws FileUploadException - * if parsing request parameters fails. - */ - protected Map getParameters(HttpServletRequest req) throws IOException, - FileUploadException { - - Map parameters = new HashMap(); - - if (ServletFileUpload.isMultipartContent(req)) { - // request is encoded as mulitpart/form-data - FileItemFactory factory = new DiskFileItemFactory(); - ServletFileUpload upload = null; - upload = new ServletFileUpload(factory); - List items = null; - items = upload.parseRequest(req); - for (int i = 0; i < items.size(); i++) { - FileItem item = (FileItem) items.get(i); - if (item.isFormField()) { - // Process only form fields - no file upload items - String logString = item.getString("UTF-8"); - - // TODO use RegExp - String startS = ""; - String endS = "urn:publicid:gv.at:baseid"; - String logWithMaskedBaseid = logString; - int start = logString.indexOf(startS); - if (start > -1) { - int end = logString.indexOf(endS); - if (end > -1) { - logWithMaskedBaseid = logString.substring(0, start); - logWithMaskedBaseid += startS; - logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; - logWithMaskedBaseid += logString.substring(end, - logString.length()); - } - } - parameters - .put(item.getFieldName(), item.getString("UTF-8")); - Logger.debug("Processed multipart/form-data request parameter: \nName: " - + item.getFieldName() - + "\nValue: " - + logWithMaskedBaseid); - } - } - } - - else { - // request is encoded as application/x-www-urlencoded - // [tknall]: we must not consume request body input stream once servlet-api request parameters have been accessed - - /* - InputStream in = req.getInputStream(); - - String paramName; - String paramValueURLEncoded; - do { - paramName = new String(readBytesUpTo(in, '=')); - if (paramName.length() > 0) { - paramValueURLEncoded = readBytesUpTo(in, '&'); - String paramValue = URLDecoder.decode(paramValueURLEncoded, - "UTF-8"); - parameters.put(paramName, paramValue); - } - } while (paramName.length() > 0); - in.close(); - */ - - Iterator> requestParamIt = req.getParameterMap().entrySet().iterator(); - while (requestParamIt.hasNext()) { - Entry entry = requestParamIt.next(); - String key = entry.getKey(); - String[] values = entry.getValue(); - // take the last value from the value array since the legacy code above also does it this way - parameters.put(key, ArrayUtils.isEmpty(values) ? null : values[values.length-1]); - } - - } - - return parameters; - } - - /** - * Reads bytes up to a delimiter, consuming the delimiter. - * - * @param in - * input stream - * @param delimiter - * delimiter character - * @return String constructed from the read bytes - * @throws IOException - */ - protected String readBytesUpTo(InputStream in, char delimiter) - throws IOException { - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - boolean done = false; - int b; - while (!done && (b = in.read()) >= 0) { - if (b == delimiter) - done = true; - else - bout.write(b); - } - return bout.toString(); - } - - /** - * Sets response headers that prevent caching (code taken from {@link AuthServlet}). - * - * @param resp - * The HttpServletResponse. - */ - public void setNoCachingHeaders(HttpServletResponse resp) { - resp.setHeader(HEADER_EXPIRES, HEADER_VALUE_EXPIRES); - resp.setHeader(HEADER_PRAGMA, HEADER_VALUE_PRAGMA); - resp.setHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL); - resp.addHeader(HEADER_CACHE_CONTROL, HEADER_VALUE_CACHE_CONTROL_IE); - } - - /** - * Adds a parameter to a URL. - * - * @param url - * the URL - * @param paramname - * parameter name - * @param paramvalue - * parameter value - * @return the URL with parameter added - */ - protected static String addURLParameter(String url, String paramname, - String paramvalue) { - String param = paramname + "=" + paramvalue; - if (url.indexOf("?") < 0) - return url + "?" + param; - else - return url + "&" + param; - } - - /** - * Checks if HTTP requests are allowed - * - * @param authURL - * requestURL - * @throws AuthenticationException - * if HTTP requests are not allowed - * @throws ConfigurationException - */ - protected void checkIfHTTPisAllowed(String authURL) - throws AuthenticationException, ConfigurationException { - // check if HTTP Connection may be allowed (through - // FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY) - - //Removed from MOA-ID 2.0 config -// String boolStr = AuthConfigurationProvider -// .getInstance() -// .getGenericConfigurationParameter( -// AuthConfigurationProvider.FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY); - if ((!authURL.startsWith("https:")) - //&& (false == BoolUtils.valueOf(boolStr)) - ) - throw new AuthenticationException("auth.07", new Object[] { authURL - + "*" }); - - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java index 4bcf717c5..bc73a9f2f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CertificateReadRequestTask.java @@ -9,13 +9,13 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang3.BooleanUtils; import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants; import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; import at.gv.egovernment.moa.id.auth.builder.InfoboxReadRequestBuilderCertificate; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; @@ -37,7 +37,7 @@ import at.gv.egovernment.moa.logging.Logger; * * Result: *
    - *
  • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code {/VerifyCertificate}
  • + *
  • Responds with {@code InfoBoxReadRequest} (for CCE), {@code DataURL} is {@code /VerifyCertificate}
  • *
* Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet}. * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java index 08030e623..4cd1ea94e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java @@ -14,6 +14,7 @@ import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.auth.servlet.GenerateIFrameTemplateServlet; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java index 4e535b83d..4771628a3 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java @@ -23,6 +23,7 @@ import at.gv.egovernment.moa.id.auth.data.IdentityLink; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser; import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; import at.gv.egovernment.moa.id.client.SZRGWClientException; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java index 6714dfb53..f08f96782 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetMISSessionIDTask.java @@ -20,6 +20,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.config.ConnectionParameter; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java index d7b35236e..36d6ea555 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java @@ -11,6 +11,7 @@ import at.gv.egovernment.moa.id.auth.AuthenticationServer; import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java index 060bdf72c..1e1a4df89 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java @@ -24,6 +24,7 @@ import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.ConnectionParameter; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java index af0c4c897..32ea7fe3a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyCertificateTask.java @@ -18,6 +18,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.process.api.ExecutionContext; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java index 75fdd19aa..bf10b3681 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyIdentityLinkTask.java @@ -15,6 +15,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.ParseException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java new file mode 100644 index 000000000..c2a34ff21 --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java @@ -0,0 +1,149 @@ +package at.gv.egovernment.moa.id.auth.modules.registration; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; + +import javax.annotation.PostConstruct; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.core.io.Resource; + +import at.gv.egovernment.moa.id.auth.modules.AuthModule; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException; +import at.gv.egovernment.moa.id.process.ProcessEngine; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; + +/** + * This class handles registering modules. The modules are detected either with + * the ServiceLoader mechanism or via Spring. All detected modules are ranked + * according to their priority. + */ +public class ModuleRegistration { + + private static ModuleRegistration instance = new ModuleRegistration(); + + private List priorizedModules = new ArrayList<>(); + + @Autowired + private ApplicationContext ctx; + + @Autowired + private ProcessEngine processEngine; + + private Logger log = LoggerFactory.getLogger(getClass()); + + public static ModuleRegistration getInstance() { + return instance; + } + + private ModuleRegistration() { + } + + @PostConstruct + private void init() { + // load modules via the ServiceLoader + initServiceLoaderModules(); + + // load modules via Spring + initSpringModules(); + + // order modules according to their priority + sortModules(); + } + + /** + * Discovers modules which use the ServiceLoader mechanism. + */ + private void initServiceLoaderModules() { + log.info("Looking for auth modules."); + ServiceLoader loader = ServiceLoader.load(AuthModule.class); + Iterator modules = loader.iterator(); + while (modules.hasNext()) { + AuthModule module = modules.next(); + log.info("Detected module {}", module.getClass().getName()); + registerModuleProcessDefinitions(module); + priorizedModules.add(module); + } + } + + /** + * Discovers modules which use Spring. + */ + private void initSpringModules() { + log.debug("Discovering Spring modules."); + Map modules = ctx.getBeansOfType(AuthModule.class); + for (AuthModule module : modules.values()) { + registerModuleProcessDefinitions(module); + priorizedModules.add(module); + } + } + + /** + * Registers the resource uris for the module. + * + * @param module + * the module. + */ + private void registerModuleProcessDefinitions(AuthModule module) { + for (String uri : module.getProcessDefinitions()) { + Resource resource = ctx.getResource(uri); + if (resource.isReadable()) { + log.info("Registering process definition '{}'.", uri); + try (InputStream processDefinitionInputStream = resource.getInputStream()) { + processEngine.registerProcessDefinition(processDefinitionInputStream); + } catch (IOException e) { + log.error("Process definition '{}' could NOT be read.", uri, e); + } catch (ProcessDefinitionParserException e) { + log.error("Error while parsing process definition '{}'", uri, e); + } + } else { + log.error("Process definition '{}' cannot be read.", uri); + } + } + } + + /** + * Order the modules in descending order according to their priority. + */ + private void sortModules() { + Collections.sort(priorizedModules, new Comparator() { + @Override + public int compare(AuthModule thisAuthModule, AuthModule otherAuthModule) { + int thisOrder = thisAuthModule.getPriority(); + int otherOrder = otherAuthModule.getPriority(); + return (thisOrder < otherOrder ? -1 : (thisOrder == otherOrder ? 0 : 1)); + } + }); + } + + /** + * Returns the process id of the first process, in the highest ranked + * module, which is able to work with the given execution context. + * + * @param context + * the {@link ExecutionContext}. + * @return the process id or {@code null} + */ + public String selectProcess(ExecutionContext context) { + for (AuthModule module : priorizedModules) { + String id = module.selectProcess(context); + if (StringUtils.isNotEmpty(id)) { + log.debug("Process with id '{}' selected, for context '{}'.", id, context); + return id; + } + } + log.info("No process is able to handle context '{}'.", context); + return null; + } +} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java deleted file mode 100644 index 55a7907ed..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.stork; - -import org.apache.commons.lang3.StringUtils; - -import at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule; -import at.gv.egovernment.moa.id.process.api.ExecutionContext; - -/** - * Module descriptor for an auth module providing stork authentication related processes. - * @author tknall - */ -public class STORKAuthModuleImpl implements AuthModule { - - private int priority = 0; - - @Override - public int getPriority() { - return priority; - } - - /** - * Sets the priority of this module. Default value is {@code 0}. - * @param priority The priority. - */ - public void setPriority(int priority) { - this.priority = priority; - } - - @Override - public String selectProcess(ExecutionContext context) { - return StringUtils.isNotBlank((String) context.get("ccc")) ? "STORKAuthentication" : null; - } - - @Override - public String[] getProcessDefinitions() { - return new String[] { "classpath:at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml" }; - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java deleted file mode 100644 index 7478a57c3..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java +++ /dev/null @@ -1,37 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.stork; - -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; - -import org.springframework.web.WebApplicationInitializer; - -import at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet; - -/** - * Spring automatically discovers {@link WebApplicationInitializer} implementations at startup.
- * This STORK webapp initializer adds the required servlet mappings: - *
    - *
  • {@code /PEPSConnector}
  • - *
  • {@code /PEPSConnectorWithLocalSigning}
  • - *
- * for the {@linkplain ProcessEngineSignalServlet process engine servlet} (named {@code ProcessEngineSignal}) that wakes - * up a process in order to execute asynchronous tasks. Therefore the servlet mappings mentioned above do not need to be - * declared in {@code web.xml}. - * - * @author tknall - * @see ProcessEngineSignalServlet - */ -public class STORKWebApplicationInitializer implements WebApplicationInitializer { - - @Override - public void onStartup(ServletContext servletContext) throws ServletException { - ServletRegistration servletRegistration = servletContext.getServletRegistration("ProcessEngineSignal"); - if (servletRegistration == null) { - throw new IllegalStateException("Servlet 'ProcessEngineSignal' expected to be registered."); - } - servletRegistration.addMapping("/PEPSConnectorWithLocalSigning"); - servletRegistration.addMapping("/PEPSConnector"); - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java deleted file mode 100644 index 202e405ef..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java +++ /dev/null @@ -1,223 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.stork.tasks; - -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.security.cert.CertificateException; -import java.util.HashMap; - -import javax.activation.DataSource; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactoryConfigurationError; - -import org.apache.commons.io.IOUtils; -import org.xml.sax.SAXException; - -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.BKUException; -import at.gv.egovernment.moa.id.auth.exception.BuildException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.ParseException; -import at.gv.egovernment.moa.id.auth.exception.ServiceException; -import at.gv.egovernment.moa.id.auth.modules.internal.tasks.AbstractAuthServletTask; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; -import at.gv.egovernment.moa.id.config.ConfigurationException; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.spss.MOAException; -import at.gv.egovernment.moa.spss.api.SPSSFactory; -import at.gv.egovernment.moa.spss.api.SignatureVerificationService; -import at.gv.egovernment.moa.spss.api.common.Content; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; -import at.gv.util.xsd.xmldsig.SignatureType; -import at.gv.util.xsd.xmldsig.X509DataType; -import eu.stork.oasisdss.api.LightweightSourceResolver; -import eu.stork.oasisdss.api.exceptions.ApiUtilsException; -import eu.stork.oasisdss.api.exceptions.UtilsException; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; - -public abstract class AbstractPepsConnectorWithLocalSigningTask extends AbstractAuthServletTask { - - String getCitizienSignatureFromSignResponse(SignResponse dssSignResponse) throws IllegalArgumentException, - TransformerConfigurationException, UtilsException, TransformerException, - TransformerFactoryConfigurationError, IOException, ApiUtilsException { - // fetch signed doc - DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); - if (ds == null) { - throw new ApiUtilsException("No datasource found in response"); - } - - InputStream incoming = ds.getInputStream(); - String citizenSignature = IOUtils.toString(incoming); - incoming.close(); - - return citizenSignature; - } - - void SZRGInsertion(AuthenticationSession moaSession, IPersonalAttributeList personalAttributeList, - String authnContextClassRef, String citizenSignature) throws STORKException, MOAIDException { - Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); - Logger.debug("Citizen signature will be verified by SZR Gateway!"); - - Logger.debug("fetching OAParameters from database"); - - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - moaSession.getPublicOAURLPrefix()); - if (oaParam == null) - throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); - - // retrieve target - // TODO: check in case of SSO!!! - String targetType = null; - if (oaParam.getBusinessService()) { - String id = oaParam.getIdentityLinkDomainIdentifier(); - if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) - targetType = id; - else - targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); - } else { - targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); - } - - Logger.debug("Starting connecting SZR Gateway"); - // contact SZR Gateway - IdentityLink identityLink = null; - - identityLink = STORKResponseProcessor.connectToSZRGateway(personalAttributeList, oaParam.getFriendlyName(), - targetType, null, oaParam.getMandateProfiles(), citizenSignature); - Logger.debug("SZR communication was successfull"); - - if (identityLink == null) { - Logger.error("SZR Gateway did not return an identity link."); - throw new MOAIDException("stork.10", null); - } - Logger.info("Received Identity Link from SZR Gateway"); - moaSession.setIdentityLink(identityLink); - - Logger.debug("Adding addtional STORK attributes to MOA session"); - moaSession.setStorkAttributes(personalAttributeList); - - // We don't have BKUURL, setting from null to "Not applicable" - moaSession.setBkuURL("Not applicable (STORK Authentication)"); - - // free for single use - moaSession.setAuthenticatedUsed(false); - - // stork did the authentication step - moaSession.setAuthenticated(true); - - // TODO: found better solution, but QAA Level in response could be not supported yet - try { - if (authnContextClassRef == null) - authnContextClassRef = PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel(); - moaSession.setQAALevel(authnContextClassRef); - - } catch (Throwable e) { - Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); - moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); - - } - - } - - X509Certificate getSignerCertificate(String citizenSignature) throws CertificateException, JAXBException, - UnsupportedEncodingException { - JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); - SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( - IOUtils.toInputStream(citizenSignature))).getValue(); - - // extract certificate - for (Object current : root.getKeyInfo().getContent()) - if (((JAXBElement) current).getValue() instanceof X509DataType) { - for (Object currentX509Data : ((JAXBElement) current).getValue() - .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { - JAXBElement casted = ((JAXBElement) currentX509Data); - if (casted.getName().getLocalPart().equals("X509Certificate")) { - return new X509Certificate(((String) casted.getValue()).getBytes("UTF-8")); - } - } - } - return null; - } - - VerifyXMLSignatureResponse verifyXMLSignature(String signature) throws AuthenticationException, ParseException, - BKUException, BuildException, ConfigurationException, ServiceException, UnsupportedEncodingException, - SAXException, IOException, ParserConfigurationException, MOAException { - // Based on MOA demo client - // Factory und Service instanzieren - SPSSFactory spssFac = SPSSFactory.getInstance(); - SignatureVerificationService sigVerifyService = SignatureVerificationService.getInstance(); - - Content sigDocContent1 = spssFac.createContent(IOUtils.toInputStream(signature, "UTF-8"), null); - - // Position der zu prüfenden Signatur im Dokument angeben - // (Nachdem im XPath-Ausdruck ein NS-Präfix verwendet wird, muss in einer Lookup-Tabelle - // der damit bezeichnete Namenraum mitgegeben werden) - HashMap nSMap = new HashMap(); - nSMap.put("dsig", "http://www.w3.org/2000/09/xmldsig#"); - VerifySignatureLocation sigLocation = spssFac.createVerifySignatureLocation("//dsig:Signature", nSMap); - - // Zu prüfendes Dokument und Signaturposition zusammenfassen - - VerifySignatureInfo sigInfo = spssFac.createVerifySignatureInfo(sigDocContent1, sigLocation); - - // Prüfrequest zusammenstellen - VerifyXMLSignatureRequest verifyRequest = spssFac.createVerifyXMLSignatureRequest(null, // Wird Prüfzeit nicht - // angegeben, wird - // aktuelle Zeit - // verwendet - sigInfo, null, // Keine Ergänzungsobjekte notwendig - null, // Signaturmanifest-Prüfung soll nicht durchgeführt werden - false, // Hash-Inputdaten, d.h. tatsächlich signierte Daten werden nicht zurückgeliefert - "MOAIDBuergerkartePersonenbindungMitTestkarten");// TODO load from config - // "Test-Signaturdienste"); // ID des verwendeten Vertrauensprofils - - VerifyXMLSignatureResponse verifyResponse = null; - try { - // Aufruf der Signaturprüfung - verifyResponse = sigVerifyService.verifyXMLSignature(verifyRequest); - } catch (MOAException e) { - // Service liefert Fehler - System.err.println("Die Signaturprüfung hat folgenden Fehler geliefert:"); - System.err.println("Fehlercode: " + e.getMessageId()); - System.err.println("Fehlernachricht: " + e.getMessage()); - throw e; - } - - return verifyResponse; - } - - at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse convert( - VerifyXMLSignatureResponse xMLVerifySignatureResponse) { - at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse response = new at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse(); - response.setCertificateCheckCode(xMLVerifySignatureResponse.getCertificateCheck().getCode()); - response.setPublicAuthority(xMLVerifySignatureResponse.getSignerInfo().isPublicAuthority()); - // response.setPublicAuthorityCode(publicAuthorityCode) - response.setQualifiedCertificate(xMLVerifySignatureResponse.getSignerInfo().isQualifiedCertificate()); - response.setSignatureCheckCode(xMLVerifySignatureResponse.getSignatureCheck().getCode()); - response.setSignatureManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); - // response.setSigningDateTime() - // response.setX509certificate(x509certificate) - response.setXmlDSIGManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); - // response.setXmlDSIGManigest(xMLVerifySignatureResponse.getSignatureManifestCheck()) - // response.setXmlDsigSubjectName(xmlDsigSubjectName) - return response; - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java deleted file mode 100644 index ec7ee04a6..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java +++ /dev/null @@ -1,112 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.stork.tasks; - -import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; -import at.gv.egovernment.moa.id.auth.modules.internal.tasks.AbstractAuthServletTask; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.stork.CPEPS; -import at.gv.egovernment.moa.id.config.stork.STORKConfig; -import at.gv.egovernment.moa.id.process.api.ExecutionContext; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.ParamValidatorUtils; -import at.gv.egovernment.moa.logging.Logger; - -/** - * Creates a SAML2 STORK authentication request, embeds it in a form (in order to satisfy saml post binging) and returns the form withing the HttpServletResponse.

- * In detail: - *

    - *
  • Validates the stork configuration in order to make sure the selected country is supported.
  • - *
  • Puts a flag ({@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}) into the ExecutionContext reflecting the capability of the C-PEPS to create xml signatures.
  • - *
  • Invokes {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} which
  • - *
      - *
    • Creates and signs a SAML2 stork authentication request.
    • - *
    • Creates a signature request for auth block signature (either to be performed by the C-PEPS or locally).
    • - *
    • Using the velocity template engine in order to create a form with the embedded stork request.
    • - *
    • Writes the form to the response output stream.
    • - *
    - *
- * Expects: - *
    - *
  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
  • - *
  • Property {@code ccc} set within the moa session.
  • - *
- * Result: - *
    - *
  • Form containing a SAML2 Stork authentication request and an action url pointing to the selected C-PEPS.
  • - *
  • Assertion consumer URL for C-PEPS set either to {@code /PEPSConnector} in case of a C-PEPS supporting xml signatures or {@code /PEPSConnectorWithLocalSigning} if the selected C-PEPS does not support xml signatures.
  • - *
  • In case of a C-PEPS not supporting xml signature: moasession with set signedDoc property (containing the signature request for local signing).
  • - *
  • ExecutionContext contains the boolean flag {@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}. - *
- * Code taken from {@link StartAuthenticationBuilder#build(AuthenticationSession, HttpServletRequest, HttpServletResponse)}.
- * Using {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class CreateStorkAuthRequestFormTask extends AbstractAuthServletTask { - - /** - * Boolean value reflecting the capability of the selected c-peps of creating xml signatures. - */ - public static final String PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED = "C-PEPS:XMLSignatureSupported"; - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) - throws Exception { - - String pendingRequestID = null; - String sessionID = null; - try { - setNoCachingHeaders(resp); - - sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); - // check parameter - if (!ParamValidatorUtils.isValidSessionID(sessionID)) { - throw new WrongParametersException("CreateStorkAuthRequestFormTask", PARAM_SESSIONID, "auth.12"); - } - AuthenticationSession moasession = AuthenticationServer.getSession(sessionID); - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); - - if (StringUtils.isEmpty(moasession.getCcc())) { - // illegal state; task should not have been executed without a selected country - throw new AuthenticationException("stork.22", new Object[] { sessionID }); - } - STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig(); - if (!storkConfig.isSTORKAuthentication(moasession.getCcc())) { - throw new AuthenticationException("stork.23", new Object[] { moasession.getCcc(), sessionID }); - } - - // STORK authentication - // cpeps cannot be null - CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc()); - Logger.debug("Found C-PEPS configuration for citizen of country: " + moasession.getCcc()); - executionContext.put(PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED, cpeps.isXMLSignatureSupported()); - - Logger.info("Starting STORK authentication for a citizen of country: " + moasession.getCcc()); - AuthenticationServer.startSTORKAuthentication(req, resp, moasession); - - } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - - } catch (Exception e) { - Logger.error("CreateStorkAuthRequestFormTask has an interal Error.", e); - throw new MOAIDException("Internal error.", new Object[] { sessionID }, e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java deleted file mode 100644 index 077bb2dee..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java +++ /dev/null @@ -1,216 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.stork.tasks; - -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - -import org.apache.commons.codec.binary.Base64; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.process.api.ExecutionContext; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.VelocityProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; -import eu.stork.oasisdss.api.ApiUtils; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PersonalAttribute; - -/** - * Processes the citizen's signature, creates identity link using szr gateway and finalizes authentication. - *

- * In detail: - *

    - *
  • Changes moa session id.
  • - *
  • Decodes and validates the sign response, extracting the citizen's signature.
  • - *
  • Verifies the citizen's signature.
  • - *
  • Create {@code signedDoc} attribute.
  • - *
  • Retrieve identity link from SZR gateway using the citizen's signature.
  • - *
  • If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. - * Therefore a form is presented asking for the subject's gender. The form finally submits the user back to the - * {@code /PepsConnectorWithLocalSigning} servlet (this task).
  • - *
  • The moa session is updated with authentication information.
  • - *
  • Change moa session id.
  • - *
  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
  • - *
- * Expects: - *
    - *
  • HttpServletRequest parameter {@code moaSessionID}
  • - *
  • HttpServletRequest parameter {@code signresponse}
  • - *
- * Result: - *
    - *
  • Updated moa id session (signed auth block, signer certificate etc.)
  • - *
  • Redirect to {@code /dispatcher}.
  • - *
  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
  • - *
- * Possible branches: - *
    - *
  • In case the szr gateway throws exception due to missing gender information: - *
      - *
    • Returns a form for gender selection with action url back to this servlet/task.
    • - *
    - *
  • - *
- * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
- * - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class PepsConnectorHandleLocalSignResponseTask extends AbstractPepsConnectorWithLocalSigningTask { - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) - throws Exception { - String moaSessionID = request.getParameter("moaSessionID"); - String signResponse = request.getParameter("signresponse"); - Logger.info("moaSessionID:" + moaSessionID); - Logger.info("signResponse:" + signResponse); - - if (moaSessionID != null && signResponse != null) { - // redirect from oasis with signresponse - handleSignResponse(executionContext, request, response); - } else { - // should not occur - throw new IOException("should not occur"); - } - return; - } - - private void handleSignResponse(ExecutionContext executionContext, HttpServletRequest request, - HttpServletResponse response) { - Logger.info("handleSignResponse started"); - String moaSessionID = request.getParameter("moaSessionID"); - String signResponse = request.getParameter("signresponse"); - Logger.info("moaSessionID:" + moaSessionID); - Logger.info("signResponse:" + signResponse); - String pendingRequestID = null; - try { - - // load MOASession from database - AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); - // change MOASessionID - moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); - Logger.info("pendingRequestID:" + pendingRequestID); - String signResponseString = new String(Base64.decodeBase64(signResponse), "UTF8"); - Logger.info("RECEIVED signresponse:" + signResponseString); - // create SignResponse object - Source response1 = new StreamSource(new java.io.StringReader(signResponseString)); - SignResponse dssSignResponse = ApiUtils.unmarshal(response1, SignResponse.class); - - // SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource(new - // java.io.StringReader(Base64.signResponse))); - - String citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); - - // memorize signature into authblock - moaSession.setAuthBlock(citizenSignature); - - X509Certificate cert = getSignerCertificate(citizenSignature); - moaSession.setSignerCertificate(cert); - VerifyXMLSignatureResponse xMLVerifySignatureResponse = verifyXMLSignature(citizenSignature); - at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse tmp = convert(xMLVerifySignatureResponse); - - moaSession.setXMLVerifySignatureResponse(tmp); - executionContext.put("identityLinkAvailable", false); - try { - IPersonalAttributeList personalAttributeList = moaSession.getAuthnResponseGetPersonalAttributeList(); - // Add SignResponse TODO Add signature (extracted from signResponse)? - List values = new ArrayList(); - values.add(signResponseString); - // values.add(citizenSignature); - Logger.debug("Assembling signedDoc attribute"); - PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values, "Available"); - personalAttributeList.add(signedDocAttribute); - - String authnContextClassRef = moaSession.getAuthnContextClassRef(); - SZRGInsertion(moaSession, personalAttributeList, authnContextClassRef, citizenSignature); - executionContext.put("identityLinkAvailable", true); - } catch (STORKException e) { - // this is really nasty but we work against the system here. We are supposed to get the gender attribute - // from - // stork. If we do not, we cannot register the person in the ERnP - we have to have the - // gender for the represented person. So here comes the dirty hack. - if (e.getCause() instanceof STORKException - && e.getCause().getMessage().equals("gender not found in response")) { - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); - VelocityContext context = new VelocityContext(); - context.put("SAMLResponse", request.getParameter("SAMLResponse")); - context.put("action", request.getRequestURL()); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - response.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e1) { - Logger.error("Error sending gender retrival form.", e1); - // httpSession.invalidate(); - throw new MOAIDException("stork.10", null); - } - - return; - } - - Logger.error("Error connecting SZR Gateway", e); - throw new MOAIDException("stork.10", null); - } - - Logger.debug("Add full STORK AuthnResponse to MOA session"); - moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas - // authnResponse? - moaSession.setForeigner(true); - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); - - // redirect - String redirectURL = null; - redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), - ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), - newMOASessionID); - redirectURL = response.encodeRedirectURL(redirectURL); - - response.sendRedirect(redirectURL); - Logger.info("REDIRECT TO: " + redirectURL); - - } catch (AuthenticationException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (MOAIDException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (Exception e) { - Logger.error("PEPSConnector has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java deleted file mode 100644 index 3338804b4..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java +++ /dev/null @@ -1,439 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.stork.tasks; - -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.opensaml.saml2.core.StatusCode; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.process.api.ExecutionContext; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.HTTPUtils; -import at.gv.egovernment.moa.id.util.VelocityProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.StringUtils; -import eu.stork.oasisdss.api.ApiUtils; -import eu.stork.oasisdss.profile.SignRequest; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.STORKAuthnRequest; -import eu.stork.peps.auth.commons.STORKAuthnResponse; -import eu.stork.peps.auth.engine.STORKSAMLEngine; -import eu.stork.peps.exceptions.STORKSAMLEngineException; - -/** - * Validates the SAML response from C-PEPS. - *

- * In detail: - *

    - *
  • Decodes and validates SAML response from C-PEPS.
  • - *
  • Retrieves the moa session using the session id provided by HttpServletRequest parameter {@code RelayState} or by {@code inResponseTo} attribute of the saml response.
  • - *
  • Store saml response in moa session.
  • - *
  • Change moa session id.
  • - *
  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
  • - *
- * Expects: - *
    - *
  • HttpServletRequest parameter {@code moaSessionID} to be {@code null}
  • - *
  • HttpServletRequest parameter {@code signresponse} to be {@code null}
  • - *
  • HttpServletRequest parameter {@code SAMLResponse}
  • - *
  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute within the saml response, both reflecting the moa session id.
  • - *
- * Result: - *
    - *
  • Updated moa session (with saml response).
  • - *
  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
  • - *
- * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
- * - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPepsConnectorWithLocalSigningTask { - - private String oasisDssWebFormURL = "https://testvidp.buergerkarte.at/oasis-dss/DSSWebFormServlet"; - // load from config below - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) - throws Exception { - String moaSessionID = request.getParameter("moaSessionID"); - String signResponse = request.getParameter("signresponse"); - Logger.info("moaSessionID:" + moaSessionID); - Logger.info("signResponse:" + signResponse); - - if (moaSessionID == null && signResponse == null) { - // normal saml response - handleSAMLResponse(executionContext, request, response); - - } else { - // should not occur - throw new IOException("should not occur"); - } - return; - } - - private void handleSAMLResponse(ExecutionContext executionContext, HttpServletRequest request, - HttpServletResponse response) { - Logger.info("handleSAMLResponse started"); - String pendingRequestID = null; - - setNoCachingHeaders(response); - try { - Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); - Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); - - Logger.trace("No Caching headers set for HTTP response"); - - // check if https or only http - super.checkIfHTTPisAllowed(request.getRequestURL().toString()); - - Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); - - // extract STORK Response from HTTP Request - // Decodes SAML Response - byte[] decSamlToken; - try { - decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); - Logger.debug("SAMLResponse: " + new String(decSamlToken)); - - } catch (NullPointerException e) { - Logger.error("Unable to retrieve STORK Response", e); - throw new MOAIDException("stork.04", null); - } - - // Get SAMLEngine instance - STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); - - STORKAuthnResponse authnResponse = null; - try { - // validate SAML Token - Logger.debug("Starting validation of SAML response"); - authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); - Logger.info("SAML response succesfully verified!"); - } catch (STORKSAMLEngineException e) { - Logger.error("Failed to verify STORK SAML Response", e); - throw new MOAIDException("stork.05", null); - } - - Logger.info("STORK SAML Response message succesfully extracted"); - Logger.debug("STORK response: "); - Logger.debug(authnResponse.toString()); - - Logger.debug("Trying to find MOA Session-ID ..."); - // String moaSessionID = request.getParameter(PARAM_SESSIONID); - // first use SAML2 relayState - String moaSessionID = request.getParameter("RelayState"); - - // escape parameter strings - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - // check if SAML2 relaystate includes a MOA sessionID - if (StringUtils.isEmpty(moaSessionID)) { - // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier - - moaSessionID = authnResponse.getInResponseTo(); - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - if (StringUtils.isEmpty(moaSessionID)) { - // No authentication session has been started before - Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); - Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); - throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); - - } else - Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); - - } else - // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); - Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); - - /* - * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because - * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter - */ - // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) - // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); - - // load MOASession from database - AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); - // change MOASessionID - moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Found MOA sessionID: " + moaSessionID); - - String statusCodeValue = authnResponse.getStatusCode(); - - if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { - Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); - throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); - } - - Logger.info("Got SAML response with authentication success message."); - - Logger.debug("MOA session is still valid"); - - STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); - - if (storkAuthnRequest == null) { - Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - throw new MOAIDException("stork.07", null); - } - - Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - - // //////////// incorporate gender from parameters if not in stork response - - IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); - - // but first, check if we have a representation case - if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) - || STORKResponseProcessor.hasAttribute("representative", attributeList) - || STORKResponseProcessor.hasAttribute("represented", attributeList)) { - // in a representation case... - moaSession.setUseMandate("true"); - - // and check if we have the gender value - PersonalAttribute gender = attributeList.get("gender"); - if (null == gender) { - String gendervalue = (String) request.getParameter("gender"); - if (null != gendervalue) { - gender = new PersonalAttribute(); - gender.setName("gender"); - ArrayList tmp = new ArrayList(); - tmp.add(gendervalue); - gender.setValue(tmp); - - authnResponse.getPersonalAttributeList().add(gender); - } - } - } - - - - // //////////////////////////////////////////////////////////////////////// - - Logger.debug("Starting extraction of signedDoc attribute"); - // extract signed doc element and citizen signature - String citizenSignature = null; - try { - PersonalAttribute signedDoc = authnResponse.getPersonalAttributeList().get("signedDoc"); - String signatureInfo = null; - // FIXME: Remove nonsense code (signedDoc attribute... (throw Exception for "should not occur" situations)), adjust error messages in order to reflect the true problem... - if (signedDoc != null) { - signatureInfo = signedDoc.getValue().get(0); - // should not occur - } else { - - // store SAMLResponse - moaSession.setSAMLResponse(request.getParameter("SAMLResponse")); - // store authnResponse - - // moaSession.setAuthnResponse(authnResponse);//not serializable - moaSession.setAuthnResponseGetPersonalAttributeList(authnResponse.getPersonalAttributeList()); - - String authnContextClassRef = null; - try { - authnContextClassRef = authnResponse.getAssertions().get(0).getAuthnStatements().get(0) - .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef(); - } catch (Throwable e) { - Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); - } - - moaSession.setAuthnContextClassRef(authnContextClassRef); - moaSession.setReturnURL(request.getRequestURL()); - - // load signedDoc - String signRequest = moaSession.getSignedDoc(); - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - // set return url to PEPSConnectorWithLocalSigningServlet and add newMOASessionID - // signRequest - - String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix(); - String acsURL = issuerValue - + PEPSConnectorWithLocalSigningServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN; - - String url = acsURL + "?moaSessionID=" + newMOASessionID; - // redirect to OASIS module and sign there - - boolean found = false; - try { - List aps = AuthConfigurationProvider.getInstance() - .getOnlineApplicationParameter(moaSession.getPublicOAURLPrefix()).getStorkAPs(); - Logger.info("Found AttributeProviderPlugins:" + aps.size()); - for (AttributeProviderPlugin ap : aps) { - Logger.info("Found AttributeProviderPlugin attribute:" + ap.getAttributes()); - if (ap.getAttributes().equalsIgnoreCase("signedDoc")) { - // FIXME: A servlet's class field is not thread safe!!! - oasisDssWebFormURL = ap.getUrl(); - found = true; - Logger.info("Loaded signedDoc attribute provider url from config:" + oasisDssWebFormURL); - break; - } - } - } catch (Exception e) { - e.printStackTrace(); - Logger.error("Loading the signedDoc attribute provider url from config failed"); - } - if (!found) { - Logger.error("Failed to load the signedDoc attribute provider url from config"); - } - performRedirect(url, request, response, signRequest); - - return; - } - - // FIXME: This servlet/task is intended to handle peps responses without signature, so why do we try to process that signature here? - SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( - new java.io.StringReader(signatureInfo))); - - citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); - - // memorize signature into authblock - moaSession.setAuthBlock(citizenSignature); - - X509Certificate cert = getSignerCertificate(citizenSignature); - moaSession.setSignerCertificate(cert); - moaSession.setForeigner(true); - - } catch (Throwable e) { - Logger.error("Could not extract citizen signature from C-PEPS", e); - throw new MOAIDException("stork.09", null); - } - - // FIXME: Same here; we do not have the citizen's signature, so this code might be regarded as dead code. - try { - SZRGInsertion(moaSession, authnResponse.getPersonalAttributeList(), authnResponse.getAssertions() - .get(0).getAuthnStatements().get(0).getAuthnContext().getAuthnContextClassRef() - .getAuthnContextClassRef(), citizenSignature); - } catch (STORKException e) { - // this is really nasty but we work against the system here. We are supposed to get the gender attribute - // from - // stork. If we do not, we cannot register the person in the ERnP - we have to have the - // gender for the represented person. So here comes the dirty hack. - if (e.getCause() instanceof STORKException - && e.getCause().getMessage().equals("gender not found in response")) { - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); - VelocityContext context = new VelocityContext(); - context.put("SAMLResponse", request.getParameter("SAMLResponse")); - context.put("action", request.getRequestURL()); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - - response.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e1) { - Logger.error("Error sending gender retrival form.", e1); - // httpSession.invalidate(); - throw new MOAIDException("stork.10", null); - } - - return; - } - - Logger.error("Error connecting SZR Gateway", e); - throw new MOAIDException("stork.10", null); - } - - Logger.debug("Add full STORK AuthnResponse to MOA session"); - moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas - // authnResponse? - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); - - // redirect - String redirectURL = null; - redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), - ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), - newMOASessionID); - redirectURL = response.encodeRedirectURL(redirectURL); - - response.setContentType("text/html"); - response.setStatus(302); - response.addHeader("Location", redirectURL); - Logger.info("REDIRECT TO: " + redirectURL); - - } catch (AuthenticationException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (MOAIDException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (Exception e) { - Logger.error("PEPSConnector has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - - } - - private void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, String signRequestString) - throws MOAIDException { - - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/oasis_dss_webform_binding.vm"); - VelocityContext context = new VelocityContext(); - - Logger.debug("performRedirect, signrequest:" + signRequestString); - Source signDoc = new StreamSource(new java.io.StringReader(signRequestString)); - SignRequest signRequest = ApiUtils.unmarshal(signDoc, SignRequest.class); - signRequest.setReturnURL("TODO"); - signRequestString = IOUtils.toString(ApiUtils.marshalToInputStream(signRequest)); - context.put("signrequest", Base64.encodeBase64String(signRequestString.getBytes("UTF8"))); - context.put("clienturl", url); - context.put("action", oasisDssWebFormURL); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - - resp.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e) { - Logger.error("Error sending DSS signrequest.", e); - throw new MOAIDException("stork.11", null); - } - } -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java deleted file mode 100644 index 3fb4fb0a9..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java +++ /dev/null @@ -1,566 +0,0 @@ -package at.gv.egovernment.moa.id.auth.modules.stork.tasks; - -import iaik.x509.X509Certificate; - -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -import javax.activation.DataSource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.namespace.QName; -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.opensaml.saml2.core.StatusCode; - -import at.gv.egovernment.moa.id.auth.AuthenticationServer; -import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; -import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; -import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; -import at.gv.egovernment.moa.id.auth.exception.MOAIDException; -import at.gv.egovernment.moa.id.auth.modules.internal.tasks.AbstractAuthServletTask; -import at.gv.egovernment.moa.id.auth.stork.STORKException; -import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.moduls.ModulUtils; -import at.gv.egovernment.moa.id.process.api.ExecutionContext; -import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; -import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; -import at.gv.egovernment.moa.id.util.HTTPUtils; -import at.gv.egovernment.moa.id.util.VelocityProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.StringUtils; -import at.gv.util.xsd.xmldsig.SignatureType; -import at.gv.util.xsd.xmldsig.X509DataType; -import eu.stork.documentservice.DocumentService; -import eu.stork.documentservice.data.DatabaseConnectorMySQLImpl; -import eu.stork.oasisdss.api.ApiUtils; -import eu.stork.oasisdss.api.LightweightSourceResolver; -import eu.stork.oasisdss.api.exceptions.ApiUtilsException; -import eu.stork.oasisdss.profile.DocumentType; -import eu.stork.oasisdss.profile.DocumentWithSignature; -import eu.stork.oasisdss.profile.SignResponse; -import eu.stork.peps.auth.commons.IPersonalAttributeList; -import eu.stork.peps.auth.commons.PEPSUtil; -import eu.stork.peps.auth.commons.PersonalAttribute; -import eu.stork.peps.auth.commons.PersonalAttributeList; -import eu.stork.peps.auth.commons.STORKAttrQueryRequest; -import eu.stork.peps.auth.commons.STORKAuthnRequest; -import eu.stork.peps.auth.commons.STORKAuthnResponse; -import eu.stork.peps.auth.engine.STORKSAMLEngine; -import eu.stork.peps.exceptions.STORKSAMLEngineException; - -/** - * Evaluates the SAML response from the C-PEPS and authenticates the user. - *

- * In detail: - *

    - *
  • Decodes and validates the SAML response from the C-PEPS.
  • - *
  • Change moa session id.
  • - *
  • Extracts the subject's gender from request parameter {@code gender} if not available from the saml response.
  • - *
  • Extracts the {@code signedDoc} attribute from the response, get signed doc payload using stork attribute query request.
  • - *
  • Request SZR gateway for verification of the citizen's signature and for creating of an identity link.
  • - *
  • In case of mandate mode: If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. Therefore a form is presented asking for the subject's gender. The form submits the user back to the {@code /PepsConnector} servlet (this task).
  • - *
  • The moa session is updated with authentication information.
  • - *
  • Change moa session id.
  • - *
  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
  • - *
- * Expects: - *
    - *
  • HttpServletRequest parameter {@code SAMLResponse}
  • - *
  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute from the SAML response (both depicting the moa session id)
  • - *
  • HttpServletRequest parameter {@code gender} in case the request comes from the gender selection form
  • - *
  • {@code signedDoc} attribute within the SAML response.
  • - *
- * Result: - *
    - *
  • Updated moa id session (identity link, stork attributes...)
  • - *
  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
  • - *
  • Redirect to {@code /dispatcher}.
  • - *
- * Possible branches: - *
    - *
  • In case the szr gateway throws exception due to missing gender information: - *
      - *
    • Returns a form for gender selection with action url back to this servlet/task.
    • - *
    - *
  • - *
- * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet}.
- * - * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) - */ -public class PepsConnectorTask extends AbstractAuthServletTask { - - private String dtlUrl = null; - - public PepsConnectorTask() { - super(); - Properties props = new Properties(); - try { - props.load(DatabaseConnectorMySQLImpl.class.getResourceAsStream("docservice.properties")); - dtlUrl = props.getProperty("docservice.url"); - } catch (IOException e) { - dtlUrl = "http://testvidp.buergerkarte.at/DocumentService/DocumentService"; - Logger.error("Loading DTL config failed, using default value:" + dtlUrl); - e.printStackTrace(); - } - } - - @Override - public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) - throws Exception { - String pendingRequestID = null; - - setNoCachingHeaders(response); - - try { - - Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); - Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); - - // check if https or only http - super.checkIfHTTPisAllowed(request.getRequestURL().toString()); - - Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); - - // extract STORK Response from HTTP Request - // Decodes SAML Response - byte[] decSamlToken; - try { - decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); - Logger.debug("SAMLResponse: " + new String(decSamlToken)); - - } catch (NullPointerException e) { - Logger.error("Unable to retrieve STORK Response", e); - throw new MOAIDException("stork.04", null); - } - - // Get SAMLEngine instance - STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); - - STORKAuthnResponse authnResponse = null; - try { - // validate SAML Token - Logger.debug("Starting validation of SAML response"); - authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); - Logger.info("SAML response succesfully verified!"); - } catch (STORKSAMLEngineException e) { - Logger.error("Failed to verify STORK SAML Response", e); - throw new MOAIDException("stork.05", null); - } - - Logger.info("STORK SAML Response message succesfully extracted"); - Logger.debug("STORK response: "); - Logger.debug(authnResponse.toString()); - - Logger.debug("Trying to find MOA Session-ID ..."); - // String moaSessionID = request.getParameter(PARAM_SESSIONID); - // first use SAML2 relayState - String moaSessionID = request.getParameter("RelayState"); - - // escape parameter strings - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - // check if SAML2 relaystate includes a MOA sessionID - if (StringUtils.isEmpty(moaSessionID)) { - // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier - - moaSessionID = authnResponse.getInResponseTo(); - moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); - - if (StringUtils.isEmpty(moaSessionID)) { - // No authentication session has been started before - Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); - Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); - throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); - - } else - Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); - - } else - // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); - Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); - - /* - * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because - * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter - */ - // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) - // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); - - pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); - - // load MOASession from database - AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); - // change MOASessionID - moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Found MOA sessionID: " + moaSessionID); - - String statusCodeValue = authnResponse.getStatusCode(); - - if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { - Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); - throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); - } - - Logger.info("Got SAML response with authentication success message."); - - Logger.debug("MOA session is still valid"); - - STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); - - if (storkAuthnRequest == null) { - Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - throw new MOAIDException("stork.07", null); - } - - Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - - // //////////// incorporate gender from parameters if not in stork response - - IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); - - // but first, check if we have a representation case - if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) - || STORKResponseProcessor.hasAttribute("representative", attributeList) - || STORKResponseProcessor.hasAttribute("represented", attributeList)) { - // in a representation case... - moaSession.setUseMandate("true"); - - // and check if we have the gender value - PersonalAttribute gender = attributeList.get("gender"); // TODO Do we need to check gender value if - // there is no representation case? - if (null == gender) { - String gendervalue = (String) request.getParameter("gender"); - if (null != gendervalue) { - gender = new PersonalAttribute(); - gender.setName("gender"); - ArrayList tmp = new ArrayList(); - tmp.add(gendervalue); - gender.setValue(tmp); - - authnResponse.getPersonalAttributeList().add(gender); - } - } - } - - // //////////////////////////////////////////////////////////////////////// - - Logger.debug("Starting extraction of signedDoc attribute"); - // extract signed doc element and citizen signature - String citizenSignature = null; - try { - String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0); // TODO ERROR HANDLING - - Logger.debug("signatureInfo:" + signatureInfo); - - SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( - new java.io.StringReader(signatureInfo))); - - // fetch signed doc - DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); - if (ds == null) { - throw new ApiUtilsException("No datasource found in response"); - } - - InputStream incoming = ds.getInputStream(); - citizenSignature = IOUtils.toString(incoming); - incoming.close(); - - Logger.debug("citizenSignature:" + citizenSignature); - if (isDocumentServiceUsed(citizenSignature) == true) { - Logger.debug("Loading document from DocumentService."); - String url = getDtlUrlFromResponse(dssSignResponse); - // get Transferrequest - String transferRequest = getDocTransferRequest(dssSignResponse.getDocUI(), url); - // Load document from DocujmentService - byte[] data = getDocumentFromDtl(transferRequest, url); - citizenSignature = new String(data, "UTF-8"); - Logger.debug("Overridung citizenSignature with:" + citizenSignature); - } - - JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); - SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( - IOUtils.toInputStream(citizenSignature))).getValue(); - - // memorize signature into authblock - moaSession.setAuthBlock(citizenSignature); - - // extract certificate - for (Object current : root.getKeyInfo().getContent()) - if (((JAXBElement) current).getValue() instanceof X509DataType) { - for (Object currentX509Data : ((JAXBElement) current).getValue() - .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { - JAXBElement casted = ((JAXBElement) currentX509Data); - if (casted.getName().getLocalPart().equals("X509Certificate")) { - moaSession.setSignerCertificate(new X509Certificate(((String) casted.getValue()) - .getBytes("UTF-8"))); - break; - } - } - } - - } catch (Throwable e) { - Logger.error("Could not extract citizen signature from C-PEPS", e); - throw new MOAIDException("stork.09", null); - } - Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); - Logger.debug("Citizen signature will be verified by SZR Gateway!"); - - Logger.debug("fetching OAParameters from database"); - - // //read configuration paramters of OA - // AuthenticationSession moasession; - // try { - // moasession = AuthenticationSessionStoreage.getSession(moaSessionID); - // } catch (MOADatabaseException e2) { - // Logger.error("could not retrieve moa session"); - // throw new AuthenticationException("auth.01", null); - // } - OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( - moaSession.getPublicOAURLPrefix()); - if (oaParam == null) - throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); - - // retrieve target - // TODO: check in case of SSO!!! - String targetType = null; - if (oaParam.getBusinessService()) { - String id = oaParam.getIdentityLinkDomainIdentifier(); - if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) - targetType = id; - else - targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); - } else { - targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); - } - - Logger.debug("Starting connecting SZR Gateway"); - // contact SZR Gateway - IdentityLink identityLink = null; - executionContext.put("identityLinkAvailable", false); - try { - identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(), - oaParam.getFriendlyName(), targetType, null, oaParam.getMandateProfiles(), citizenSignature); - } catch (STORKException e) { - // this is really nasty but we work against the system here. We are supposed to get the gender attribute - // from - // stork. If we do not, we cannot register the person in the ERnP - we have to have the - // gender for the represented person. So here comes the dirty hack. - if (e.getCause() instanceof STORKException - && e.getCause().getMessage().equals("gender not found in response")) { - try { - Logger.trace("Initialize VelocityEngine..."); - - VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); - Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); - VelocityContext context = new VelocityContext(); - context.put("SAMLResponse", request.getParameter("SAMLResponse")); - context.put("action", request.getRequestURL()); - - StringWriter writer = new StringWriter(); - template.merge(context, writer); - - response.getOutputStream().write(writer.toString().getBytes("UTF-8")); - } catch (Exception e1) { - Logger.error("Error sending gender retrival form.", e1); - // httpSession.invalidate(); - throw new MOAIDException("stork.10", null); - } - - return; - } - - Logger.error("Error connecting SZR Gateway", e); - throw new MOAIDException("stork.10", null); - } - Logger.debug("SZR communication was successfull"); - - if (identityLink == null) { - Logger.error("SZR Gateway did not return an identity link."); - throw new MOAIDException("stork.10", null); - } - moaSession.setForeigner(true); - - Logger.info("Received Identity Link from SZR Gateway"); - executionContext.put("identityLinkAvailable", true); - moaSession.setIdentityLink(identityLink); - - Logger.debug("Adding addtional STORK attributes to MOA session"); - moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList()); - - Logger.debug("Add full STORK AuthnResponse to MOA session"); - moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse")); - - // We don't have BKUURL, setting from null to "Not applicable" - moaSession.setBkuURL("Not applicable (STORK Authentication)"); - - // free for single use - moaSession.setAuthenticatedUsed(false); - - // stork did the authentication step - moaSession.setAuthenticated(true); - - // TODO: found better solution, but QAA Level in response could be not supported yet - try { - - moaSession.setQAALevel(authnResponse.getAssertions().get(0).getAuthnStatements().get(0) - .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef()); - - } catch (Throwable e) { - Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); - moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); - - } - - // session is implicit stored in changeSessionID!!!! - String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); - - Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); - - // redirect - String redirectURL = null; - redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), - ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), - newMOASessionID); - redirectURL = response.encodeRedirectURL(redirectURL); - - // response.setContentType("text/html"); - // response.setStatus(302); - // response.addHeader("Location", redirectURL); - response.sendRedirect(redirectURL); - Logger.info("REDIRECT TO: " + redirectURL); - - } catch (AuthenticationException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (MOAIDException e) { - handleError(null, e, request, response, pendingRequestID); - - } catch (Exception e) { - Logger.error("PEPSConnector has an interal Error.", e); - } - - finally { - ConfigurationDBUtils.closeSession(); - } - - } - - private boolean isDocumentServiceUsed(String citizenSignature) // TODo add better check - { - if (citizenSignature - .contains("
Service Name:{http://stork.eu}DocumentService
Port Name:{http://stork.eu}DocumentServicePort
")) - return true; - return false; - } - - /** - * Get DTL uril from the oasis sign response - * - * @param signRequest - * The signature response - * @return The URL of DTL service - * @throws SimpleException - */ - private String getDtlUrlFromResponse(SignResponse dssSignResponse) { - List documents = ApiUtils.findNamedElement(dssSignResponse.getOptionalOutputs(), - ApiUtils.OPTIONAL_OUTPUT_DOCUMENTWITHSIGNATURE, DocumentWithSignature.class); - DocumentType sourceDocument = documents.get(0).getDocument(); - - if (sourceDocument.getDocumentURL() != null) - return sourceDocument.getDocumentURL(); - else - return null;// throw new Exception("No document url found"); - } - - // From DTLPEPSUTIL - - /** - * Get document from DTL - * - * @param transferRequest - * The transfer request (attribute query) - * @param eDtlUrl - * The DTL url of external DTL - * @return the document data - * @throws SimpleException - */ - private byte[] getDocumentFromDtl(String transferRequest, String eDtlUrl) throws Exception { - URL url = null; - try { - url = new URL(dtlUrl); - QName qname = new QName("http://stork.eu", "DocumentService"); - - Service service = Service.create(url, qname); - DocumentService docservice = service.getPort(DocumentService.class); - - BindingProvider bp = (BindingProvider) docservice; - SOAPBinding binding = (SOAPBinding) bp.getBinding(); - binding.setMTOMEnabled(true); - - if (eDtlUrl.equalsIgnoreCase(dtlUrl)) - return docservice.getDocument(transferRequest, ""); - else - return docservice.getDocument(transferRequest, eDtlUrl); - } catch (Exception e) { - e.printStackTrace(); - throw new Exception("Error in getDocumentFromDtl", e); - } - } - - /** - * Get a document transfer request (attribute query) - * - * @param docId - * @return - * @throws SimpleException - */ - private String getDocTransferRequest(String docId, String destinationUrl) throws Exception { - String spCountry = docId.substring(0, docId.indexOf("/")); - final STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP"); - STORKAttrQueryRequest req = new STORKAttrQueryRequest(); - req.setAssertionConsumerServiceURL(dtlUrl); - req.setDestination(destinationUrl); - req.setSpCountry(spCountry); - req.setQaa(3);// TODO - PersonalAttributeList pal = new PersonalAttributeList(); - PersonalAttribute attr = new PersonalAttribute(); - attr.setName("docRequest"); - attr.setIsRequired(true); - attr.setValue(Arrays.asList(docId)); - pal.add(attr); - req.setPersonalAttributeList(pal); - - STORKAttrQueryRequest req1; - try { - req1 = engine.generateSTORKAttrQueryRequest(req); - return PEPSUtil.encodeSAMLTokenUrlSafe(req1.getTokenSaml()); - } catch (STORKSAMLEngineException e) { - e.printStackTrace(); - throw new Exception("Error in doc request attribute query generation", e); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java index d6c15c658..bc8a01e41 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java @@ -35,13 +35,13 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.registration.ModuleRegistration; import at.gv.egovernment.moa.id.auth.parser.StartAuthentificationParameterParser; import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType; import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; -import at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration; import at.gv.egovernment.moa.id.process.ExecutionContextImpl; import at.gv.egovernment.moa.id.process.ProcessInstance; import at.gv.egovernment.moa.id.process.api.ExecutionContext; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java index 0a7f71713..b239fbb1d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java @@ -68,6 +68,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; import at.gv.egovernment.moa.id.auth.exception.BuildException; import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.modules.registration.ModuleRegistration; import at.gv.egovernment.moa.id.auth.parser.StartAuthentificationParameterParser; import at.gv.egovernment.moa.id.commons.db.dao.session.InterfederationSessionStore; import at.gv.egovernment.moa.id.commons.db.dao.session.OASessionStore; @@ -76,7 +77,6 @@ import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; import at.gv.egovernment.moa.id.data.SLOInformationContainer; import at.gv.egovernment.moa.id.data.SLOInformationImpl; -import at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration; import at.gv.egovernment.moa.id.process.ExecutionContextImpl; import at.gv.egovernment.moa.id.process.ProcessEngine; import at.gv.egovernment.moa.id.process.ProcessExecutionException; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java deleted file mode 100644 index 295a51a24..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/AuthModule.java +++ /dev/null @@ -1,41 +0,0 @@ -package at.gv.egovernment.moa.id.moduls.moduleregistration; - -import at.gv.egovernment.moa.id.process.api.ExecutionContext; -import at.gv.egovernment.moa.id.process.model.ProcessDefinition; - -/** - * Defines the module capabilities. - */ -public interface AuthModule { - - /** - * Returns the priority of the module. The priority defines the order of the respective module within the chain of - * discovered modules. Higher priorized modules are asked before lower priorized modules for a process that they can - * handle. - *

- * Internal default modules are priorized neutral ({@code 0}. Use a higher priority ({@code 1...Integer.MAX_VALUE}) - * in order to have your module(s) priorized or a lower priority ({@code Integer.MIN_VALUE...-1}) in order to put - * your modules behind default modules. - * - * @return the priority of the module. - */ - int getPriority(); - - /** - * Checks if the module has a process, which is able to perform an authentication with the given - * {@link ExecutionContext}. - * - * @param context - * an ExecutionContext for a process. - * @return the process-ID of a process which is able to work with the given ExecutionContext, or {@code null}. - */ - String selectProcess(ExecutionContext context); - - /** - * Returns the an Array of {@link ProcessDefinition}s of the processes included in this module. - * - * @return an array of resource uris of the processes included in this module. - */ - String[] getProcessDefinitions(); - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java deleted file mode 100644 index 9e06a9ec8..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/moduleregistration/ModuleRegistration.java +++ /dev/null @@ -1,149 +0,0 @@ -package at.gv.egovernment.moa.id.moduls.moduleregistration; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.ServiceLoader; - -import javax.annotation.PostConstruct; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.core.io.Resource; - -import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException; -import at.gv.egovernment.moa.id.process.ProcessEngine; -import at.gv.egovernment.moa.id.process.api.ExecutionContext; - -/** - * This class handles registering modules. The modules are detected either with - * the ServiceLoader mechanism or via Spring. All detected modules are ranked - * according to their priority. - */ -public class ModuleRegistration { - - private static ModuleRegistration instance = new ModuleRegistration(); - - private List priorizedModules = new ArrayList<>(); - - @Autowired - private ApplicationContext ctx; - - @Autowired - private ProcessEngine processEngine; - - private Logger log = LoggerFactory.getLogger(getClass()); - - public static ModuleRegistration getInstance() { - return instance; - } - - private ModuleRegistration() { - } - - @PostConstruct - private void init() { - // load modules via the ServiceLoader - initServiceLoaderModules(); - - // load modules via Spring - initSpringModules(); - - // order modules according to their priority - priorizeModules(); - } - - /** - * Discovers modules which use the ServiceLoader mechanism. - */ - private void initServiceLoaderModules() { - log.info("Looking for auth modules."); - ServiceLoader loader = ServiceLoader.load(AuthModule.class); - Iterator modules = loader.iterator(); - while (modules.hasNext()) { - AuthModule module = modules.next(); - log.info("Detected module {}", module.getClass().getName()); - registerResourceUris(module); - priorizedModules.add(module); - } - } - - /** - * Discovers modules which use Spring. - */ - private void initSpringModules() { - log.debug("Discovering Spring modules."); - Map modules = ctx.getBeansOfType(AuthModule.class); - for (AuthModule module : modules.values()) { - registerResourceUris(module); - priorizedModules.add(module); - } - } - - /** - * Registers the resource uris for the module. - * - * @param module - * the module. - */ - private void registerResourceUris(AuthModule module) { - for (String uri : module.getProcessDefinitions()) { - Resource resource = ctx.getResource(uri); - if (resource.isReadable()) { - log.info("Registering process definition resource: '{}'.", uri); - try (InputStream processDefinitionInputStream = resource.getInputStream()) { - processEngine.registerProcessDefinition(processDefinitionInputStream); - } catch (IOException e) { - log.error("Resource uri: '{}' could NOT be read.", uri, e); - } catch (ProcessDefinitionParserException e) { - log.error("Error while parsing process definition in '{}'", uri, e); - } - } else { - log.error("Resource uri: '{}' cannot be read.", uri); - } - } - } - - /** - * Order the modules in descending order according to their priority. - */ - private void priorizeModules() { - Collections.sort(priorizedModules, new Comparator() { - @Override - public int compare(AuthModule thisAuthModule, AuthModule otherAuthModule) { - int thisOrder = thisAuthModule.getPriority(); - int otherOrder = otherAuthModule.getPriority(); - return (thisOrder < otherOrder ? -1 : (thisOrder == otherOrder ? 0 : 1)); - } - }); - log.debug("Modules are ordered in descending order, according to their priority."); - } - - /** - * Returns the process id of the first process, in the highest ranked - * module, which is able to work with the given execution context. - * - * @param context - * the {@link ExecutionContext}. - * @return the process id or {@code null} - */ - public String selectProcess(ExecutionContext context) { - for (AuthModule module : priorizedModules) { - String id = module.selectProcess(context); - if (StringUtils.isNotEmpty(id)) { - log.debug("Process with id '{}' selected, for context '{}'.", id, context); - return id; - } - } - log.info("No process is able to handle context '{}'.", context); - return null; - } -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java index 2f1487564..ff6ec969e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java @@ -27,8 +27,9 @@ public interface ProcessEngine { * * @param processDefinitionInputStream The input stream to the definition to be registered. * @throws ProcessDefinitionParserException Thrown in case of an error parsing the process definition. + * @return The process definition's identifier. */ - void registerProcessDefinition(InputStream processDefinitionInputStream) throws ProcessDefinitionParserException; + String registerProcessDefinition(InputStream processDefinitionInputStream) throws ProcessDefinitionParserException; /** * Creates a process instance according to the referenced process definition, persists it into the database and returns it identifier. diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java index ea5a2684e..eb6a29ad9 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java @@ -55,8 +55,10 @@ public class ProcessEngineImpl implements ProcessEngine { } @Override - public void registerProcessDefinition(InputStream processDefinitionInputStream) throws ProcessDefinitionParserException{ - registerProcessDefinition(pdp.parse(processDefinitionInputStream)); + public String registerProcessDefinition(InputStream processDefinitionInputStream) throws ProcessDefinitionParserException{ + ProcessDefinition pd = pdp.parse(processDefinitionInputStream); + registerProcessDefinition(pd); + return pd.getId(); } /** diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule new file mode 100644 index 000000000..865096055 --- /dev/null +++ b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule @@ -0,0 +1,2 @@ +# The default moaid process +at.gv.egovernment.moa.id.auth.modules.internal.DefaultAuthModuleImpl diff --git a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule b/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule deleted file mode 100644 index 865096055..000000000 --- a/id/server/idserverlib/src/main/resources/META-INF/services/at.gv.egovernment.moa.id.moduls.moduleregistration.AuthModule +++ /dev/null @@ -1,2 +0,0 @@ -# The default moaid process -at.gv.egovernment.moa.id.auth.modules.internal.DefaultAuthModuleImpl diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml deleted file mode 100644 index 2e924bdd0..000000000 --- a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml deleted file mode 100644 index 60989e638..000000000 --- a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/modules/module-stork/pom.xml b/id/server/modules/module-stork/pom.xml new file mode 100644 index 000000000..8761e17ee --- /dev/null +++ b/id/server/modules/module-stork/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + + + MOA.id.server.modules + moa-id-modules + ${moa-id-version} + + + MOA.id.server.modules + moa-id-module-stork + ${moa-id-version} + jar + + MOA ID-Module STORK + + + ${basedir}/../../../../repository + + + diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java new file mode 100644 index 000000000..41384690e --- /dev/null +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java @@ -0,0 +1,39 @@ +package at.gv.egovernment.moa.id.auth.modules.stork; + +import org.apache.commons.lang3.StringUtils; + +import at.gv.egovernment.moa.id.auth.modules.AuthModule; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; + +/** + * Module descriptor for an auth module providing stork authentication related processes. + * @author tknall + */ +public class STORKAuthModuleImpl implements AuthModule { + + private int priority = 0; + + @Override + public int getPriority() { + return priority; + } + + /** + * Sets the priority of this module. Default value is {@code 0}. + * @param priority The priority. + */ + public void setPriority(int priority) { + this.priority = priority; + } + + @Override + public String selectProcess(ExecutionContext context) { + return StringUtils.isNotBlank((String) context.get("ccc")) ? "STORKAuthentication" : null; + } + + @Override + public String[] getProcessDefinitions() { + return new String[] { "classpath:at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml" }; + } + +} diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java new file mode 100644 index 000000000..7478a57c3 --- /dev/null +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java @@ -0,0 +1,37 @@ +package at.gv.egovernment.moa.id.auth.modules.stork; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; + +import org.springframework.web.WebApplicationInitializer; + +import at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet; + +/** + * Spring automatically discovers {@link WebApplicationInitializer} implementations at startup.
+ * This STORK webapp initializer adds the required servlet mappings: + *

    + *
  • {@code /PEPSConnector}
  • + *
  • {@code /PEPSConnectorWithLocalSigning}
  • + *
+ * for the {@linkplain ProcessEngineSignalServlet process engine servlet} (named {@code ProcessEngineSignal}) that wakes + * up a process in order to execute asynchronous tasks. Therefore the servlet mappings mentioned above do not need to be + * declared in {@code web.xml}. + * + * @author tknall + * @see ProcessEngineSignalServlet + */ +public class STORKWebApplicationInitializer implements WebApplicationInitializer { + + @Override + public void onStartup(ServletContext servletContext) throws ServletException { + ServletRegistration servletRegistration = servletContext.getServletRegistration("ProcessEngineSignal"); + if (servletRegistration == null) { + throw new IllegalStateException("Servlet 'ProcessEngineSignal' expected to be registered."); + } + servletRegistration.addMapping("/PEPSConnectorWithLocalSigning"); + servletRegistration.addMapping("/PEPSConnector"); + } + +} diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java new file mode 100644 index 000000000..702e62fa0 --- /dev/null +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/AbstractPepsConnectorWithLocalSigningTask.java @@ -0,0 +1,223 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.security.cert.CertificateException; +import java.util.HashMap; + +import javax.activation.DataSource; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.JAXBException; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactoryConfigurationError; + +import org.apache.commons.io.IOUtils; +import org.xml.sax.SAXException; + +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.BKUException; +import at.gv.egovernment.moa.id.auth.exception.BuildException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.ParseException; +import at.gv.egovernment.moa.id.auth.exception.ServiceException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.MOAException; +import at.gv.egovernment.moa.spss.api.SPSSFactory; +import at.gv.egovernment.moa.spss.api.SignatureVerificationService; +import at.gv.egovernment.moa.spss.api.common.Content; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureInfo; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifySignatureLocation; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; +import at.gv.util.xsd.xmldsig.SignatureType; +import at.gv.util.xsd.xmldsig.X509DataType; +import eu.stork.oasisdss.api.LightweightSourceResolver; +import eu.stork.oasisdss.api.exceptions.ApiUtilsException; +import eu.stork.oasisdss.api.exceptions.UtilsException; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; + +public abstract class AbstractPepsConnectorWithLocalSigningTask extends AbstractAuthServletTask { + + String getCitizienSignatureFromSignResponse(SignResponse dssSignResponse) throws IllegalArgumentException, + TransformerConfigurationException, UtilsException, TransformerException, + TransformerFactoryConfigurationError, IOException, ApiUtilsException { + // fetch signed doc + DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); + if (ds == null) { + throw new ApiUtilsException("No datasource found in response"); + } + + InputStream incoming = ds.getInputStream(); + String citizenSignature = IOUtils.toString(incoming); + incoming.close(); + + return citizenSignature; + } + + void SZRGInsertion(AuthenticationSession moaSession, IPersonalAttributeList personalAttributeList, + String authnContextClassRef, String citizenSignature) throws STORKException, MOAIDException { + Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); + Logger.debug("Citizen signature will be verified by SZR Gateway!"); + + Logger.debug("fetching OAParameters from database"); + + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + moaSession.getPublicOAURLPrefix()); + if (oaParam == null) + throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); + + // retrieve target + // TODO: check in case of SSO!!! + String targetType = null; + if (oaParam.getBusinessService()) { + String id = oaParam.getIdentityLinkDomainIdentifier(); + if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) + targetType = id; + else + targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); + } else { + targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); + } + + Logger.debug("Starting connecting SZR Gateway"); + // contact SZR Gateway + IdentityLink identityLink = null; + + identityLink = STORKResponseProcessor.connectToSZRGateway(personalAttributeList, oaParam.getFriendlyName(), + targetType, null, oaParam.getMandateProfiles(), citizenSignature); + Logger.debug("SZR communication was successfull"); + + if (identityLink == null) { + Logger.error("SZR Gateway did not return an identity link."); + throw new MOAIDException("stork.10", null); + } + Logger.info("Received Identity Link from SZR Gateway"); + moaSession.setIdentityLink(identityLink); + + Logger.debug("Adding addtional STORK attributes to MOA session"); + moaSession.setStorkAttributes(personalAttributeList); + + // We don't have BKUURL, setting from null to "Not applicable" + moaSession.setBkuURL("Not applicable (STORK Authentication)"); + + // free for single use + moaSession.setAuthenticatedUsed(false); + + // stork did the authentication step + moaSession.setAuthenticated(true); + + // TODO: found better solution, but QAA Level in response could be not supported yet + try { + if (authnContextClassRef == null) + authnContextClassRef = PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel(); + moaSession.setQAALevel(authnContextClassRef); + + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); + + } + + } + + X509Certificate getSignerCertificate(String citizenSignature) throws CertificateException, JAXBException, + UnsupportedEncodingException { + JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); + SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( + IOUtils.toInputStream(citizenSignature))).getValue(); + + // extract certificate + for (Object current : root.getKeyInfo().getContent()) + if (((JAXBElement) current).getValue() instanceof X509DataType) { + for (Object currentX509Data : ((JAXBElement) current).getValue() + .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { + JAXBElement casted = ((JAXBElement) currentX509Data); + if (casted.getName().getLocalPart().equals("X509Certificate")) { + return new X509Certificate(((String) casted.getValue()).getBytes("UTF-8")); + } + } + } + return null; + } + + VerifyXMLSignatureResponse verifyXMLSignature(String signature) throws AuthenticationException, ParseException, + BKUException, BuildException, ConfigurationException, ServiceException, UnsupportedEncodingException, + SAXException, IOException, ParserConfigurationException, MOAException { + // Based on MOA demo client + // Factory und Service instanzieren + SPSSFactory spssFac = SPSSFactory.getInstance(); + SignatureVerificationService sigVerifyService = SignatureVerificationService.getInstance(); + + Content sigDocContent1 = spssFac.createContent(IOUtils.toInputStream(signature, "UTF-8"), null); + + // Position der zu prüfenden Signatur im Dokument angeben + // (Nachdem im XPath-Ausdruck ein NS-Präfix verwendet wird, muss in einer Lookup-Tabelle + // der damit bezeichnete Namenraum mitgegeben werden) + HashMap nSMap = new HashMap(); + nSMap.put("dsig", "http://www.w3.org/2000/09/xmldsig#"); + VerifySignatureLocation sigLocation = spssFac.createVerifySignatureLocation("//dsig:Signature", nSMap); + + // Zu prüfendes Dokument und Signaturposition zusammenfassen + + VerifySignatureInfo sigInfo = spssFac.createVerifySignatureInfo(sigDocContent1, sigLocation); + + // Prüfrequest zusammenstellen + VerifyXMLSignatureRequest verifyRequest = spssFac.createVerifyXMLSignatureRequest(null, // Wird Prüfzeit nicht + // angegeben, wird + // aktuelle Zeit + // verwendet + sigInfo, null, // Keine Ergänzungsobjekte notwendig + null, // Signaturmanifest-Prüfung soll nicht durchgeführt werden + false, // Hash-Inputdaten, d.h. tatsächlich signierte Daten werden nicht zurückgeliefert + "MOAIDBuergerkartePersonenbindungMitTestkarten");// TODO load from config + // "Test-Signaturdienste"); // ID des verwendeten Vertrauensprofils + + VerifyXMLSignatureResponse verifyResponse = null; + try { + // Aufruf der Signaturprüfung + verifyResponse = sigVerifyService.verifyXMLSignature(verifyRequest); + } catch (MOAException e) { + // Service liefert Fehler + System.err.println("Die Signaturprüfung hat folgenden Fehler geliefert:"); + System.err.println("Fehlercode: " + e.getMessageId()); + System.err.println("Fehlernachricht: " + e.getMessage()); + throw e; + } + + return verifyResponse; + } + + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse convert( + VerifyXMLSignatureResponse xMLVerifySignatureResponse) { + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse response = new at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse(); + response.setCertificateCheckCode(xMLVerifySignatureResponse.getCertificateCheck().getCode()); + response.setPublicAuthority(xMLVerifySignatureResponse.getSignerInfo().isPublicAuthority()); + // response.setPublicAuthorityCode(publicAuthorityCode) + response.setQualifiedCertificate(xMLVerifySignatureResponse.getSignerInfo().isQualifiedCertificate()); + response.setSignatureCheckCode(xMLVerifySignatureResponse.getSignatureCheck().getCode()); + response.setSignatureManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); + // response.setSigningDateTime() + // response.setX509certificate(x509certificate) + response.setXmlDSIGManifestCheckCode(xMLVerifySignatureResponse.getSignatureManifestCheck().getCode()); + // response.setXmlDSIGManigest(xMLVerifySignatureResponse.getSignatureManifestCheck()) + // response.setXmlDsigSubjectName(xmlDsigSubjectName) + return response; + } + +} diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java new file mode 100644 index 000000000..f8cc17b93 --- /dev/null +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java @@ -0,0 +1,112 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.StartAuthenticationBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.stork.CPEPS; +import at.gv.egovernment.moa.id.config.stork.STORKConfig; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.ParamValidatorUtils; +import at.gv.egovernment.moa.logging.Logger; + +/** + * Creates a SAML2 STORK authentication request, embeds it in a form (in order to satisfy saml post binging) and returns the form withing the HttpServletResponse.

+ * In detail: + *

    + *
  • Validates the stork configuration in order to make sure the selected country is supported.
  • + *
  • Puts a flag ({@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}) into the ExecutionContext reflecting the capability of the C-PEPS to create xml signatures.
  • + *
  • Invokes {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} which
  • + *
      + *
    • Creates and signs a SAML2 stork authentication request.
    • + *
    • Creates a signature request for auth block signature (either to be performed by the C-PEPS or locally).
    • + *
    • Using the velocity template engine in order to create a form with the embedded stork request.
    • + *
    • Writes the form to the response output stream.
    • + *
    + *
+ * Expects: + *
    + *
  • HttpServletRequest parameter {@linkplain at.gv.egovernment.moa.id.auth.MOAIDAuthConstants#PARAM_SESSIONID PARAM_SESSIONID}
  • + *
  • Property {@code ccc} set within the moa session.
  • + *
+ * Result: + *
    + *
  • Form containing a SAML2 Stork authentication request and an action url pointing to the selected C-PEPS.
  • + *
  • Assertion consumer URL for C-PEPS set either to {@code /PEPSConnector} in case of a C-PEPS supporting xml signatures or {@code /PEPSConnectorWithLocalSigning} if the selected C-PEPS does not support xml signatures.
  • + *
  • In case of a C-PEPS not supporting xml signature: moasession with set signedDoc property (containing the signature request for local signing).
  • + *
  • ExecutionContext contains the boolean flag {@link #PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED}. + *
+ * Code taken from {@link StartAuthenticationBuilder#build(AuthenticationSession, HttpServletRequest, HttpServletResponse)}.
+ * Using {@link AuthenticationServer#startSTORKAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationSession)} + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class CreateStorkAuthRequestFormTask extends AbstractAuthServletTask { + + /** + * Boolean value reflecting the capability of the selected c-peps of creating xml signatures. + */ + public static final String PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED = "C-PEPS:XMLSignatureSupported"; + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp) + throws Exception { + + String pendingRequestID = null; + String sessionID = null; + try { + setNoCachingHeaders(resp); + + sessionID = StringEscapeUtils.escapeHtml(req.getParameter(PARAM_SESSIONID)); + // check parameter + if (!ParamValidatorUtils.isValidSessionID(sessionID)) { + throw new WrongParametersException("CreateStorkAuthRequestFormTask", PARAM_SESSIONID, "auth.12"); + } + AuthenticationSession moasession = AuthenticationServer.getSession(sessionID); + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID); + + if (StringUtils.isEmpty(moasession.getCcc())) { + // illegal state; task should not have been executed without a selected country + throw new AuthenticationException("stork.22", new Object[] { sessionID }); + } + STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig(); + if (!storkConfig.isSTORKAuthentication(moasession.getCcc())) { + throw new AuthenticationException("stork.23", new Object[] { moasession.getCcc(), sessionID }); + } + + // STORK authentication + // cpeps cannot be null + CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc()); + Logger.debug("Found C-PEPS configuration for citizen of country: " + moasession.getCcc()); + executionContext.put(PROCESS_CTX_KEY_CPEPS_ISXMLSIGSUPPORTED, cpeps.isXMLSignatureSupported()); + + Logger.info("Starting STORK authentication for a citizen of country: " + moasession.getCcc()); + AuthenticationServer.startSTORKAuthentication(req, resp, moasession); + + } catch (MOAIDException ex) { + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("CreateStorkAuthRequestFormTask has an interal Error.", e); + throw new MOAIDException("Internal error.", new Object[] { sessionID }, e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java new file mode 100644 index 000000000..077bb2dee --- /dev/null +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleLocalSignResponseTask.java @@ -0,0 +1,216 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse; +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PersonalAttribute; + +/** + * Processes the citizen's signature, creates identity link using szr gateway and finalizes authentication. + *

+ * In detail: + *

    + *
  • Changes moa session id.
  • + *
  • Decodes and validates the sign response, extracting the citizen's signature.
  • + *
  • Verifies the citizen's signature.
  • + *
  • Create {@code signedDoc} attribute.
  • + *
  • Retrieve identity link from SZR gateway using the citizen's signature.
  • + *
  • If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. + * Therefore a form is presented asking for the subject's gender. The form finally submits the user back to the + * {@code /PepsConnectorWithLocalSigning} servlet (this task).
  • + *
  • The moa session is updated with authentication information.
  • + *
  • Change moa session id.
  • + *
  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
  • + *
+ * Expects: + *
    + *
  • HttpServletRequest parameter {@code moaSessionID}
  • + *
  • HttpServletRequest parameter {@code signresponse}
  • + *
+ * Result: + *
    + *
  • Updated moa id session (signed auth block, signer certificate etc.)
  • + *
  • Redirect to {@code /dispatcher}.
  • + *
  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
  • + *
+ * Possible branches: + *
    + *
  • In case the szr gateway throws exception due to missing gender information: + *
      + *
    • Returns a form for gender selection with action url back to this servlet/task.
    • + *
    + *
  • + *
+ * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
+ * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorHandleLocalSignResponseTask extends AbstractPepsConnectorWithLocalSigningTask { + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + + if (moaSessionID != null && signResponse != null) { + // redirect from oasis with signresponse + handleSignResponse(executionContext, request, response); + } else { + // should not occur + throw new IOException("should not occur"); + } + return; + } + + private void handleSignResponse(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) { + Logger.info("handleSignResponse started"); + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + String pendingRequestID = null; + try { + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + Logger.info("pendingRequestID:" + pendingRequestID); + String signResponseString = new String(Base64.decodeBase64(signResponse), "UTF8"); + Logger.info("RECEIVED signresponse:" + signResponseString); + // create SignResponse object + Source response1 = new StreamSource(new java.io.StringReader(signResponseString)); + SignResponse dssSignResponse = ApiUtils.unmarshal(response1, SignResponse.class); + + // SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource(new + // java.io.StringReader(Base64.signResponse))); + + String citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + X509Certificate cert = getSignerCertificate(citizenSignature); + moaSession.setSignerCertificate(cert); + VerifyXMLSignatureResponse xMLVerifySignatureResponse = verifyXMLSignature(citizenSignature); + at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse tmp = convert(xMLVerifySignatureResponse); + + moaSession.setXMLVerifySignatureResponse(tmp); + executionContext.put("identityLinkAvailable", false); + try { + IPersonalAttributeList personalAttributeList = moaSession.getAuthnResponseGetPersonalAttributeList(); + // Add SignResponse TODO Add signature (extracted from signResponse)? + List values = new ArrayList(); + values.add(signResponseString); + // values.add(citizenSignature); + Logger.debug("Assembling signedDoc attribute"); + PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values, "Available"); + personalAttributeList.add(signedDocAttribute); + + String authnContextClassRef = moaSession.getAuthnContextClassRef(); + SZRGInsertion(moaSession, personalAttributeList, authnContextClassRef, citizenSignature); + executionContext.put("identityLinkAvailable", true); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas + // authnResponse? + moaSession.setForeigner(true); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + response.sendRedirect(redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + } + +} diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java new file mode 100644 index 000000000..3338804b4 --- /dev/null +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorHandleResponseWithoutSignatureTask.java @@ -0,0 +1,439 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.StringUtils; +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.profile.SignRequest; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; + +/** + * Validates the SAML response from C-PEPS. + *

+ * In detail: + *

    + *
  • Decodes and validates SAML response from C-PEPS.
  • + *
  • Retrieves the moa session using the session id provided by HttpServletRequest parameter {@code RelayState} or by {@code inResponseTo} attribute of the saml response.
  • + *
  • Store saml response in moa session.
  • + *
  • Change moa session id.
  • + *
  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
  • + *
+ * Expects: + *
    + *
  • HttpServletRequest parameter {@code moaSessionID} to be {@code null}
  • + *
  • HttpServletRequest parameter {@code signresponse} to be {@code null}
  • + *
  • HttpServletRequest parameter {@code SAMLResponse}
  • + *
  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute within the saml response, both reflecting the moa session id.
  • + *
+ * Result: + *
    + *
  • Updated moa session (with saml response).
  • + *
  • Redirect to {@code /PEPSConnectorWithLocalSigning}, with providing the moa session id as request parameter.
  • + *
+ * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet}.
+ * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorHandleResponseWithoutSignatureTask extends AbstractPepsConnectorWithLocalSigningTask { + + private String oasisDssWebFormURL = "https://testvidp.buergerkarte.at/oasis-dss/DSSWebFormServlet"; + // load from config below + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String moaSessionID = request.getParameter("moaSessionID"); + String signResponse = request.getParameter("signresponse"); + Logger.info("moaSessionID:" + moaSessionID); + Logger.info("signResponse:" + signResponse); + + if (moaSessionID == null && signResponse == null) { + // normal saml response + handleSAMLResponse(executionContext, request, response); + + } else { + // should not occur + throw new IOException("should not occur"); + } + return; + } + + private void handleSAMLResponse(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) { + Logger.info("handleSAMLResponse started"); + String pendingRequestID = null; + + setNoCachingHeaders(response); + try { + Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); + Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); + + Logger.trace("No Caching headers set for HTTP response"); + + // check if https or only http + super.checkIfHTTPisAllowed(request.getRequestURL().toString()); + + Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); + + // extract STORK Response from HTTP Request + // Decodes SAML Response + byte[] decSamlToken; + try { + decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); + Logger.debug("SAMLResponse: " + new String(decSamlToken)); + + } catch (NullPointerException e) { + Logger.error("Unable to retrieve STORK Response", e); + throw new MOAIDException("stork.04", null); + } + + // Get SAMLEngine instance + STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); + + STORKAuthnResponse authnResponse = null; + try { + // validate SAML Token + Logger.debug("Starting validation of SAML response"); + authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); + Logger.info("SAML response succesfully verified!"); + } catch (STORKSAMLEngineException e) { + Logger.error("Failed to verify STORK SAML Response", e); + throw new MOAIDException("stork.05", null); + } + + Logger.info("STORK SAML Response message succesfully extracted"); + Logger.debug("STORK response: "); + Logger.debug(authnResponse.toString()); + + Logger.debug("Trying to find MOA Session-ID ..."); + // String moaSessionID = request.getParameter(PARAM_SESSIONID); + // first use SAML2 relayState + String moaSessionID = request.getParameter("RelayState"); + + // escape parameter strings + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + // check if SAML2 relaystate includes a MOA sessionID + if (StringUtils.isEmpty(moaSessionID)) { + // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier + + moaSessionID = authnResponse.getInResponseTo(); + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + if (StringUtils.isEmpty(moaSessionID)) { + // No authentication session has been started before + Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); + Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); + throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); + + } else + Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); + + } else + // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); + Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); + + /* + * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because + * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter + */ + // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) + // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Found MOA sessionID: " + moaSessionID); + + String statusCodeValue = authnResponse.getStatusCode(); + + if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { + Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); + throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); + } + + Logger.info("Got SAML response with authentication success message."); + + Logger.debug("MOA session is still valid"); + + STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); + + if (storkAuthnRequest == null) { + Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + throw new MOAIDException("stork.07", null); + } + + Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + + // //////////// incorporate gender from parameters if not in stork response + + IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); + + // but first, check if we have a representation case + if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) + || STORKResponseProcessor.hasAttribute("representative", attributeList) + || STORKResponseProcessor.hasAttribute("represented", attributeList)) { + // in a representation case... + moaSession.setUseMandate("true"); + + // and check if we have the gender value + PersonalAttribute gender = attributeList.get("gender"); + if (null == gender) { + String gendervalue = (String) request.getParameter("gender"); + if (null != gendervalue) { + gender = new PersonalAttribute(); + gender.setName("gender"); + ArrayList tmp = new ArrayList(); + tmp.add(gendervalue); + gender.setValue(tmp); + + authnResponse.getPersonalAttributeList().add(gender); + } + } + } + + + + // //////////////////////////////////////////////////////////////////////// + + Logger.debug("Starting extraction of signedDoc attribute"); + // extract signed doc element and citizen signature + String citizenSignature = null; + try { + PersonalAttribute signedDoc = authnResponse.getPersonalAttributeList().get("signedDoc"); + String signatureInfo = null; + // FIXME: Remove nonsense code (signedDoc attribute... (throw Exception for "should not occur" situations)), adjust error messages in order to reflect the true problem... + if (signedDoc != null) { + signatureInfo = signedDoc.getValue().get(0); + // should not occur + } else { + + // store SAMLResponse + moaSession.setSAMLResponse(request.getParameter("SAMLResponse")); + // store authnResponse + + // moaSession.setAuthnResponse(authnResponse);//not serializable + moaSession.setAuthnResponseGetPersonalAttributeList(authnResponse.getPersonalAttributeList()); + + String authnContextClassRef = null; + try { + authnContextClassRef = authnResponse.getAssertions().get(0).getAuthnStatements().get(0) + .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef(); + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + } + + moaSession.setAuthnContextClassRef(authnContextClassRef); + moaSession.setReturnURL(request.getRequestURL()); + + // load signedDoc + String signRequest = moaSession.getSignedDoc(); + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + // set return url to PEPSConnectorWithLocalSigningServlet and add newMOASessionID + // signRequest + + String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix(); + String acsURL = issuerValue + + PEPSConnectorWithLocalSigningServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN; + + String url = acsURL + "?moaSessionID=" + newMOASessionID; + // redirect to OASIS module and sign there + + boolean found = false; + try { + List aps = AuthConfigurationProvider.getInstance() + .getOnlineApplicationParameter(moaSession.getPublicOAURLPrefix()).getStorkAPs(); + Logger.info("Found AttributeProviderPlugins:" + aps.size()); + for (AttributeProviderPlugin ap : aps) { + Logger.info("Found AttributeProviderPlugin attribute:" + ap.getAttributes()); + if (ap.getAttributes().equalsIgnoreCase("signedDoc")) { + // FIXME: A servlet's class field is not thread safe!!! + oasisDssWebFormURL = ap.getUrl(); + found = true; + Logger.info("Loaded signedDoc attribute provider url from config:" + oasisDssWebFormURL); + break; + } + } + } catch (Exception e) { + e.printStackTrace(); + Logger.error("Loading the signedDoc attribute provider url from config failed"); + } + if (!found) { + Logger.error("Failed to load the signedDoc attribute provider url from config"); + } + performRedirect(url, request, response, signRequest); + + return; + } + + // FIXME: This servlet/task is intended to handle peps responses without signature, so why do we try to process that signature here? + SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( + new java.io.StringReader(signatureInfo))); + + citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + X509Certificate cert = getSignerCertificate(citizenSignature); + moaSession.setSignerCertificate(cert); + moaSession.setForeigner(true); + + } catch (Throwable e) { + Logger.error("Could not extract citizen signature from C-PEPS", e); + throw new MOAIDException("stork.09", null); + } + + // FIXME: Same here; we do not have the citizen's signature, so this code might be regarded as dead code. + try { + SZRGInsertion(moaSession, authnResponse.getPersonalAttributeList(), authnResponse.getAssertions() + .get(0).getAuthnStatements().get(0).getAuthnContext().getAuthnContextClassRef() + .getAuthnContextClassRef(), citizenSignature); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));// TODO ask Florian/Thomas + // authnResponse? + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + response.setContentType("text/html"); + response.setStatus(302); + response.addHeader("Location", redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + + private void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, String signRequestString) + throws MOAIDException { + + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/oasis_dss_webform_binding.vm"); + VelocityContext context = new VelocityContext(); + + Logger.debug("performRedirect, signrequest:" + signRequestString); + Source signDoc = new StreamSource(new java.io.StringReader(signRequestString)); + SignRequest signRequest = ApiUtils.unmarshal(signDoc, SignRequest.class); + signRequest.setReturnURL("TODO"); + signRequestString = IOUtils.toString(ApiUtils.marshalToInputStream(signRequest)); + context.put("signrequest", Base64.encodeBase64String(signRequestString.getBytes("UTF8"))); + context.put("clienturl", url); + context.put("action", oasisDssWebFormURL); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + resp.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e) { + Logger.error("Error sending DSS signrequest.", e); + throw new MOAIDException("stork.11", null); + } + } +} diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java new file mode 100644 index 000000000..94017e9f6 --- /dev/null +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java @@ -0,0 +1,566 @@ +package at.gv.egovernment.moa.id.auth.modules.stork.tasks; + +import iaik.x509.X509Certificate; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + +import javax.activation.DataSource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.namespace.QName; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.opensaml.saml2.core.StatusCode; + +import at.gv.egovernment.moa.id.auth.AuthenticationServer; +import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder; +import at.gv.egovernment.moa.id.auth.data.AuthenticationSession; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.exception.AuthenticationException; +import at.gv.egovernment.moa.id.auth.exception.MOAIDException; +import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask; +import at.gv.egovernment.moa.id.auth.stork.STORKException; +import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.OAAuthParameter; +import at.gv.egovernment.moa.id.moduls.ModulUtils; +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants; +import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage; +import at.gv.egovernment.moa.id.util.HTTPUtils; +import at.gv.egovernment.moa.id.util.VelocityProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.StringUtils; +import at.gv.util.xsd.xmldsig.SignatureType; +import at.gv.util.xsd.xmldsig.X509DataType; +import eu.stork.documentservice.DocumentService; +import eu.stork.documentservice.data.DatabaseConnectorMySQLImpl; +import eu.stork.oasisdss.api.ApiUtils; +import eu.stork.oasisdss.api.LightweightSourceResolver; +import eu.stork.oasisdss.api.exceptions.ApiUtilsException; +import eu.stork.oasisdss.profile.DocumentType; +import eu.stork.oasisdss.profile.DocumentWithSignature; +import eu.stork.oasisdss.profile.SignResponse; +import eu.stork.peps.auth.commons.IPersonalAttributeList; +import eu.stork.peps.auth.commons.PEPSUtil; +import eu.stork.peps.auth.commons.PersonalAttribute; +import eu.stork.peps.auth.commons.PersonalAttributeList; +import eu.stork.peps.auth.commons.STORKAttrQueryRequest; +import eu.stork.peps.auth.commons.STORKAuthnRequest; +import eu.stork.peps.auth.commons.STORKAuthnResponse; +import eu.stork.peps.auth.engine.STORKSAMLEngine; +import eu.stork.peps.exceptions.STORKSAMLEngineException; + +/** + * Evaluates the SAML response from the C-PEPS and authenticates the user. + *

+ * In detail: + *

    + *
  • Decodes and validates the SAML response from the C-PEPS.
  • + *
  • Change moa session id.
  • + *
  • Extracts the subject's gender from request parameter {@code gender} if not available from the saml response.
  • + *
  • Extracts the {@code signedDoc} attribute from the response, get signed doc payload using stork attribute query request.
  • + *
  • Request SZR gateway for verification of the citizen's signature and for creating of an identity link.
  • + *
  • In case of mandate mode: If the S-PEPS did not provide any gender information, the szr gateway will not be able to issue an identity link. Therefore a form is presented asking for the subject's gender. The form submits the user back to the {@code /PepsConnector} servlet (this task).
  • + *
  • The moa session is updated with authentication information.
  • + *
  • Change moa session id.
  • + *
  • Redirects back to {@code /dispatcher} in order to finalize the authentication.
  • + *
+ * Expects: + *
    + *
  • HttpServletRequest parameter {@code SAMLResponse}
  • + *
  • Either HttpServletRequest parameter {@code RelayState} or {@code inResponseTo} attribute from the SAML response (both depicting the moa session id)
  • + *
  • HttpServletRequest parameter {@code gender} in case the request comes from the gender selection form
  • + *
  • {@code signedDoc} attribute within the SAML response.
  • + *
+ * Result: + *
    + *
  • Updated moa id session (identity link, stork attributes...)
  • + *
  • {@link ExecutionContext} contains boolean flag {@code identityLinkAvailable} indicating if an identitylink has been successfully creates or not.
  • + *
  • Redirect to {@code /dispatcher}.
  • + *
+ * Possible branches: + *
    + *
  • In case the szr gateway throws exception due to missing gender information: + *
      + *
    • Returns a form for gender selection with action url back to this servlet/task.
    • + *
    + *
  • + *
+ * Code taken from {@link at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet}.
+ * + * @see #execute(ExecutionContext, HttpServletRequest, HttpServletResponse) + */ +public class PepsConnectorTask extends AbstractAuthServletTask { + + private String dtlUrl = null; + + public PepsConnectorTask() { + super(); + Properties props = new Properties(); + try { + props.load(DatabaseConnectorMySQLImpl.class.getResourceAsStream("docservice.properties")); + dtlUrl = props.getProperty("docservice.url"); + } catch (IOException e) { + dtlUrl = "http://testvidp.buergerkarte.at/DocumentService/DocumentService"; + Logger.error("Loading DTL config failed, using default value:" + dtlUrl); + e.printStackTrace(); + } + } + + @Override + public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) + throws Exception { + String pendingRequestID = null; + + setNoCachingHeaders(response); + + try { + + Logger.info("PEPSConnector Servlet invoked, expecting C-PEPS message."); + Logger.debug("This ACS endpoint is: " + HTTPUtils.getBaseURL(request)); + + // check if https or only http + super.checkIfHTTPisAllowed(request.getRequestURL().toString()); + + Logger.debug("Beginning to extract SAMLResponse out of HTTP Request"); + + // extract STORK Response from HTTP Request + // Decodes SAML Response + byte[] decSamlToken; + try { + decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse")); + Logger.debug("SAMLResponse: " + new String(decSamlToken)); + + } catch (NullPointerException e) { + Logger.error("Unable to retrieve STORK Response", e); + throw new MOAIDException("stork.04", null); + } + + // Get SAMLEngine instance + STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing"); + + STORKAuthnResponse authnResponse = null; + try { + // validate SAML Token + Logger.debug("Starting validation of SAML response"); + authnResponse = engine.validateSTORKAuthnResponse(decSamlToken, (String) request.getRemoteHost()); + Logger.info("SAML response succesfully verified!"); + } catch (STORKSAMLEngineException e) { + Logger.error("Failed to verify STORK SAML Response", e); + throw new MOAIDException("stork.05", null); + } + + Logger.info("STORK SAML Response message succesfully extracted"); + Logger.debug("STORK response: "); + Logger.debug(authnResponse.toString()); + + Logger.debug("Trying to find MOA Session-ID ..."); + // String moaSessionID = request.getParameter(PARAM_SESSIONID); + // first use SAML2 relayState + String moaSessionID = request.getParameter("RelayState"); + + // escape parameter strings + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + // check if SAML2 relaystate includes a MOA sessionID + if (StringUtils.isEmpty(moaSessionID)) { + // if relaystate is emtpty, use SAML response -> inResponseTo element as session identifier + + moaSessionID = authnResponse.getInResponseTo(); + moaSessionID = StringEscapeUtils.escapeHtml(moaSessionID); + + if (StringUtils.isEmpty(moaSessionID)) { + // No authentication session has been started before + Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started"); + Logger.debug("PEPSConnectorURL was: " + request.getRequestURL()); + throw new AuthenticationException("auth.02", new Object[] { moaSessionID }); + + } else + Logger.trace("Use MOA SessionID " + moaSessionID + " from AuthnResponse->inResponseTo attribute."); + + } else + // Logger.trace("MOA SessionID " + moaSessionID + " is found in http GET parameter."); + Logger.trace("MOA SessionID " + moaSessionID + " is found in SAML2 relayState."); + + /* + * INFO!!!! SAML message IDs has an different format then MOASessionIDs This is only a workaround because + * many PEPS does not support SAML2 relayState or MOASessionID as AttributConsumerServiceURL GET parameter + */ + // if (!ParamValidatorUtils.isValidSessionID(moaSessionID)) + // throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12"); + + pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID); + + // load MOASession from database + AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID); + // change MOASessionID + moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Found MOA sessionID: " + moaSessionID); + + String statusCodeValue = authnResponse.getStatusCode(); + + if (!statusCodeValue.equals(StatusCode.SUCCESS_URI)) { + Logger.error("Received ErrorResponse from PEPS: " + statusCodeValue); + throw new MOAIDException("stork.06", new Object[] { statusCodeValue }); + } + + Logger.info("Got SAML response with authentication success message."); + + Logger.debug("MOA session is still valid"); + + STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest(); + + if (storkAuthnRequest == null) { + Logger.error("Could not find any preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + throw new MOAIDException("stork.07", null); + } + + Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); + + // //////////// incorporate gender from parameters if not in stork response + + IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); + + // but first, check if we have a representation case + if (STORKResponseProcessor.hasAttribute("mandateContent", attributeList) + || STORKResponseProcessor.hasAttribute("representative", attributeList) + || STORKResponseProcessor.hasAttribute("represented", attributeList)) { + // in a representation case... + moaSession.setUseMandate("true"); + + // and check if we have the gender value + PersonalAttribute gender = attributeList.get("gender"); // TODO Do we need to check gender value if + // there is no representation case? + if (null == gender) { + String gendervalue = (String) request.getParameter("gender"); + if (null != gendervalue) { + gender = new PersonalAttribute(); + gender.setName("gender"); + ArrayList tmp = new ArrayList(); + tmp.add(gendervalue); + gender.setValue(tmp); + + authnResponse.getPersonalAttributeList().add(gender); + } + } + } + + // //////////////////////////////////////////////////////////////////////// + + Logger.debug("Starting extraction of signedDoc attribute"); + // extract signed doc element and citizen signature + String citizenSignature = null; + try { + String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0); // TODO ERROR HANDLING + + Logger.debug("signatureInfo:" + signatureInfo); + + SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource( + new java.io.StringReader(signatureInfo))); + + // fetch signed doc + DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse); + if (ds == null) { + throw new ApiUtilsException("No datasource found in response"); + } + + InputStream incoming = ds.getInputStream(); + citizenSignature = IOUtils.toString(incoming); + incoming.close(); + + Logger.debug("citizenSignature:" + citizenSignature); + if (isDocumentServiceUsed(citizenSignature) == true) { + Logger.debug("Loading document from DocumentService."); + String url = getDtlUrlFromResponse(dssSignResponse); + // get Transferrequest + String transferRequest = getDocTransferRequest(dssSignResponse.getDocUI(), url); + // Load document from DocujmentService + byte[] data = getDocumentFromDtl(transferRequest, url); + citizenSignature = new String(data, "UTF-8"); + Logger.debug("Overridung citizenSignature with:" + citizenSignature); + } + + JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName()); + SignatureType root = ((JAXBElement) ctx.createUnmarshaller().unmarshal( + IOUtils.toInputStream(citizenSignature))).getValue(); + + // memorize signature into authblock + moaSession.setAuthBlock(citizenSignature); + + // extract certificate + for (Object current : root.getKeyInfo().getContent()) + if (((JAXBElement) current).getValue() instanceof X509DataType) { + for (Object currentX509Data : ((JAXBElement) current).getValue() + .getX509IssuerSerialOrX509SKIOrX509SubjectName()) { + JAXBElement casted = ((JAXBElement) currentX509Data); + if (casted.getName().getLocalPart().equals("X509Certificate")) { + moaSession.setSignerCertificate(new X509Certificate(((String) casted.getValue()) + .getBytes("UTF-8"))); + break; + } + } + } + + } catch (Throwable e) { + Logger.error("Could not extract citizen signature from C-PEPS", e); + throw new MOAIDException("stork.09", null); + } + Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)"); + Logger.debug("Citizen signature will be verified by SZR Gateway!"); + + Logger.debug("fetching OAParameters from database"); + + // //read configuration paramters of OA + // AuthenticationSession moasession; + // try { + // moasession = AuthenticationSessionStoreage.getSession(moaSessionID); + // } catch (MOADatabaseException e2) { + // Logger.error("could not retrieve moa session"); + // throw new AuthenticationException("auth.01", null); + // } + OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter( + moaSession.getPublicOAURLPrefix()); + if (oaParam == null) + throw new AuthenticationException("auth.00", new Object[] { moaSession.getPublicOAURLPrefix() }); + + // retrieve target + // TODO: check in case of SSO!!! + String targetType = null; + if (oaParam.getBusinessService()) { + String id = oaParam.getIdentityLinkDomainIdentifier(); + if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) + targetType = id; + else + targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier(); + } else { + targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget(); + } + + Logger.debug("Starting connecting SZR Gateway"); + // contact SZR Gateway + IdentityLink identityLink = null; + executionContext.put("identityLinkAvailable", false); + try { + identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(), + oaParam.getFriendlyName(), targetType, null, oaParam.getMandateProfiles(), citizenSignature); + } catch (STORKException e) { + // this is really nasty but we work against the system here. We are supposed to get the gender attribute + // from + // stork. If we do not, we cannot register the person in the ERnP - we have to have the + // gender for the represented person. So here comes the dirty hack. + if (e.getCause() instanceof STORKException + && e.getCause().getMessage().equals("gender not found in response")) { + try { + Logger.trace("Initialize VelocityEngine..."); + + VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine(); + Template template = velocityEngine.getTemplate("/resources/templates/fetchGender.html"); + VelocityContext context = new VelocityContext(); + context.put("SAMLResponse", request.getParameter("SAMLResponse")); + context.put("action", request.getRequestURL()); + + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + response.getOutputStream().write(writer.toString().getBytes("UTF-8")); + } catch (Exception e1) { + Logger.error("Error sending gender retrival form.", e1); + // httpSession.invalidate(); + throw new MOAIDException("stork.10", null); + } + + return; + } + + Logger.error("Error connecting SZR Gateway", e); + throw new MOAIDException("stork.10", null); + } + Logger.debug("SZR communication was successfull"); + + if (identityLink == null) { + Logger.error("SZR Gateway did not return an identity link."); + throw new MOAIDException("stork.10", null); + } + moaSession.setForeigner(true); + + Logger.info("Received Identity Link from SZR Gateway"); + executionContext.put("identityLinkAvailable", true); + moaSession.setIdentityLink(identityLink); + + Logger.debug("Adding addtional STORK attributes to MOA session"); + moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList()); + + Logger.debug("Add full STORK AuthnResponse to MOA session"); + moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse")); + + // We don't have BKUURL, setting from null to "Not applicable" + moaSession.setBkuURL("Not applicable (STORK Authentication)"); + + // free for single use + moaSession.setAuthenticatedUsed(false); + + // stork did the authentication step + moaSession.setAuthenticated(true); + + // TODO: found better solution, but QAA Level in response could be not supported yet + try { + + moaSession.setQAALevel(authnResponse.getAssertions().get(0).getAuthnStatements().get(0) + .getAuthnContext().getAuthnContextClassRef().getAuthnContextClassRef()); + + } catch (Throwable e) { + Logger.warn("STORK QAA-Level is not found in AuthnResponse. Set QAA Level to requested level"); + moaSession.setQAALevel(PVPConstants.STORK_QAA_PREFIX + oaParam.getQaaLevel()); + + } + + // session is implicit stored in changeSessionID!!!! + String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession); + + Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID); + + // redirect + String redirectURL = null; + redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), + ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), + newMOASessionID); + redirectURL = response.encodeRedirectURL(redirectURL); + + // response.setContentType("text/html"); + // response.setStatus(302); + // response.addHeader("Location", redirectURL); + response.sendRedirect(redirectURL); + Logger.info("REDIRECT TO: " + redirectURL); + + } catch (AuthenticationException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (MOAIDException e) { + handleError(null, e, request, response, pendingRequestID); + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + + finally { + ConfigurationDBUtils.closeSession(); + } + + } + + private boolean isDocumentServiceUsed(String citizenSignature) // TODo add better check + { + if (citizenSignature + .contains("
Service Name:{http://stork.eu}DocumentService
Port Name:{http://stork.eu}DocumentServicePort
")) + return true; + return false; + } + + /** + * Get DTL uril from the oasis sign response + * + * @param signRequest + * The signature response + * @return The URL of DTL service + * @throws SimpleException + */ + private String getDtlUrlFromResponse(SignResponse dssSignResponse) { + List documents = ApiUtils.findNamedElement(dssSignResponse.getOptionalOutputs(), + ApiUtils.OPTIONAL_OUTPUT_DOCUMENTWITHSIGNATURE, DocumentWithSignature.class); + DocumentType sourceDocument = documents.get(0).getDocument(); + + if (sourceDocument.getDocumentURL() != null) + return sourceDocument.getDocumentURL(); + else + return null;// throw new Exception("No document url found"); + } + + // From DTLPEPSUTIL + + /** + * Get document from DTL + * + * @param transferRequest + * The transfer request (attribute query) + * @param eDtlUrl + * The DTL url of external DTL + * @return the document data + * @throws SimpleException + */ + private byte[] getDocumentFromDtl(String transferRequest, String eDtlUrl) throws Exception { + URL url = null; + try { + url = new URL(dtlUrl); + QName qname = new QName("http://stork.eu", "DocumentService"); + + Service service = Service.create(url, qname); + DocumentService docservice = service.getPort(DocumentService.class); + + BindingProvider bp = (BindingProvider) docservice; + SOAPBinding binding = (SOAPBinding) bp.getBinding(); + binding.setMTOMEnabled(true); + + if (eDtlUrl.equalsIgnoreCase(dtlUrl)) + return docservice.getDocument(transferRequest, ""); + else + return docservice.getDocument(transferRequest, eDtlUrl); + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("Error in getDocumentFromDtl", e); + } + } + + /** + * Get a document transfer request (attribute query) + * + * @param docId + * @return + * @throws SimpleException + */ + private String getDocTransferRequest(String docId, String destinationUrl) throws Exception { + String spCountry = docId.substring(0, docId.indexOf("/")); + final STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP"); + STORKAttrQueryRequest req = new STORKAttrQueryRequest(); + req.setAssertionConsumerServiceURL(dtlUrl); + req.setDestination(destinationUrl); + req.setSpCountry(spCountry); + req.setQaa(3);// TODO + PersonalAttributeList pal = new PersonalAttributeList(); + PersonalAttribute attr = new PersonalAttribute(); + attr.setName("docRequest"); + attr.setIsRequired(true); + attr.setValue(Arrays.asList(docId)); + pal.add(attr); + req.setPersonalAttributeList(pal); + + STORKAttrQueryRequest req1; + try { + req1 = engine.generateSTORKAttrQueryRequest(req); + return PEPSUtil.encodeSAMLTokenUrlSafe(req1.getTokenSaml()); + } catch (STORKSAMLEngineException e) { + e.printStackTrace(); + throw new Exception("Error in doc request attribute query generation", e); + } + } + +} diff --git a/id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml b/id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml new file mode 100644 index 000000000..2e924bdd0 --- /dev/null +++ b/id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml b/id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml new file mode 100644 index 000000000..60989e638 --- /dev/null +++ b/id/server/modules/module-stork/src/main/resources/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthentication.process.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml new file mode 100644 index 000000000..64b1b57b4 --- /dev/null +++ b/id/server/modules/pom.xml @@ -0,0 +1,48 @@ + + 4.0.0 + + + MOA.id + moa-id + 2.x + + + MOA.id.server.modules + moa-id-modules + ${moa-id-version} + pom + + MOA ID-Modules + + + ${basedir}/../../../repository + + + + module-stork + + + + + MOA.id.server + moa-id-lib + + + commons-logging + commons-logging + + + ch.qos.logback + logback-classic + + + + + javax.servlet + javax.servlet-api + provided + + + + diff --git a/id/server/pom.xml b/id/server/pom.xml index 14cb227e7..9d34cce78 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -28,6 +28,7 @@ moa-id-commons stork2-saml-engine stork2-commons + modules diff --git a/pom.xml b/pom.xml index 9a77ada22..95a3f1155 100644 --- a/pom.xml +++ b/pom.xml @@ -323,7 +323,12 @@ moa-id-commons ${moa-id-version} compile - + + + MOA.id.server.modules + moa-id-module-stork + ${moa-id-version} + MOA.spss.server moa-spss-lib -- cgit v1.2.3 From a22b7f1660560569701d086b4075192fa83ee6a8 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 4 Feb 2015 12:17:31 +0100 Subject: Persistence issue fixed (MOAID-62) - ProcessInstanceStore: Removed primary key column "id", set processInstanceId as new primary key column. - Renamed "save"-methods that actually save-or-update to "saveOrUpdate...". --- .../at/gv/egovernment/moa/id/process/ProcessEngineImpl.java | 12 +++++------- .../egovernment/moa/id/process/dao/ProcessInstanceStore.java | 4 ---- .../moa/id/process/dao/ProcessInstanceStoreDAO.java | 2 +- .../moa/id/process/dao/ProcessInstanceStoreDAOImpl.java | 5 +---- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java index eb6a29ad9..650bae44e 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java @@ -30,8 +30,6 @@ import at.gv.egovernment.moa.id.process.model.Transition; /** * Process engine implementation allowing starting and continuing processes as well as providing means for cleanup actions. - * @author tknall - * */ public class ProcessEngineImpl implements ProcessEngine { @@ -101,7 +99,7 @@ public class ProcessEngineImpl implements ProcessEngine { log.info("Creating process instance from process definition '{}': {}", processDefinitionId, pi.getId()); try { - saveProcessInstance(pi); + saveOrUpdateProcessInstance(pi); } catch (MOADatabaseException e) { throw new ProcessExecutionException("Unable to persist process instance.", e); } @@ -133,7 +131,7 @@ public class ProcessEngineImpl implements ProcessEngine { pi.setState(ProcessInstanceState.STARTED); execute(pi); - saveProcessInstance(pi); + saveOrUpdateProcessInstance(pi); } catch (MOADatabaseException e) { throw new ProcessExecutionException("Unable to load/save process instance.", e); @@ -162,7 +160,7 @@ public class ProcessEngineImpl implements ProcessEngine { pi.setState(ProcessInstanceState.STARTED); execute(pi); - saveProcessInstance(pi); + saveOrUpdateProcessInstance(pi); } catch (MOADatabaseException e) { throw new ProcessExecutionException("Unable to load/save process instance.", e); @@ -314,7 +312,7 @@ public class ProcessEngineImpl implements ProcessEngine { * @param processInstance The object to persist. * @throws MOADatabaseException Thrown if an error occurs while accessing the database. */ - private void saveProcessInstance(ProcessInstance processInstance) throws MOADatabaseException { + private void saveOrUpdateProcessInstance(ProcessInstance processInstance) throws MOADatabaseException { ProcessInstanceStore store = new ProcessInstanceStore(); ExecutionContext ctx = processInstance.getExecutionContext(); @@ -331,7 +329,7 @@ public class ProcessEngineImpl implements ProcessEngine { store.setProcessInstanceId(processInstance.getId()); store.setProcessState(processInstance.getState()); - piStoreDao.save(store); + piStoreDao.saveOrUpdate(store); } /** diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index c6bf86823..582f50427 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -19,11 +19,7 @@ import at.gv.egovernment.moa.id.process.ProcessInstanceState; @Table(name = "processinstance") public class ProcessInstanceStore { - @Column(name = "id") @Id - private int id; - - @Column(name = "processInstanceId", unique = true, nullable = false) private String processInstanceId; @Column(name = "processDefinitionId", nullable = false) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java index 999a9b82b..6f8a8c66c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java @@ -16,7 +16,7 @@ public interface ProcessInstanceStoreDAO { * @throws MOADatabaseException * is thrown if a problem occurs while accessing the database. */ - void save(ProcessInstanceStore pIStore) throws MOADatabaseException; + void saveOrUpdate(ProcessInstanceStore pIStore) throws MOADatabaseException; /** * Returns a {@link ProcessInstanceStore}, defined by diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java index 0a50afc6c..012dfe90b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -1,8 +1,5 @@ package at.gv.egovernment.moa.id.process.dao; -import java.util.Collections; -import java.util.List; - import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; @@ -28,7 +25,7 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { } @Override - public void save(ProcessInstanceStore pIStore) throws MOADatabaseException { + public void saveOrUpdate(ProcessInstanceStore pIStore) throws MOADatabaseException { try { MOASessionDBUtils.saveOrUpdate(pIStore); log.debug("Store process instance with='{}' in the database.", pIStore.getProcessInstanceId()); -- cgit v1.2.3 From 215b326e807659b30c520478e8123a888df6d204 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 4 Feb 2015 13:19:53 +0100 Subject: Add comment to ProcessInstanceStore primary key field --- .../gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java index 582f50427..d690c37bf 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStore.java @@ -19,6 +19,15 @@ import at.gv.egovernment.moa.id.process.ProcessInstanceState; @Table(name = "processinstance") public class ProcessInstanceStore { + /** + * A process instance identifier qualifies as natural primary key by satisfying these requirements + * ("unique, constant, required"): + *
    + *
  • unique value
  • + *
  • never changes (immutable)
  • + *
  • never {@code null}
  • + *
+ */ @Id private String processInstanceId; -- cgit v1.2.3 From a9dc7e094a8732f9826ab77648758dd39adc7324 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Wed, 4 Feb 2015 13:54:32 +0100 Subject: Add logging for automatic servlet registration. --- id/server/auth/src/main/webapp/WEB-INF/web.xml | 9 ++++++++- .../modules/stork/STORKWebApplicationInitializer.java | 19 +++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 41c46bd22..930b10f43 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -137,16 +137,23 @@ at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet + ProcessEngineSignal + /signalProcess + /GetMISSessionID /GetForeignID /VerifyAuthBlock /VerifyCertificate /VerifyIdentityLink - + + MOA.id.server.modules moa-id-module-stork + + + + MOA.id.server.modules + moa-id-module-monitoring + diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index 930b10f43..5afc0dee7 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -67,6 +67,8 @@ /RedirectServlet + + SSOSendAssertionServlet diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java deleted file mode 100644 index e04f97e6e..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java +++ /dev/null @@ -1,126 +0,0 @@ -/******************************************************************************* - * 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.servlet; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Arrays; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import at.gv.egovernment.moa.id.config.ConfigurationException; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.monitoring.TestManager; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.MiscUtil; - -public class MonitoringServlet extends AuthServlet { - - private static final long serialVersionUID = 1L; - private static final String REQUEST_ATTR_MODULE = "module"; - - - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - - try { - AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); - - if (config.isMonitoringActive()) { - Logger.debug("Monitoring Servlet received request"); - - TestManager tests = TestManager.getInstance(); - - String modulename = req.getParameter(REQUEST_ATTR_MODULE); - if (MiscUtil.isEmpty(modulename)) { - - List error = tests.executeTests(); - if (error != null && error.size() > 0) { - createErrorMessage(req, resp, error); - - } else { - resp.setStatus(HttpServletResponse.SC_OK); - resp.setContentType("text/html;charset=UTF-8"); - resp.getWriter().write(getHtml(config.getMonitoringMessageSuccess())); - Logger.info("Monitoring Servlet finished without errors"); - } - - } else { - if (tests.existsModule(modulename)) { - List errors = tests.executeTest(modulename); - if (errors != null && errors.size() > 0) { - createErrorMessage(req, resp, errors); - - } else { - resp.setStatus(HttpServletResponse.SC_OK); - resp.setContentType("text/html;charset=UTF-8"); - resp.getWriter().write(getHtml(config.getMonitoringMessageSuccess())); - Logger.info("Monitoring Servlet finished without errors"); - } - - } else { - Logger.warn("NO Testmodule exists with modulename " + modulename); - resp.setStatus(HttpServletResponse.SC_NOT_FOUND); - resp.setContentType("text/html;charset=UTF-8"); - PrintWriter out; - try { - out = new PrintWriter(resp.getOutputStream()); - out.write("NO Testmodule exists with modulename " + modulename); - out.flush(); - - } catch (IOException e) { - Logger.warn("Internal Monitoring Servlet Error. ", e); - } - } - - } - } - - } catch (ConfigurationException e) { - createErrorMessage(req, resp, Arrays.asList(e.getMessage())); - } - } - - private void createErrorMessage(HttpServletRequest req, HttpServletResponse resp, List errorMessage) { - Logger.warn("Monitoring Servlet found some Error: " + errorMessage); - resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - resp.setContentType("text/html;charset=UTF-8"); - PrintWriter out; - try { - out = new PrintWriter(resp.getOutputStream()); - for (String error : errorMessage) - out.write(error + "
"); - out.flush(); - - } catch (IOException e) { - Logger.warn("Internal Monitoring Servlet Error. ", e); - } - } - - private String getHtml(String text) { - return "Reponse" + text +""; - } -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java deleted file mode 100644 index a08ef5f0c..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java +++ /dev/null @@ -1,142 +0,0 @@ -/******************************************************************************* - * 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.monitoring; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.hibernate.Query; -import org.hibernate.Session; - -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead; -import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; -import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils; -import at.gv.egovernment.moa.id.commons.db.StatisticLogDBUtils; -import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration; -import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore; -import at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.MiscUtil; - -public class DatabaseTestModule implements TestModuleInterface{ - - public List performTests() throws Exception { - Logger.trace("Start MOA-ID Database Test."); - - List errors = new ArrayList(); - - AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); - - String error = testMOAConfigurationDatabase(); - if (MiscUtil.isNotEmpty(error)) - errors.add(error); - - error = testMOASessionDatabase(); - if (MiscUtil.isNotEmpty(error)) - errors.add(error); - - if (config.isAdvancedLoggingActive()) { - error = testMOAAdvancedLoggingDatabase(); - if (MiscUtil.isNotEmpty(error)) - errors.add(error); - } - - return errors; - } - - - private String testMOASessionDatabase() throws Exception{ - Logger.trace("Start Test: MOASessionDatabase"); - - Date expioredate = new Date(new Date().getTime() - 120); - - try { - List results; - Session session = MOASessionDBUtils.getCurrentSession(); - - synchronized (session) { - session.beginTransaction(); - Query query = session.getNamedQuery("getAssertionWithTimeOut"); - query.setTimestamp("timeout", expioredate); - results = query.list(); - session.getTransaction().commit(); - } - - Logger.trace("Finish Test: MOASessionDatabase"); - return null; - - } catch (Throwable e) { - Logger.warn("Failed Test: MOASessionDatabase", e); - return "MOASessionDatabase: " + e.getMessage(); - } - } - - private String testMOAConfigurationDatabase() throws Exception{ - - MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration(); - ConfigurationDBUtils.closeSession(); - - if (moaidconfig == null) - return ("MOA-ID 2.x configuration can not be loaded from Database."); - - return null; - } - - private String testMOAAdvancedLoggingDatabase() { - - Date expioredate = new Date(new Date().getTime() - 120); - try { - Session session = StatisticLogDBUtils.getCurrentSession(); - - List results; - - synchronized (session) { - session.beginTransaction(); - Query query = session.getNamedQuery("getAllEntriesNotBeforeTimeStamp"); - query.setTimestamp("timeout", expioredate); - results = query.list(); - session.getTransaction().commit(); - } - - Logger.trace("Finish Test: AdvancedLoggingDataBase"); - return null; - - } catch (Throwable e) { - Logger.warn("Failed Test: AdvancedLoggingDataBase", e); - return "AdvancedLoggingDataBase: " + e.getMessage(); - } - } - - - public String getName() { - return "DatabaseTest"; - } - - - public void initializeTest(long delayParam, String url) throws Exception { - // TODO Auto-generated method stub - - } -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java deleted file mode 100644 index b5220914c..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * 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.monitoring; - -import java.io.InputStream; -import java.net.URL; -import java.util.List; - -import org.w3c.dom.Element; - -import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder; -import at.gv.egovernment.moa.id.auth.data.IdentityLink; -import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse; -import at.gv.egovernment.moa.id.auth.exception.ValidateException; -import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker; -import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; -import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser; -import at.gv.egovernment.moa.id.auth.validator.IdentityLinkValidator; -import at.gv.egovernment.moa.id.auth.validator.VerifyXMLSignatureResponseValidator; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters; -import at.gv.egovernment.moa.id.config.auth.data.DynamicOAAuthParameters; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.MiscUtil; - -public class IdentityLinkTestModule implements TestModuleInterface { - - private static IdentityLink identityLink = null; - - public void initializeTest(long delayParam, String url) throws Exception{ - - if (MiscUtil.isNotEmpty(url)) { - - URL keystoreURL = new URL(url); - InputStream idlstream = keystoreURL.openStream(); - identityLink = new IdentityLinkAssertionParser(idlstream).parseIdentityLink(); - } - - } - - public List performTests() throws Exception{ - Logger.trace("Start MOA-ID IdentityLink Test"); - - AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); - - IdentityLinkValidator.getInstance().validate(identityLink); - // builds a for a call of MOA-SP - Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder() - .build(identityLink, config - .getMoaSpIdentityLinkTrustProfileID()); - - // invokes the call - Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker() - .verifyXMLSignature(domVerifyXMLSignatureRequest); - // parses the - try { - VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser( - domVerifyXMLSignatureResponse).parseData(); - - DynamicOAAuthParameters oaParam = new DynamicOAAuthParameters(); - oaParam.setBusinessService(true); - - VerifyXMLSignatureResponseValidator.getInstance().validate( - verifyXMLSignatureResponse, - config.getIdentityLinkX509SubjectNames(), - VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK, - oaParam); - - } catch (ValidateException e) { - //check if default Monitoring IDL is used then error is ignored - if ("validator.07".equals(e.getMessageId()) - && e.getMessage().contains("Das Zertifikat der Personenbindung ist")) - return null; - - else - throw e; - - } - - Logger.trace("Finished MOA-ID IdentityLink Test without errors"); - - return null; - } - - public String getName() { - return "IdentityLinkTest"; - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java deleted file mode 100644 index 84581abe8..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * 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.monitoring; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import at.gv.egovernment.moa.id.config.ConfigurationException; -import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; -import at.gv.egovernment.moa.logging.Logger; -import at.gv.egovernment.moa.util.FileUtils; - -public class TestManager { - - private static TestManager instance; - - private Map tests = new HashMap(); - - public static TestManager getInstance() throws ConfigurationException { - if (instance == null) - instance = new TestManager(); - - return instance; - } - - private TestManager() throws ConfigurationException { - - AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); - - //add Database test - DatabaseTestModule test1 = new DatabaseTestModule(); - tests.put(test1.getName(), test1); - - //add IdentityLink verification test - IdentityLinkTestModule test2 = new IdentityLinkTestModule(); - String idlurl = FileUtils.makeAbsoluteURL(config.getMonitoringTestIdentityLinkURL(), config.getRootConfigFileDir()); - try { - test2.initializeTest(0, idlurl); - tests.put(test2.getName(), test2);; - - } catch (Exception e) { - Logger.warn("MOA-ID IdentityLink Test can not performed without IdentityLink. Insert IdentityLink file to MOA-ID configuration", e); - } - } - - public List executeTests() { - Logger.debug("Start MOA-ID-Auth testing"); - - - List errors; - - for (TestModuleInterface test : tests.values()) { - try { - errors = test.performTests(); - if (errors != null && errors.size() > 0) - return errors; - - } catch (Exception e) { - Logger.warn("General Testing Eception during Test " + test.getClass() + ": ", e); - return Arrays.asList(e.getMessage()); - } - } - - return null; - } - - public List executeTest(String testname) { - - TestModuleInterface test = tests.get(testname); - - if (test != null) { - try { - return test.performTests(); - - } catch (Exception e) { - Logger.warn("General Testing Eception during Test " + test.getName() + ": ", e); - return Arrays.asList(e.getMessage()); - } - - } else { - Logger.info("TestModule with Name " + testname + " is not implemented"); - return null; - } - } - - public boolean existsModule(String modulename) { - return tests.containsKey(modulename); - } -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java deleted file mode 100644 index 4e26b1ce8..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * 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.monitoring; - -import java.util.List; - -public interface TestModuleInterface { - - public List performTests() throws Exception; - - public void initializeTest(long delayParam, String url) throws Exception; - - public String getName(); -} diff --git a/id/server/modules/module-monitoring/pom.xml b/id/server/modules/module-monitoring/pom.xml new file mode 100644 index 000000000..60ab6b6c0 --- /dev/null +++ b/id/server/modules/module-monitoring/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + + + MOA.id.server.modules + moa-id-modules + ${moa-id-version} + + + MOA.id.server.modules + moa-id-module-monitoring + ${moa-id-version} + jar + + MOA ID-Module Monitoring + + + ${basedir}/../../../../repository + + + diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java new file mode 100644 index 000000000..1c1cbb723 --- /dev/null +++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java @@ -0,0 +1,132 @@ +/******************************************************************************* + * 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.servlet; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Arrays; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.monitoring.TestManager; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; + +@WebServlet(name = "MonitoringServlet", value = "/MonitoringServlet") +public class MonitoringServlet extends AuthServlet { + + private static final long serialVersionUID = 1L; + private static final String REQUEST_ATTR_MODULE = "module"; + + public MonitoringServlet() { + super(); + Logger.debug("Registering servlet " + getClass().getName() + " with mapping '/MonitoringServlet'."); + } + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + + try { + AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); + + if (config.isMonitoringActive()) { + Logger.debug("Monitoring Servlet received request"); + + TestManager tests = TestManager.getInstance(); + + String modulename = req.getParameter(REQUEST_ATTR_MODULE); + if (MiscUtil.isEmpty(modulename)) { + + List error = tests.executeTests(); + if (error != null && error.size() > 0) { + createErrorMessage(req, resp, error); + + } else { + resp.setStatus(HttpServletResponse.SC_OK); + resp.setContentType("text/html;charset=UTF-8"); + resp.getWriter().write(getHtml(config.getMonitoringMessageSuccess())); + Logger.info("Monitoring Servlet finished without errors"); + } + + } else { + if (tests.existsModule(modulename)) { + List errors = tests.executeTest(modulename); + if (errors != null && errors.size() > 0) { + createErrorMessage(req, resp, errors); + + } else { + resp.setStatus(HttpServletResponse.SC_OK); + resp.setContentType("text/html;charset=UTF-8"); + resp.getWriter().write(getHtml(config.getMonitoringMessageSuccess())); + Logger.info("Monitoring Servlet finished without errors"); + } + + } else { + Logger.warn("NO Testmodule exists with modulename " + modulename); + resp.setStatus(HttpServletResponse.SC_NOT_FOUND); + resp.setContentType("text/html;charset=UTF-8"); + PrintWriter out; + try { + out = new PrintWriter(resp.getOutputStream()); + out.write("NO Testmodule exists with modulename " + modulename); + out.flush(); + + } catch (IOException e) { + Logger.warn("Internal Monitoring Servlet Error. ", e); + } + } + + } + } + + } catch (ConfigurationException e) { + createErrorMessage(req, resp, Arrays.asList(e.getMessage())); + } + } + + private void createErrorMessage(HttpServletRequest req, HttpServletResponse resp, List errorMessage) { + Logger.warn("Monitoring Servlet found some Error: " + errorMessage); + resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + resp.setContentType("text/html;charset=UTF-8"); + PrintWriter out; + try { + out = new PrintWriter(resp.getOutputStream()); + for (String error : errorMessage) + out.write(error + "
"); + out.flush(); + + } catch (IOException e) { + Logger.warn("Internal Monitoring Servlet Error. ", e); + } + } + + private String getHtml(String text) { + return "Reponse" + text +""; + } +} diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java new file mode 100644 index 000000000..a08ef5f0c --- /dev/null +++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/DatabaseTestModule.java @@ -0,0 +1,142 @@ +/******************************************************************************* + * 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.monitoring; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.hibernate.Query; +import org.hibernate.Session; + +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead; +import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils; +import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils; +import at.gv.egovernment.moa.id.commons.db.StatisticLogDBUtils; +import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration; +import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore; +import at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; + +public class DatabaseTestModule implements TestModuleInterface{ + + public List performTests() throws Exception { + Logger.trace("Start MOA-ID Database Test."); + + List errors = new ArrayList(); + + AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); + + String error = testMOAConfigurationDatabase(); + if (MiscUtil.isNotEmpty(error)) + errors.add(error); + + error = testMOASessionDatabase(); + if (MiscUtil.isNotEmpty(error)) + errors.add(error); + + if (config.isAdvancedLoggingActive()) { + error = testMOAAdvancedLoggingDatabase(); + if (MiscUtil.isNotEmpty(error)) + errors.add(error); + } + + return errors; + } + + + private String testMOASessionDatabase() throws Exception{ + Logger.trace("Start Test: MOASessionDatabase"); + + Date expioredate = new Date(new Date().getTime() - 120); + + try { + List results; + Session session = MOASessionDBUtils.getCurrentSession(); + + synchronized (session) { + session.beginTransaction(); + Query query = session.getNamedQuery("getAssertionWithTimeOut"); + query.setTimestamp("timeout", expioredate); + results = query.list(); + session.getTransaction().commit(); + } + + Logger.trace("Finish Test: MOASessionDatabase"); + return null; + + } catch (Throwable e) { + Logger.warn("Failed Test: MOASessionDatabase", e); + return "MOASessionDatabase: " + e.getMessage(); + } + } + + private String testMOAConfigurationDatabase() throws Exception{ + + MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration(); + ConfigurationDBUtils.closeSession(); + + if (moaidconfig == null) + return ("MOA-ID 2.x configuration can not be loaded from Database."); + + return null; + } + + private String testMOAAdvancedLoggingDatabase() { + + Date expioredate = new Date(new Date().getTime() - 120); + try { + Session session = StatisticLogDBUtils.getCurrentSession(); + + List results; + + synchronized (session) { + session.beginTransaction(); + Query query = session.getNamedQuery("getAllEntriesNotBeforeTimeStamp"); + query.setTimestamp("timeout", expioredate); + results = query.list(); + session.getTransaction().commit(); + } + + Logger.trace("Finish Test: AdvancedLoggingDataBase"); + return null; + + } catch (Throwable e) { + Logger.warn("Failed Test: AdvancedLoggingDataBase", e); + return "AdvancedLoggingDataBase: " + e.getMessage(); + } + } + + + public String getName() { + return "DatabaseTest"; + } + + + public void initializeTest(long delayParam, String url) throws Exception { + // TODO Auto-generated method stub + + } +} diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java new file mode 100644 index 000000000..b5220914c --- /dev/null +++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/IdentityLinkTestModule.java @@ -0,0 +1,109 @@ +/******************************************************************************* + * 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.monitoring; + +import java.io.InputStream; +import java.net.URL; +import java.util.List; + +import org.w3c.dom.Element; + +import at.gv.egovernment.moa.id.auth.builder.VerifyXMLSignatureRequestBuilder; +import at.gv.egovernment.moa.id.auth.data.IdentityLink; +import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse; +import at.gv.egovernment.moa.id.auth.exception.ValidateException; +import at.gv.egovernment.moa.id.auth.invoke.SignatureVerificationInvoker; +import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser; +import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser; +import at.gv.egovernment.moa.id.auth.validator.IdentityLinkValidator; +import at.gv.egovernment.moa.id.auth.validator.VerifyXMLSignatureResponseValidator; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters; +import at.gv.egovernment.moa.id.config.auth.data.DynamicOAAuthParameters; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.MiscUtil; + +public class IdentityLinkTestModule implements TestModuleInterface { + + private static IdentityLink identityLink = null; + + public void initializeTest(long delayParam, String url) throws Exception{ + + if (MiscUtil.isNotEmpty(url)) { + + URL keystoreURL = new URL(url); + InputStream idlstream = keystoreURL.openStream(); + identityLink = new IdentityLinkAssertionParser(idlstream).parseIdentityLink(); + } + + } + + public List performTests() throws Exception{ + Logger.trace("Start MOA-ID IdentityLink Test"); + + AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); + + IdentityLinkValidator.getInstance().validate(identityLink); + // builds a for a call of MOA-SP + Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder() + .build(identityLink, config + .getMoaSpIdentityLinkTrustProfileID()); + + // invokes the call + Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker() + .verifyXMLSignature(domVerifyXMLSignatureRequest); + // parses the + try { + VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser( + domVerifyXMLSignatureResponse).parseData(); + + DynamicOAAuthParameters oaParam = new DynamicOAAuthParameters(); + oaParam.setBusinessService(true); + + VerifyXMLSignatureResponseValidator.getInstance().validate( + verifyXMLSignatureResponse, + config.getIdentityLinkX509SubjectNames(), + VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK, + oaParam); + + } catch (ValidateException e) { + //check if default Monitoring IDL is used then error is ignored + if ("validator.07".equals(e.getMessageId()) + && e.getMessage().contains("Das Zertifikat der Personenbindung ist")) + return null; + + else + throw e; + + } + + Logger.trace("Finished MOA-ID IdentityLink Test without errors"); + + return null; + } + + public String getName() { + return "IdentityLinkTest"; + } + +} diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java new file mode 100644 index 000000000..84581abe8 --- /dev/null +++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestManager.java @@ -0,0 +1,111 @@ +/******************************************************************************* + * 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.monitoring; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import at.gv.egovernment.moa.id.config.ConfigurationException; +import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider; +import at.gv.egovernment.moa.logging.Logger; +import at.gv.egovernment.moa.util.FileUtils; + +public class TestManager { + + private static TestManager instance; + + private Map tests = new HashMap(); + + public static TestManager getInstance() throws ConfigurationException { + if (instance == null) + instance = new TestManager(); + + return instance; + } + + private TestManager() throws ConfigurationException { + + AuthConfigurationProvider config = AuthConfigurationProvider.getInstance(); + + //add Database test + DatabaseTestModule test1 = new DatabaseTestModule(); + tests.put(test1.getName(), test1); + + //add IdentityLink verification test + IdentityLinkTestModule test2 = new IdentityLinkTestModule(); + String idlurl = FileUtils.makeAbsoluteURL(config.getMonitoringTestIdentityLinkURL(), config.getRootConfigFileDir()); + try { + test2.initializeTest(0, idlurl); + tests.put(test2.getName(), test2);; + + } catch (Exception e) { + Logger.warn("MOA-ID IdentityLink Test can not performed without IdentityLink. Insert IdentityLink file to MOA-ID configuration", e); + } + } + + public List executeTests() { + Logger.debug("Start MOA-ID-Auth testing"); + + + List errors; + + for (TestModuleInterface test : tests.values()) { + try { + errors = test.performTests(); + if (errors != null && errors.size() > 0) + return errors; + + } catch (Exception e) { + Logger.warn("General Testing Eception during Test " + test.getClass() + ": ", e); + return Arrays.asList(e.getMessage()); + } + } + + return null; + } + + public List executeTest(String testname) { + + TestModuleInterface test = tests.get(testname); + + if (test != null) { + try { + return test.performTests(); + + } catch (Exception e) { + Logger.warn("General Testing Eception during Test " + test.getName() + ": ", e); + return Arrays.asList(e.getMessage()); + } + + } else { + Logger.info("TestModule with Name " + testname + " is not implemented"); + return null; + } + } + + public boolean existsModule(String modulename) { + return tests.containsKey(modulename); + } +} diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java new file mode 100644 index 000000000..4e26b1ce8 --- /dev/null +++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/monitoring/TestModuleInterface.java @@ -0,0 +1,34 @@ +/******************************************************************************* + * 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.monitoring; + +import java.util.List; + +public interface TestModuleInterface { + + public List performTests() throws Exception; + + public void initializeTest(long delayParam, String url) throws Exception; + + public String getName(); +} diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml index 64b1b57b4..e9234a62f 100644 --- a/id/server/modules/pom.xml +++ b/id/server/modules/pom.xml @@ -21,6 +21,7 @@ module-stork + module-monitoring diff --git a/pom.xml b/pom.xml index 95a3f1155..8bcbe8154 100644 --- a/pom.xml +++ b/pom.xml @@ -329,6 +329,11 @@ moa-id-module-stork ${moa-id-version}
+ + MOA.id.server.modules + moa-id-module-monitoring + ${moa-id-version} + MOA.spss.server moa-spss-lib -- cgit v1.2.3 From 63fb8960f4a72f9185d2dc4735d8bae602463e1c Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 5 Feb 2015 16:53:03 +0100 Subject: Fix wrong module sorting order. --- .../moa/id/auth/modules/registration/ModuleRegistration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java index c2a34ff21..fa1878e74 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/registration/ModuleRegistration.java @@ -122,7 +122,7 @@ public class ModuleRegistration { public int compare(AuthModule thisAuthModule, AuthModule otherAuthModule) { int thisOrder = thisAuthModule.getPriority(); int otherOrder = otherAuthModule.getPriority(); - return (thisOrder < otherOrder ? -1 : (thisOrder == otherOrder ? 0 : 1)); + return (thisOrder < otherOrder ? 1 : (thisOrder == otherOrder ? 0 : -1)); } }); } -- cgit v1.2.3 From b864faef2864cc28df98d778e2221bf2cf911954 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 5 Feb 2015 16:56:04 +0100 Subject: Perform some cleanup tasks - Rename AbstractSpringWebSupportedTask to MoaIdTask. - Remove some unnecessary code. --- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../id/auth/modules/AbstractAuthServletTask.java | 4 +- .../egovernment/moa/id/process/ProcessEngine.java | 1 - .../moa/id/process/ProcessEngineImpl.java | 12 +--- .../id/process/dao/ProcessInstanceStoreDAO.java | 2 - .../springweb/AbstractSpringWebSupportedTask.java | 73 ---------------------- .../moa/id/process/springweb/MoaIdTask.java | 73 ++++++++++++++++++++++ 7 files changed, 78 insertions(+), 89 deletions(-) delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/MoaIdTask.java diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index fabe6cd9c..a3f834457 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -9,7 +9,7 @@ - + diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java index 3b20e85d7..67ddd170a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java @@ -32,7 +32,7 @@ import at.gv.egovernment.moa.id.auth.exception.WrongParametersException; import at.gv.egovernment.moa.id.auth.servlet.AuthServlet; import at.gv.egovernment.moa.id.config.ConfigurationException; import at.gv.egovernment.moa.id.entrypoints.DispatcherServlet; -import at.gv.egovernment.moa.id.process.springweb.AbstractSpringWebSupportedTask; +import at.gv.egovernment.moa.id.process.springweb.MoaIdTask; import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl; import at.gv.egovernment.moa.id.storage.IExceptionStore; import at.gv.egovernment.moa.id.util.ServletUtils; @@ -43,7 +43,7 @@ import at.gv.egovernment.moa.util.MiscUtil; * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing * etc.).

The code has been taken from {@link AuthServlet}. */ -public abstract class AbstractAuthServletTask extends AbstractSpringWebSupportedTask { +public abstract class AbstractAuthServletTask extends MoaIdTask { protected static final String ERROR_CODE_PARAM = "errorid"; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java index ff6ec969e..032cb6369 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngine.java @@ -2,7 +2,6 @@ package at.gv.egovernment.moa.id.process; import java.io.InputStream; -import java.io.Serializable; import at.gv.egovernment.moa.id.process.api.ExecutionContext; import at.gv.egovernment.moa.id.process.model.ProcessDefinition; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java index 650bae44e..0ffa22ec3 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java @@ -115,13 +115,10 @@ public class ProcessEngineImpl implements ProcessEngine { @Override public void start(String processInstanceId) throws ProcessExecutionException { - boolean mdcEntryAdded = false; - try { ProcessInstance pi = loadProcessInstance(processInstanceId); MDC.put(MDC_CTX_PI_NAME, pi.getId()); - mdcEntryAdded = true; if (!ProcessInstanceState.NOT_STARTED.equals(pi.getState())) { throw new ProcessExecutionException("Process instance '" + pi.getId() + "' has already been started (current state is " + pi.getState() + ")."); @@ -136,21 +133,17 @@ public class ProcessEngineImpl implements ProcessEngine { throw new ProcessExecutionException("Unable to load/save process instance.", e); } finally { - if (mdcEntryAdded) - MDC.remove(MDC_CTX_PI_NAME); + MDC.remove(MDC_CTX_PI_NAME); } } @Override public void signal(String processInstanceId) throws ProcessExecutionException { - boolean mdcEntryAdded = false; - try { ProcessInstance pi = loadProcessInstance(processInstanceId); MDC.put(MDC_CTX_PI_NAME, pi.getId()); - mdcEntryAdded = true; if (!ProcessInstanceState.SUSPENDED.equals(pi.getState())) { throw new ProcessExecutionException("Process instance '" + pi.getId() + "' has not been suspended (current state is " + pi.getState() + ")."); @@ -165,8 +158,7 @@ public class ProcessEngineImpl implements ProcessEngine { throw new ProcessExecutionException("Unable to load/save process instance.", e); } finally { - if (mdcEntryAdded) - MDC.remove(MDC_CTX_PI_NAME); + MDC.remove(MDC_CTX_PI_NAME); } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java index 6f8a8c66c..92ffe11db 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAO.java @@ -1,7 +1,5 @@ package at.gv.egovernment.moa.id.process.dao; -import java.util.List; - import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException; import at.gv.egovernment.moa.id.process.ProcessInstance; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java deleted file mode 100644 index c9262cea9..000000000 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/AbstractSpringWebSupportedTask.java +++ /dev/null @@ -1,73 +0,0 @@ -package at.gv.egovernment.moa.id.process.springweb; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.filter.RequestContextFilter; - -import at.gv.egovernment.moa.id.process.api.ExecutionContext; -import at.gv.egovernment.moa.id.process.api.Task; - -/** - * Abstract task implementation providing {@link HttpServletRequest} and {@link HttpServletResponse}. - *

- * Note that this abstract task requires the Spring (web) framework including a {@link RequestContextFilter} to be set - * within {@code web.xml}. - * - *

- * ...
- * <filter>
- *   <filter-name>requestContextFilter</filter-name>
- *   <filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
- * </filter>
- * <filter-mapping>
- *   <filter-name>requestContextFilter</filter-name>
- *   <url-pattern>/*</url-pattern>
- * </filter-mapping>
- * ...
- * 
- * - * @author tknall - * - */ -public abstract class AbstractSpringWebSupportedTask implements Task { - - /** - * Executes the task providing the underlying {@link ExecutionContext} {@code executionContext} as well as the - * respective {@link HttpServletRequest} and {@link HttpServletResponse}. - * - * @param executionContext - * The execution context (never {@code null}). - * @param request - * The HttpServletRequest (never {@code null}). - * @param response - * The HttpServletResponse (never {@code null}). - * @throws IllegalStateException - * Thrown in case the task is nur being run within the required environment. Refer to javadoc for - * further information. - * @throws Exception - * Thrown in case of error executing the task. - */ - public abstract void execute(ExecutionContext executionContext, HttpServletRequest request, - HttpServletResponse response) throws Exception; - - @Override - public void execute(ExecutionContext executionContext) throws Exception { - RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); - if (requestAttributes != null && requestAttributes instanceof ServletRequestAttributes) { - HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); - HttpServletResponse response = ((ServletRequestAttributes) requestAttributes).getResponse(); - if (request == null || response == null) { - throw new IllegalStateException( - "Spring's RequestContextHolder did not provide HttpServletResponse. Did you forget to set the required org.springframework.web.filter.RequestContextFilter in your web.xml."); - } - execute(executionContext, request, response); - } else { - throw new IllegalStateException("Task needs to be executed within a Spring web environment."); - } - } - -} diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/MoaIdTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/MoaIdTask.java new file mode 100644 index 000000000..bae6391ec --- /dev/null +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/springweb/MoaIdTask.java @@ -0,0 +1,73 @@ +package at.gv.egovernment.moa.id.process.springweb; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.filter.RequestContextFilter; + +import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.api.Task; + +/** + * Abstract task implementation providing {@link HttpServletRequest} and {@link HttpServletResponse}. + *

+ * Note that this abstract task requires the Spring (web) framework including a {@link RequestContextFilter} to be set + * within {@code web.xml}. + * + *

+ * ...
+ * <filter>
+ *   <filter-name>requestContextFilter</filter-name>
+ *   <filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
+ * </filter>
+ * <filter-mapping>
+ *   <filter-name>requestContextFilter</filter-name>
+ *   <url-pattern>/*</url-pattern>
+ * </filter-mapping>
+ * ...
+ * 
+ * + * @author tknall + * + */ +public abstract class MoaIdTask implements Task { + + /** + * Executes the task providing the underlying {@link ExecutionContext} {@code executionContext} as well as the + * respective {@link HttpServletRequest} and {@link HttpServletResponse}. + * + * @param executionContext + * The execution context (never {@code null}). + * @param request + * The HttpServletRequest (never {@code null}). + * @param response + * The HttpServletResponse (never {@code null}). + * @throws IllegalStateException + * Thrown in case the task is nur being run within the required environment. Refer to javadoc for + * further information. + * @throws Exception + * Thrown in case of error executing the task. + */ + public abstract void execute(ExecutionContext executionContext, HttpServletRequest request, + HttpServletResponse response) throws Exception; + + @Override + public void execute(ExecutionContext executionContext) throws Exception { + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + if (requestAttributes != null && requestAttributes instanceof ServletRequestAttributes) { + HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); + HttpServletResponse response = ((ServletRequestAttributes) requestAttributes).getResponse(); + if (request == null || response == null) { + throw new IllegalStateException( + "Spring's RequestContextHolder did not provide HttpServletResponse. Did you forget to set the required org.springframework.web.filter.RequestContextFilter in your web.xml."); + } + execute(executionContext, request, response); + } else { + throw new IllegalStateException("Task needs to be executed within a Spring web environment."); + } + } + +} -- cgit v1.2.3 From e8f5883a7982b8f5682c917f214d607a3cadb489 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 5 Feb 2015 16:56:31 +0100 Subject: Add documentation for modules (MOAID-47) --- id/server/doc/handbook/index.html | 2 + .../handbook/moduledevinfo/ProcessDefinition.xsd | 53 ++++ .../doc/handbook/moduledevinfo/moduledevinfo.html | 350 +++++++++++++++++++++ 3 files changed, 405 insertions(+) create mode 100644 id/server/doc/handbook/moduledevinfo/ProcessDefinition.xsd create mode 100644 id/server/doc/handbook/moduledevinfo/moduledevinfo.html diff --git a/id/server/doc/handbook/index.html b/id/server/doc/handbook/index.html index c3b25b390..7e89b7c8f 100644 --- a/id/server/doc/handbook/index.html +++ b/id/server/doc/handbook/index.html @@ -32,6 +32,8 @@
Erläutert die Integration in bestehende Online-Applikationen und beschreibt die beigelegten Demo Applikationen
Zusatzinformationen
Spezifiziert allgemeine Funktionen des Modules MOA-ID-Auth
+
Informationen für Modul-Entwickler
+
Enthält Informationen für Entwickler von MOA-ID Modulen.
 
diff --git a/id/server/doc/handbook/moduledevinfo/ProcessDefinition.xsd b/id/server/doc/handbook/moduledevinfo/ProcessDefinition.xsd new file mode 100644 index 000000000..d6ab7ae46 --- /dev/null +++ b/id/server/doc/handbook/moduledevinfo/ProcessDefinition.xsd @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/id/server/doc/handbook/moduledevinfo/moduledevinfo.html b/id/server/doc/handbook/moduledevinfo/moduledevinfo.html new file mode 100644 index 000000000..c9cae99f3 --- /dev/null +++ b/id/server/doc/handbook/moduledevinfo/moduledevinfo.html @@ -0,0 +1,350 @@ + + + + + + MOA-ID - Informationen für Modul-Entwickler + + + + + + + + + + + + +
+ Logo BKA + Dokumentation + Logo EGIZ +
+
+ +

+ MOA-ID (Identifikation) +

+

Informationen für Modul-Entwickler

+
+ + +

Inhalt

+
    +
  1. +

    + Übersicht +

    +
  2. +
  3. +

    + Prozesse +

    +
      +
    1. Aufgaben (Tasks)
    2. +
    3. Transitions
    4. +
    +
  4. +
  5. +

    + Module +

    +
      +
    1. Metadaten und Prozessauswahl
    2. +
    3. +

      + Discovery +

      +
        +
      1. Service Loader Mechanismus
      2. +
      3. Spring Bean Discovery
      4. +
      +
    4. +
    +
  6. +
+
+ + +

+ 1 Übersicht +

+

+ MOA-ID ab Version 2.3 ermöglicht die dynamische Erweiterung um zusätzliche Funktionalität durch die Nutzung der + integrierten Modularchitektur.
+ Entwickler können nun eigene Prozesse, um die MOA-ID erweitert werden soll, definieren (z.B. Unterstützung + eines speziellen Authentifizierungsworkflows, Erweiterung um Vollmachten oder ausländische Identitäten etc). + MOA-ID bietet eine Ablaufsteuerung ("ProcessEngine"), die einzelne Aufgaben (Tasks) entsprechend einer vorgegebenen Prozessdefinition + abarbeiten kann. +

+

+ Mehrere Prozesse können zu einzelnen Modulen zusammengefasst werden. Ein Modul, typischerweise repräsentiert durch eine separate JAR-Datei, wird automatisch erkannt, sobald sich + dieses im Classpath der Anwendung befindet. Damit stehen die in diesem Modul definierten Prozesse MOA-ID + automatisch zu Verfügung. +

+

+ Beim Starten eines Authentifizierungsvorgangs speichert MOA-ID die zu diesem Zeitpunkt zu Verfügung stehenden + Informationen (Ergebnis der BKU-Auswahl, Auswahl des Herkunftslandes, Wunsch nach Vollmachten-Nutzung etc.) in + eine Datenstruktur ("ExecutionContext"). Module entscheiden dann auf Basis dieser Informationen, ob sie entsprechende Prozesse für den gegebenen Kontext anbieten können. Sobald ein + passender Prozess gefunden wurde, beginnt die MOA-ID ProcessEngine mit der Ausführung der darin definierten + Aufgaben. +

+

+ Bei diesen Aufgaben handelt es sich typischerweise um einzelne synchrone oder asynchrone Schritte eines kompletten + Authentifizierungsvorgangs wie z.B. das Erstellen eines HTML-Formulars zum Auslesen der Personenbindung (synchron), + das Empfangen und Verarbeiten einer Personenbindung (asynchron), das Aushandeln einer Session mit dem Vollmachtenportal (synchron) etc. + Jeder Task erhält bei Ausführung automatisch Zugriff auf den ExecutionContext, der von Task zu Task weitergereicht, zum Austausch bzw. Akkumulieren von Daten dient und schließlich auch persistiert wird. + Darüber hinaus steht jeweils HttpServletRequest und HttpServletResponse zu Verfügung. +

+ +

+ 2 Prozesse +

+

+ Ein Prozess definiert sich primär über seine Tasks, die es in einer bestimmten Abfolge abzuarbeiten gilt. Um welche Tasks es sich handelt und wie die Abfolge unter welchen Bedingungen aussieht wird in einer + ProzessDefinition in Form eines XML-Dokuments festgelegt. +

+

Siehe ProcessDefinition.xsd.
 

+ +

+ Die folgende Prozessdefinition zeigt als Beispiel den internen Standard-Authentifizierungsprozess von MOA-ID. Dieser unterstützt Vollmachten uns ausländische Identitäten:
  +

+
<?xml version="1.0" encoding="UTF-8"?> +<pd:ProcessDefinition id="DefaultAuthentication" xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"> + + <pd:Task id="createIdentityLinkForm" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CreateIdentityLinkFormTask" /> + <pd:Task id="verifyIdentityLink" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyIdentityLinkTask" async="true" /> + <pd:Task id="verifyAuthBlock" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyAuthenticationBlockTask" async="true" /> + <pd:Task id="verifyCertificate" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.VerifyCertificateTask" async="true" /> + <pd:Task id="getMISSessionID" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GetMISSessionIDTask" async="true" /> + <pd:Task id="certificateReadRequest" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.CertificateReadRequestTask" /> + <pd:Task id="prepareAuthBlockSignature" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.PrepareAuthBlockSignatureTask" /> + <pd:Task id="getForeignID" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GetForeignIDTask" async="true" /> + + <pd:StartEvent id="start" /> + + <pd:Transition from="start" to="createIdentityLinkForm" /> + + <pd:Transition from="createIdentityLinkForm" to="verifyIdentityLink" /> + + <pd:Transition from="verifyIdentityLink" to="certificateReadRequest" conditionExpression="!ctx['identityLinkAvailable'] || ctx['useMandate']" /> + <pd:Transition from="verifyIdentityLink" to="prepareAuthBlockSignature" /> + + <pd:Transition from="prepareAuthBlockSignature" to="verifyAuthBlock" /> + + <pd:Transition from="certificateReadRequest" to="verifyCertificate" /> + + <pd:Transition from="verifyCertificate" to="verifyAuthBlock" conditionExpression="ctx['useMandate']" /> + <pd:Transition from="verifyCertificate" to="getForeignID" /> + + <pd:Transition from="verifyAuthBlock" to="getMISSessionID" conditionExpression="ctx['useMandate']" /> + <pd:Transition from="verifyAuthBlock" to="end" /> + + <pd:Transition from="getMISSessionID" to="end" /> + <pd:Transition from="getForeignID" to="end" /> + + <pd:EndEvent id="end" /> + +</pd:ProcessDefinition> +
+

 

+ +

+ Jede Prozessbeschreibung muss zwingend ein StartEvent und ein EndEvent enthalten. + Einzelne Aufgaben sind durch Task-Elemente gekennzeichnet, wobei via Attribut async + festgelegt wird ob es sich dabei um einen synchronen (Standardeinstellung) oder um einen asynchronen Task handelt (siehe auch Abschnitt 2.1). +

+ +

+ 2.1 Aufgaben (Tasks) +

+

+ Aus technischer Sicht sind Aufgaben einfache Klassen, die die abstrakte Klasse at.gv.egovernment.moa.id.process.springweb.MoaIdTask (moa-id-lib-xy.jar) + implementieren. Diese definiert lediglich eine execute-Methode, die aufgerufen wird, sobald der Task + von der ProcessEngine gestartet wird. Über diese Methode erhält der Task Zugriff auf den ExecutionContext sowie + auf HttpServletRequest und HttpServletResponse. Der HttpServletRequest und der ExecutionContext können nun ausgewertet, bzw. falls notwendig der ExecutionContext und die HttpServletResponse auch manipuliert werden. +

+

+ Als Beispiele typischer Tasks können die Klassen im package at.gv.egovernment.moa.id.auth.modules.internal.tasks herangezogen werden.
+

+ +

+ 2.2 Transitions +

+

+ Die Abfolge der einzelnen Task wird in der Prozessbeschreibung durch die Transition-Elemente + bestimmt. Diese weisen die zwei verpflichtenden Attribute from und to auf, die jeweils einen Task (oder StartEvent) referenzieren von (from) dem die ProzessEngine zu (to) weiteren Task (oder EndEvent) traversiert. Betrachtet man einen + Prozess als Graphen, dann sind die Tasks als Knoten und die Transitions als Kanten anzusehen. +

+

+ Jede Prozessausführung beginnt mit dem StartEvent. Von diesem ausgehend werden alle möglichen + Transitions zu anderen Tasks untersucht. Die erste Transition, die eine gültige Verbindung zu einem anderen Task + aufweist wird für die weitere Prozessausführung herangezogen. Transitions können über das Attribut + conditionExpression mit einer Art Policy ausgestattet werden, die festlegt, ob eine Transition verwendet + werden kann oder nicht. Dies ermöglicht eine bedingte Ausführung von Tasks. +

+

+ Expressions müssen sich in eine booleschen Wert auflösen lassen: true (genauso + wie ein nicht gesetztes conditionExpression-Attribut) bedeutet, dass die Transition verwendet werden kann, + false bedeutet, dass die Transition nicht verwendet wird. + Bei den Expressions handelt es sich um Spring EL Expressions, + die einen leichten Zugriff auf den ExecutionContext, HttpServletRequestParameter sowie beliebige Spring-Beans ermöglichen: +

+ + + + + + + + + + + + + + + + + + + + + +
BezeichnerBeispielBedeutung
ctx!ctx['identityLinkAvailable']Erlaubt das Auswerten einzelner Variablen aus dem ExecutionContext, in diesem Fall einer booleschen Variable identityLinkAvailable
requestParameterrequestParameter['myParam'] != nullGreift auf RequestParameter aus dem HttpServletRequest zurück und ermöglicht so eine Requestparameter abhängige Abfolge von Tasks.
@@mySpringBean.isFoo()Greift auf ein Bean (in diesem Fall mit dem Namen mySpringBean) aus dem Spring ApplicationContext zurück.
+ +

+ 3 Module +

+

+ Bei einem Modul handelt es sich grundsätzlich lediglich um eine logische Gruppierung von Prozessen. + Module sind bedingt durch ihr automatisches Discovery als eine Art Plug-in zu betrachten, weshalb sie typischerweise + auch in eigene JAR-Dateien ausgelagert vorliegen. +

+

Als Beispiel eines solchen Moduls kann das STORK-Modul (moa-id-module-stork-xy.jar) gesehen werden. + +

+ 3.1 Metadaten und Prozessauswahl +

+

+ Jedes Modul muss das Interface at.gv.egovernment.moa.id.auth.modules.AuthModule implementieren, über + das der ProcessEngine zum einen Metadaten zu Verfügung gestellt werden, diese zum anderen aber auch die Prozessauswahl + (siehe Abschnitt 1) abgewickelt wird. +

+

+

+
int getPriority()
+
Über diese Methode gibt das Modul seine Priorität bekannt. Dies beeinflusst die Reihenfolge des Moduls + bei der Abfrage nach passenden Prozessen beim Starten eines Authentifizierungsprozesses.
+ Standardpriorität ist 0. Module die vorgereiht werden sollen, müssen eine höhere Priorität aufweisen.
+
+
+
String[] getProcessDefinitions()
+
Hierüber gibt das Modul die Prozessdefinitionen (bzw. ResourceUris zu den entsprechenden XML-Dateien) bekannt. + Diese werden automatisch von MOA-ID geparst und registriert. +
+
+
+
String selectProcess(ExecutionContext context)
+
Diese Methode wird von MOA-ID beim Starten eines Authentifizierungsprozesses aufgerufen. Der ExecutionContext + wird mit den in oben in Abschnitt 1 erwähnten Informationen befüllt und dieser + dann der selectProcess-Methode übergeben. Diese entscheidet, ob ein passender Prozess zu Verfügung + steht oder nicht. Eine eventuelle modulinterne Priorisierung muss das Modul selbst vornehmen.
+
+

+

+ Als Beispiel kann die Implementierung des STORK-Moduls herangezogen werden: at.gv.egovernment.moa.id.auth.modules.stork.STORKAuthModuleImpl
+ Nähere Informationen sind der Javadoc Dokumentation des AuthModule Interfaces zu entnehmen. +

+ +

+ 3.2 Discovery +

+

+ Das bereits erwähnte automatische Discovery von Modulen beschränkt sich nun auf das automatische Auffinden der + jeweiligen AuthModule-Implementierung. MOA-ID sieht zwei Varianten vor, derartige Implementierung + aufzufinden. Welche der beiden zur Anwendung kommt (es können notfalls auch beide kombiniert werden), bleibt dem Modulentwickler überlassen. +

+ +

+ 3.2.1 Service Loader Mechanismus +

+

+ Diese Variante sieht vor, dass jedes Modul (d.h. jede JAR-Datei) eine Datei META-INF/services/at.gv.egovernment.moa.id.auth.modules.AuthModule + enhält, das die vorhandenen AuthModule-Implementierungen auflistet: +

+
at.gv.egovernment.moa.id.auth.modules.internal.DefaultAuthModuleImpl
+at.gv.egovernment.moa.id.auth.modules.mymodule.MyAuthModuleImpl
+

+ Nähere Informationen zu diesem Mechanismus können hier entnommen werden: + Javadoc ServiceLoader bzw. Java Tutorials: Creating Extensible Applications +

+ +

+ 3.2.2 Spring Bean Discovery +

+

+ Für den Fall, dass Module auf Basis des Spring Frameworks entwickelt werden, kann die AuthModule-Implementierung auch als Spring Bean erfolgen. +

+

+ MOA-ID sucht beim Starten im Classpath nach Bean-Definitionen, die der Dateinamenskonvention *.authmodule.beans.xml + entsprechen und importiert diese. Über diesen Mechanismus können modulspezifische Spring Beans geladen bzw. initialisiert werden, u.a. auch AuthModule-Beans.
  +

+

Beispiel: STORK.authmodule.beans.xml
 

+ +
<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + <context:annotation-config /> + + <bean id="storkAuthModule" class="at.gv.egovernment.moa.id.auth.modules.stork.STORKAuthModuleImpl"> + <property name="priority" value="0" /> + </bean> + +</beans> +
+

 

+ +

 

+

 

+ + -- cgit v1.2.3 From f263394a3f470c3c4b02045394a29d8e48b6ff95 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 5 Feb 2015 17:41:35 +0100 Subject: Add notes to module documentation. --- .../doc/handbook/moduledevinfo/moduledevinfo.html | 31 +++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/id/server/doc/handbook/moduledevinfo/moduledevinfo.html b/id/server/doc/handbook/moduledevinfo/moduledevinfo.html index c9cae99f3..949612509 100644 --- a/id/server/doc/handbook/moduledevinfo/moduledevinfo.html +++ b/id/server/doc/handbook/moduledevinfo/moduledevinfo.html @@ -97,6 +97,11 @@ +
  • +

    + Hinweise +

    +

  • @@ -194,11 +199,24 @@ 2.1 Aufgaben (Tasks)

    - Aus technischer Sicht sind Aufgaben einfache Klassen, die die abstrakte Klasse at.gv.egovernment.moa.id.process.springweb.MoaIdTask (moa-id-lib-xy.jar) + Aus technischer Sicht sind Aufgaben einfache Klassen, die die abstrakte Klasse at.gv.egovernment.moa.id.process.springweb.MoaIdTask (moa-id-lib-xy.jar) implementieren. Diese definiert lediglich eine execute-Methode, die aufgerufen wird, sobald der Task von der ProcessEngine gestartet wird. Über diese Methode erhält der Task Zugriff auf den ExecutionContext sowie auf HttpServletRequest und HttpServletResponse. Der HttpServletRequest und der ExecutionContext können nun ausgewertet, bzw. falls notwendig der ExecutionContext und die HttpServletResponse auch manipuliert werden.

    +

    + Synchrone Tasks werden hintereinander ausgeführt. Trifft die Process Engine auf einen asynchronen Task wird dieser + nicht gleich ausgeführt, sondern der Prozess wird zunächst angehalten. Bei asynchronen Tasks handelt es sich meist um Tasks, + die zuvor eine Benutzerinteraktion erfordern (z.B. Signatur mit Bürgerkartenumgebung).
    + Als Beispiel eines asynchronen Tasks wäre ein VerifyIdentityLinkTask zu nennen, der nach Eintreffen + der Antwort der Bürgerkartenumgebung auf der DataURL aufgeweckt wird, um eine InfoBoxReadResponse mit + der Personenbindung entgegen zu nehmen, diese zu parsen und zu validieren. +

    +

    + Die Aufgabe eines (DataURL-)Servlets, das den jeweiligen Prozess aufweckt, um die Ausführung eines nachfolgenden asynchronen + Tasks zu bewirken, übernimmt das interne Servlet at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet, + das auf die URL /signalProcess gemappt wurde. +

    Als Beispiele typischer Tasks können die Klassen im package at.gv.egovernment.moa.id.auth.modules.internal.tasks herangezogen werden.

    @@ -344,6 +362,17 @@ at.gv.egovernment.moa.id.auth.modules.mymodule.MyAuthModuleImpl

     

    +

    + 4 Hinweise +

    +

    + Um einzelne Funktionen als Plug-In umzusetzen, muss nicht unbedingt ein ganzer Prozess definiert werden. MOA-ID ab + Version 2.3 unterstützt die Servlet 3.0 API, was u.a. den Einsatz von @WebServlet-Annotations ermöglicht. + Damit entfällt eine statische Registrierung von Servlets im web.xml. +

    +

    Am Beispiel des MonitoringServlets (at.gv.egovernment.moa.id.auth.servlet.MonitoringServlet), das als + separates JAR (moa-id-module-monitoring-xy.jar) ausgeführt wurde, kann dies anschaulich beobachtet werden. +

     

     

    -- cgit v1.2.3 From 859f8eb5138ee33380ccc31cdfb03e292a2bb8fc Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Thu, 5 Feb 2015 17:45:29 +0100 Subject: Replace umlauts in html module documentation --- .../doc/handbook/moduledevinfo/moduledevinfo.html | 104 ++++++++++----------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/id/server/doc/handbook/moduledevinfo/moduledevinfo.html b/id/server/doc/handbook/moduledevinfo/moduledevinfo.html index 949612509..6897e36d0 100644 --- a/id/server/doc/handbook/moduledevinfo/moduledevinfo.html +++ b/id/server/doc/handbook/moduledevinfo/moduledevinfo.html @@ -3,7 +3,7 @@ - MOA-ID - Informationen für Modul-Entwickler + MOA-ID - Informationen für Modul-Entwickler

    Anmeldedaten:

    Daten zur Person

    Name:
    Geburtsdatum:..
    Rolle:
    Vollmacht:Ich melde mich in Vertretung an. Im nächsten Schritt wird mir eine Liste der für mich verfügbaren Vertretungsverhältnisse angezeigt, aus denen ich eines auswählen werde.

    Daten zur Anwendung

    Name:
    Staat:Österreich (Test)Österreich (Test)BelgienSchweizTschechienEstlandSpanienFrankreichGriechenlandIslandItalienLitauenLuxemburgNiederlandePortugalSchwedenSlowenienSlowakeiTürkeiVereinigtes KönigreichAuslandÖsterreich

    Technische Parameter

    URL:
    Bereich:
    + Vollmachten-Referenz:
    :
    Identifikator:
    OID:
    HPI:
    SessionTokken:
    Datum:..
    Uhrzeit:::
    application/xhtml+xml diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTable_DE_2.1.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTable_DE_2.1.xml new file mode 100644 index 000000000..6afe1f36b --- /dev/null +++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTable_DE_2.1.xml @@ -0,0 +1,7 @@ +Signatur der Anmeldedaten

    Anmeldedaten:

    Daten zur Person

    Name:
    Geburtsdatum:..
    Rolle:
    Vollmacht:Ich melde mich in Vertretung an. Im nächsten Schritt wird mir eine Liste der für mich verfügbaren Vertretungsverhältnisse angezeigt, aus denen ich eines auswählen werde.

    Daten zur Anwendung

    Name:
    Staat:Österreich (Test)Österreich (Test)BelgienSchweizTschechienEstlandSpanienFrankreichGriechenlandIslandItalienLitauenLuxemburgNiederlandePortugalSchwedenSlowenienSlowakeiTürkeiVereinigtes KönigreichAuslandÖsterreich

    Technische Parameter

    URL:
    Bereich:
    + Vollmachten-Referenz:
    :
    Identifikator:
    OID:
    HPI:
    SessionTokken:
    Datum:..
    Uhrzeit:::
    application/xhtml+xml
    diff --git a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml index 8d26a1893..19fd9d264 100644 --- a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml +++ b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml @@ -83,6 +83,10 @@ MOAIDTransformAuthBlockTable_DE_2.0 profiles/MOAIDTransformAuthBlockTable_DE_2.0.xml + + MOAIDTransformAuthBlockTable_DE_2.1 + profiles/MOAIDTransformAuthBlockTable_DE_2.1.xml + MOAIDTransformAuthBlockTable_DE profiles/MOAIDTransformAuthBlockTable_DE.xml diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_2.1.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_2.1.xml new file mode 100644 index 000000000..df3ce8ce6 --- /dev/null +++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_2.1.xml @@ -0,0 +1,7 @@ +Signatur der Anmeldedaten

    Anmeldedaten:

    Daten zur Person

    Name:
    Geburtsdatum:..
    Rolle:
    Vollmacht:Ich melde mich in Vertretung an. Im nächsten Schritt wird mir eine Liste der für mich verfügbaren Vertretungsverhältnisse angezeigt, aus denen ich eines auswählen werde.

    Daten zur Anwendung

    Name:
    Staat:Österreich (Test)Österreich (Test)BelgienSchweizTschechienEstlandSpanienFrankreichGriechenlandIslandItalienLitauenLuxemburgNiederlandePortugalSchwedenSlowenienSlowakeiTürkeiVereinigtes KönigreichAuslandÖsterreich

    Technische Parameter

    URL:
    Bereich:
    + Vollmachten-Referenz:
    :
    Identifikator:
    OID:
    HPI:
    SessionTokken:
    Datum:..
    Uhrzeit:::
    -- cgit v1.2.3 From b92da70a3071e1dbf910ee38ff4efbe61ecc8be6 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 30 Jun 2015 13:55:17 +0200 Subject: handle multiple assertions with equal attributes --- .../modules/stork/tasks/PepsConnectorTask.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java index 6eabc0538..b89571fde 100644 --- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/PepsConnectorTask.java @@ -298,14 +298,20 @@ public class PepsConnectorTask extends AbstractAuthServletTask { Logger.debug("Found a preceeding STORK AuthnRequest to this MOA session: " + moaSessionID); - - // first, try to fetch the attributes from the list of total attributes. Note that this very list is only filled - // with ALL attributes when there is more than one assertion in the SAML2 STORK message. - IPersonalAttributeList attributeList = authnResponse.getTotalPersonalAttributeList(); - - // if the list is empty, there was just one assertion... probably - if(attributeList.isEmpty()) - attributeList = authnResponse.getPersonalAttributeList(); + // fetch attribute list from response + IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList(); + if(authnResponse.getAssertions().size() > 1) { + for(IPersonalAttributeList currentList : authnResponse.getPersonalAttributeLists()) { + for(PersonalAttribute currentAttribute : currentList.values()) { + if(!attributeList.containsKey(currentAttribute.getName())) + attributeList.add((PersonalAttribute) currentAttribute.clone()); + else { + if(!attributeList.get(currentAttribute.getName()).getValue().equals(currentAttribute.getValue())) + throw new TaskExecutionException("data integrity failure", new Exception("data integrity failure: found non-matching values in multiple attributes of type " + currentAttribute.getName())); + } + } + } + } // //////////// incorporate gender from parameters if not in stork response -- cgit v1.2.3 From f71531346c6be197957311712ba093e024545e37 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Fri, 7 Aug 2015 13:24:09 +0200 Subject: preparing the old code for the merge --- .../peps/auth/commons/AttributeConstants.java | 100 +- .../eu/stork/peps/auth/commons/AttributeName.java | 128 +- .../stork/peps/auth/commons/AttributeProvider.java | 224 +- .../peps/auth/commons/AttributeProvidersMap.java | 10 +- .../stork/peps/auth/commons/AttributeSource.java | 353 +- .../eu/stork/peps/auth/commons/AttributeUtil.java | 391 +- .../eu/stork/peps/auth/commons/CitizenConsent.java | 196 +- .../java/eu/stork/peps/auth/commons/Country.java | 136 +- .../eu/stork/peps/auth/commons/CountryCodes.java | 90 +- .../java/eu/stork/peps/auth/commons/DateUtil.java | 263 +- .../peps/auth/commons/IAttributeListProcessor.java | 270 +- .../peps/auth/commons/IAttributeProvidersMap.java | 135 +- .../peps/auth/commons/IPersonalAttributeList.java | 315 +- .../eu/stork/peps/auth/commons/IStorkLogger.java | 444 +- .../eu/stork/peps/auth/commons/IStorkSession.java | 125 +- .../java/eu/stork/peps/auth/commons/Linker.java | 107 +- .../eu/stork/peps/auth/commons/PEPSErrors.java | 733 +- .../eu/stork/peps/auth/commons/PEPSParameters.java | 1225 ++- .../java/eu/stork/peps/auth/commons/PEPSUtil.java | 709 +- .../eu/stork/peps/auth/commons/PEPSValues.java | 637 +- .../stork/peps/auth/commons/PersonalAttribute.java | 630 +- .../peps/auth/commons/PersonalAttributeList.java | 705 +- .../peps/auth/commons/STORKAttrQueryRequest.java | 892 +-- .../peps/auth/commons/STORKAttrQueryResponse.java | 749 +- .../stork/peps/auth/commons/STORKAuthnRequest.java | 957 +-- .../peps/auth/commons/STORKAuthnResponse.java | 729 +- .../peps/auth/commons/STORKLogoutRequest.java | 388 +- .../peps/auth/commons/STORKLogoutResponse.java | 494 +- .../stork/peps/auth/commons/STORKStatusCode.java | 91 +- .../peps/auth/commons/STORKSubStatusCode.java | 94 +- .../commons/exceptions/AbstractPEPSException.java | 304 +- .../auth/commons/exceptions/CPEPSException.java | 247 +- .../exceptions/InternalErrorPEPSException.java | 100 +- .../exceptions/InvalidParameterPEPSException.java | 59 +- .../exceptions/InvalidSessionPEPSException.java | 42 +- .../commons/exceptions/SecurityPEPSException.java | 87 +- .../commons/exceptions/StorkPEPSException.java | 56 +- .../eu/stork/peps/auth/commons/package-info.java | 1 + .../eu/stork/peps/auth/specific/IAUService.java | 392 +- .../peps/auth/specific/ICheckAttributeValue.java | 28 +- .../stork/peps/auth/specific/IDeriveAttribute.java | 31 +- .../stork/peps/auth/specific/INormaliseValue.java | 22 +- .../peps/auth/specific/ITranslatorService.java | 151 +- .../AdditionalInformationType.java | 103 +- .../language/diplomasupplement/AddressType.java | 427 +- .../diplomasupplement/AttachedFileDataType.java | 145 +- .../diplomasupplement/AttachedFileURLType.java | 149 +- .../diplomasupplement/AttachedImageDataType.java | 145 +- .../diplomasupplement/AttachedImageURLType.java | 149 +- .../language/diplomasupplement/AttachedType.java | 266 +- .../diplomasupplement/AttachmentsType.java | 70 +- .../CertificationOfTheSupplementType.java | 149 +- .../diplomasupplement/ContactInformationType.java | 234 +- .../language/diplomasupplement/CountryType.java | 2388 +++--- .../CourseStructureDiagramType.java | 103 +- .../CourseUnitLanguageOfInstructionType.java | 106 +- .../CourseUnitLanguagesOfInstructionType.java | 70 +- .../CourseUnitStudentPerformanceType.java | 103 +- .../language/diplomasupplement/CourseUnitType.java | 1938 +++-- .../diplomasupplement/CourseUnitTypeType.java | 64 +- .../CourseUnitWorkPlacementType.java | 195 +- .../CourseUnitWorkPlacementsType.java | 70 +- ...edInOtherInstitutionInMobilityProgramsType.java | 70 +- .../diplomasupplement/CoursesGroupType.java | 271 +- .../diplomasupplement/CoursesGroupsType.java | 208 +- .../diplomasupplement/CoursesUnitsType.java | 70 +- .../diplomasupplement/DiplomaSupplementType.java | 622 +- .../diplomasupplement/ECTSGradingScaleType.java | 108 +- .../diplomasupplement/EHEAFrameworkType.java | 76 +- .../diplomasupplement/ExtensionContentType.java | 119 +- .../language/diplomasupplement/FamilyNameType.java | 70 +- .../xsd/language/diplomasupplement/GenderType.java | 64 +- .../language/diplomasupplement/GivenNameType.java | 70 +- ...dingSchemeAndGradeDistributionGuidanceType.java | 103 +- .../language/diplomasupplement/ImageMimeType.java | 100 +- ...IdentifyingTheHolderOfTheQualificationType.java | 672 +- ...InformationIdentifyingTheQualificationType.java | 312 +- ...formationOnTheContentsAndResultsGainedType.java | 364 +- ...rmationOnTheFunctionOfTheQualificationType.java | 213 +- ...nformationOnTheLevelOfTheQualificationType.java | 620 +- .../diplomasupplement/InstitutionType.java | 729 +- .../language/diplomasupplement/LanguageType.java | 1416 ++-- .../LanguagesOfInstructionAndExaminationType.java | 225 +- .../language/diplomasupplement/LocalGradeType.java | 366 +- .../xsd/language/diplomasupplement/MimeType.java | 142 +- .../MobilityProgrammeCourseUnitType.java | 423 +- .../MobilityProgrammeCoursesUnitsType.java | 70 +- .../diplomasupplement/MobilityProgrammeType.java | 520 +- .../diplomasupplement/ModeOfDeliveryType.java | 64 +- .../diplomasupplement/ModeOfStudyType.java | 100 +- .../MultilingualDiplomaSupplementType.java | 129 +- .../NameAndStatusOfAwardingInstitutionType.java | 162 +- ...tatusOfInstitutionAdministeringStudiesType.java | 162 +- .../language/diplomasupplement/ObjectFactory.java | 1259 ++-- .../diplomasupplement/OfficialCertifyingType.java | 194 +- .../diplomasupplement/OfficialStampType.java | 102 +- .../diplomasupplement/OfficialsCertifyingType.java | 70 +- .../diplomasupplement/ProgrammeDetailsType.java | 103 +- .../ProgrammeRequirementsType.java | 103 +- .../diplomasupplement/QualificationType.java | 193 +- .../diplomasupplement/RichTextTagType.java | 261 +- .../diplomasupplement/SourceGradeType.java | 76 +- .../diplomasupplement/TitleConferredType.java | 57 +- .../language/diplomasupplement/package-info.java | 1 + .../names/tc/stork/_1_0/assertion/AcTitleType.java | 90 +- .../stork/_1_0/assertion/AttributeStatusType.java | 55 +- .../stork/_1_0/assertion/CanonicalAddressType.java | 405 +- .../stork/_1_0/assertion/CurrentStudiesType.java | 283 +- .../_1_0/assertion/DiplomaSupplementType.java | 298 +- .../tc/stork/_1_0/assertion/Habilitation.java | 90 +- .../tc/stork/_1_0/assertion/HabilitationType.java | 90 +- .../stork/_1_0/assertion/HasAccountInBankType.java | 90 +- .../tc/stork/_1_0/assertion/HasDegreeType.java | 248 +- .../stork/_1_0/assertion/IsAcademicStaffType.java | 180 +- .../tc/stork/_1_0/assertion/IsAdminStaffType.java | 90 +- .../_1_0/assertion/IsCourseCoordinatorType.java | 90 +- .../IsHealthCareProfessionalDeprecatedType.java | 182 +- .../assertion/IsHealthCareProfessionalType.java | 182 +- .../tc/stork/_1_0/assertion/IsStudentType.java | 178 +- .../tc/stork/_1_0/assertion/IsTeacherOfType.java | 182 +- .../stork/_1_0/assertion/MandateContentType.java | 459 +- .../names/tc/stork/_1_0/assertion/MandateType.java | 212 +- .../tc/stork/_1_0/assertion/ObjectFactory.java | 989 ++- .../stork/_1_0/assertion/OriginalMandateType.java | 98 +- .../_1_0/assertion/RepresentationPersonType.java | 446 +- .../_1_0/assertion/RequestedAttributeType.java | 307 +- .../stork/_1_0/assertion/TimeRestrictionType.java | 107 +- .../assertion/TransactionLimitRestrictionType.java | 103 +- .../tc/stork/_1_0/assertion/package-info.java | 1 + .../generaldiploma/AdditionalInformationType.java | 103 +- .../_2_0/academic/generaldiploma/AddressType.java | 272 +- .../generaldiploma/AttachedFileDataType.java | 145 +- .../generaldiploma/AttachedFileURLType.java | 149 +- .../generaldiploma/AttachedImageDataType.java | 145 +- .../generaldiploma/AttachedImageURLType.java | 149 +- .../_2_0/academic/generaldiploma/AttachedType.java | 266 +- .../academic/generaldiploma/AttachmentsType.java | 70 +- .../CertificationOfTheSupplementType.java | 149 +- .../generaldiploma/ContactInformationType.java | 234 +- .../generaldiploma/CountryTextCodeType.java | 102 +- .../_2_0/academic/generaldiploma/CountryType.java | 219 +- .../generaldiploma/CourseStructureDiagramType.java | 103 +- .../CourseUnitLanguageOfInstructionType.java | 102 +- .../CourseUnitLanguagesOfInstructionType.java | 70 +- .../CourseUnitStudentPerformanceType.java | 103 +- .../academic/generaldiploma/CourseUnitType.java | 2030 +++-- .../generaldiploma/CourseUnitTypeType.java | 52 +- .../CourseUnitWorkPlacementType.java | 195 +- .../CourseUnitWorkPlacementsType.java | 70 +- ...edInOtherInstitutionInMobilityProgramsType.java | 70 +- .../academic/generaldiploma/CoursesGroupType.java | 271 +- .../academic/generaldiploma/CoursesGroupsType.java | 208 +- .../academic/generaldiploma/CoursesUnitsType.java | 70 +- .../generaldiploma/ECTSGradingScaleType.java | 29 +- .../academic/generaldiploma/EHEAFrameworkType.java | 55 +- .../generaldiploma/ExtensionContentType.java | 119 +- .../academic/generaldiploma/FamilyNameType.java | 70 +- .../_2_0/academic/generaldiploma/GenderType.java | 52 +- .../generaldiploma/GeneralDiplomaType.java | 622 +- .../academic/generaldiploma/GivenNameType.java | 70 +- ...dingSchemeAndGradeDistributionGuidanceType.java | 103 +- .../academic/generaldiploma/ImageMimeType.java | 55 +- ...IdentifyingTheHolderOfTheQualificationType.java | 471 +- ...InformationIdentifyingTheQualificationType.java | 312 +- ...formationOnTheContentsAndResultsGainedType.java | 364 +- ...rmationOnTheFunctionOfTheQualificationType.java | 213 +- ...nformationOnTheLevelOfTheQualificationType.java | 620 +- .../academic/generaldiploma/InstitutionType.java | 524 +- .../_2_0/academic/generaldiploma/LanguageType.java | 334 +- .../LanguagesOfInstructionAndExaminationType.java | 335 +- .../academic/generaldiploma/LocalGradeType.java | 362 +- .../_2_0/academic/generaldiploma/MimeType.java | 61 +- .../MobilityProgrammeCourseUnitType.java | 419 +- .../MobilityProgrammeCoursesUnitsType.java | 70 +- .../generaldiploma/MobilityProgrammeType.java | 411 +- .../generaldiploma/ModeOfDeliveryType.java | 55 +- .../academic/generaldiploma/ModeOfStudyType.java | 55 +- .../MultilingualGeneralDiplomaType.java | 129 +- .../NameAndStatusOfAwardingInstitutionType.java | 170 +- ...tatusOfInstitutionAdministeringStudiesType.java | 170 +- .../academic/generaldiploma/ObjectFactory.java | 1211 ++- .../generaldiploma/OfficialCertifyingType.java | 202 +- .../academic/generaldiploma/OfficialStampType.java | 110 +- .../generaldiploma/OfficialsCertifyingType.java | 70 +- .../generaldiploma/ProgrammeDetailsType.java | 103 +- .../generaldiploma/ProgrammeRequirementsType.java | 103 +- .../academic/generaldiploma/QualificationType.java | 193 +- .../academic/generaldiploma/RichTextTagType.java | 257 +- .../academic/generaldiploma/SourceGradeType.java | 55 +- .../generaldiploma/TitleConferredType.java | 57 +- .../_2_0/academic/generaldiploma/package-info.java | 1 + .../_09/xmldsig/CanonicalizationMethodType.java | 120 +- .../org/w3/_2000/_09/xmldsig/DSAKeyValueType.java | 333 +- .../org/w3/_2000/_09/xmldsig/DigestMethodType.java | 121 +- .../org/w3/_2000/_09/xmldsig/KeyInfoType.java | 150 +- .../org/w3/_2000/_09/xmldsig/KeyValueType.java | 83 +- .../org/w3/_2000/_09/xmldsig/ManifestType.java | 121 +- .../org/w3/_2000/_09/xmldsig/ObjectFactory.java | 1063 ++- .../org/w3/_2000/_09/xmldsig/ObjectType.java | 217 +- .../org/w3/_2000/_09/xmldsig/PGPDataType.java | 96 +- .../org/w3/_2000/_09/xmldsig/RSAKeyValueType.java | 95 +- .../org/w3/_2000/_09/xmldsig/ReferenceType.java | 314 +- .../w3/_2000/_09/xmldsig/RetrievalMethodType.java | 151 +- .../org/w3/_2000/_09/xmldsig/SPKIDataType.java | 74 +- .../w3/_2000/_09/xmldsig/SignatureMethodType.java | 123 +- .../_2000/_09/xmldsig/SignaturePropertiesType.java | 121 +- .../_2000/_09/xmldsig/SignaturePropertyType.java | 172 +- .../org/w3/_2000/_09/xmldsig/SignatureType.java | 277 +- .../w3/_2000/_09/xmldsig/SignatureValueType.java | 104 +- .../org/w3/_2000/_09/xmldsig/SignedInfoType.java | 213 +- .../org/w3/_2000/_09/xmldsig/TransformType.java | 124 +- .../org/w3/_2000/_09/xmldsig/TransformsType.java | 70 +- .../org/w3/_2000/_09/xmldsig/X509DataType.java | 89 +- .../w3/_2000/_09/xmldsig/X509IssuerSerialType.java | 103 +- .../org/w3/_2000/_09/xmldsig/package-info.java | 1 + .../resources/schema/StorkcomplexAttributes.xsd | 713 +- ...demic-language-diplomasupplement-schema-1_1.xsd | 7966 ++++++++++---------- .../src/main/resources/schema/diploma.xsd | 651 +- .../main/resources/schema/xmldsig-core-schema.xsd | 603 +- .../peps/tests/AttributeProvidersMapTestCase.java | 28 +- .../eu/stork/peps/tests/AttributeUtilTestCase.java | 937 ++- .../peps/tests/ComplexAttributesMarshalling.java | 407 +- .../java/eu/stork/peps/tests/DateUtilTestCase.java | 482 +- .../java/eu/stork/peps/tests/PEPSUtilTestCase.java | 936 ++- .../peps/tests/PersonalAttributeListTestCase.java | 1357 ++-- .../peps/tests/PersonalAttributeTestCase.java | 278 +- .../java/eu/stork/peps/auth/engine/SAMLEngine.java | 119 +- .../eu/stork/peps/auth/engine/SAMLEngineUtils.java | 459 +- .../eu/stork/peps/auth/engine/STORKSAMLEngine.java | 2430 +++--- .../stork/peps/auth/engine/X509PrincipalUtil.java | 96 +- .../auth/engine/core/AuthenticationAttributes.java | 46 +- .../peps/auth/engine/core/CitizenCountryCode.java | 45 +- .../auth/engine/core/CustomAttributeQuery.java | 72 +- .../engine/core/CustomRequestAbstractType.java | 327 +- .../peps/auth/engine/core/EIDCrossBorderShare.java | 56 +- .../peps/auth/engine/core/EIDCrossSectorShare.java | 54 +- .../peps/auth/engine/core/EIDSectorShare.java | 55 +- .../stork/peps/auth/engine/core/QAAAttribute.java | 67 +- .../peps/auth/engine/core/RequestedAttribute.java | 215 +- .../peps/auth/engine/core/RequestedAttributes.java | 38 +- .../eu/stork/peps/auth/engine/core/SAMLCore.java | 145 +- .../peps/auth/engine/core/SAMLEngineSignI.java | 105 +- .../stork/peps/auth/engine/core/SPApplication.java | 53 +- .../eu/stork/peps/auth/engine/core/SPCountry.java | 53 +- .../java/eu/stork/peps/auth/engine/core/SPID.java | 45 +- .../stork/peps/auth/engine/core/SPInformation.java | 45 +- .../stork/peps/auth/engine/core/SPInstitution.java | 53 +- .../eu/stork/peps/auth/engine/core/SPSector.java | 53 +- .../stork/peps/auth/engine/core/STORKSAMLCore.java | 888 ++- .../engine/core/VIDPAuthenticationAttributes.java | 75 +- .../core/impl/AuthenticationAttributesBuilder.java | 54 +- .../core/impl/AuthenticationAttributesImpl.java | 145 +- .../impl/AuthenticationAttributesUnmarshaller.java | 15 +- .../core/impl/CitizenCountryCodeBuilder.java | 42 +- .../engine/core/impl/CitizenCountryCodeImpl.java | 91 +- .../core/impl/CitizenCountryCodeMarshaller.java | 26 +- .../core/impl/CitizenCountryCodeUnmarshaller.java | 23 +- .../core/impl/CustomAttributeQueryBuilder.java | 25 +- .../engine/core/impl/CustomAttributeQueryImpl.java | 62 +- .../core/impl/CustomAttributeQueryMarshaller.java | 69 +- .../impl/CustomAttributeQueryUnmarshaller.java | 165 +- .../core/impl/EIDCrossBorderShareBuilder.java | 16 +- .../engine/core/impl/EIDCrossBorderShareImpl.java | 96 +- .../core/impl/EIDCrossBorderShareMarshaller.java | 14 +- .../core/impl/EIDCrossBorderShareUnmarshaller.java | 13 +- .../core/impl/EIDCrossSectorShareBuilder.java | 46 +- .../engine/core/impl/EIDCrossSectorShareImpl.java | 95 +- .../core/impl/EIDCrossSectorShareMarshaller.java | 13 +- .../core/impl/EIDCrossSectorShareUnmarshaller.java | 15 +- .../engine/core/impl/EIDSectorShareBuilder.java | 45 +- .../auth/engine/core/impl/EIDSectorShareImpl.java | 100 +- .../engine/core/impl/EIDSectorShareMarshaller.java | 12 +- .../core/impl/EIDSectorShareUnmarshaller.java | 14 +- .../auth/engine/core/impl/QAAAttributeBuilder.java | 46 +- .../auth/engine/core/impl/QAAAttributeImpl.java | 93 +- .../engine/core/impl/QAAAttributeMarshaller.java | 26 +- .../engine/core/impl/QAAAttributeUnmarshaller.java | 23 +- .../core/impl/RequestedAttributeBuilder.java | 51 +- .../engine/core/impl/RequestedAttributeImpl.java | 365 +- .../core/impl/RequestedAttributeMarshaller.java | 76 +- .../core/impl/RequestedAttributeUnmarshaller.java | 98 +- .../core/impl/RequestedAttributesBuilder.java | 51 +- .../engine/core/impl/RequestedAttributesImpl.java | 121 +- .../core/impl/RequestedAttributesMarshaller.java | 12 +- .../core/impl/RequestedAttributesUnmarshaller.java | 37 +- .../engine/core/impl/SPApplicationBuilder.java | 45 +- .../auth/engine/core/impl/SPApplicationImpl.java | 93 +- .../engine/core/impl/SPApplicationMarshaller.java | 27 +- .../core/impl/SPApplicationUnmarshaller.java | 24 +- .../auth/engine/core/impl/SPCountryBuilder.java | 44 +- .../peps/auth/engine/core/impl/SPCountryImpl.java | 89 +- .../auth/engine/core/impl/SPCountryMarshaller.java | 26 +- .../engine/core/impl/SPCountryUnmarshaller.java | 24 +- .../peps/auth/engine/core/impl/SPIDBuilder.java | 42 +- .../stork/peps/auth/engine/core/impl/SPIDImpl.java | 91 +- .../peps/auth/engine/core/impl/SPIDMarshaller.java | 26 +- .../auth/engine/core/impl/SPIDUnmarshaller.java | 23 +- .../engine/core/impl/SPInformationBuilder.java | 19 +- .../auth/engine/core/impl/SPInformationImpl.java | 145 +- .../engine/core/impl/SPInformationMarshaller.java | 12 +- .../core/impl/SPInformationUnmarshaller.java | 41 +- .../engine/core/impl/SPInstitutionBuilder.java | 45 +- .../auth/engine/core/impl/SPInstitutionImpl.java | 95 +- .../engine/core/impl/SPInstitutionMarshaller.java | 27 +- .../core/impl/SPInstitutionUnmarshaller.java | 23 +- .../auth/engine/core/impl/SPSectorBuilder.java | 42 +- .../peps/auth/engine/core/impl/SPSectorImpl.java | 93 +- .../auth/engine/core/impl/SPSectorMarshaller.java | 26 +- .../engine/core/impl/SPSectorUnmarshaller.java | 24 +- .../stork/peps/auth/engine/core/impl/SignHW.java | 717 +- .../auth/engine/core/impl/SignModuleFactory.java | 54 +- .../stork/peps/auth/engine/core/impl/SignP12.java | 300 +- .../stork/peps/auth/engine/core/impl/SignSW.java | 866 +-- .../impl/VIDPAuthenticationAttributesBuilder.java | 19 +- .../impl/VIDPAuthenticationAttributesImpl.java | 174 +- .../VIDPAuthenticationAttributesMarshaller.java | 12 +- .../VIDPAuthenticationAttributesUnmarshaller.java | 45 +- .../validator/CustomAttributeQueryValidator.java | 65 +- .../core/validator/ExtensionsSchemaValidator.java | 46 +- .../MultipleAssertionResponseValidator.java | 85 +- .../validator/QAAAttributeSchemaValidator.java | 20 +- .../peps/configuration/ConfigurationCreator.java | 199 +- .../peps/configuration/ConfigurationEngine.java | 74 +- .../peps/configuration/ConfigurationReader.java | 319 +- .../peps/configuration/ConfigurationSingleton.java | 66 +- .../stork/peps/configuration/InstanceEngine.java | 74 +- .../eu/stork/peps/configuration/package-info.java | 1 + .../stork/peps/exceptions/SAMLEngineException.java | 59 +- .../peps/exceptions/STORKSAMLEngineException.java | 223 +- .../STORKSAMLEngineRuntimeException.java | 59 +- .../eu/stork/peps/test/simple/SSETestUtils.java | 248 +- .../eu/stork/peps/test/simple/SimpleBaseTest.java | 61 +- .../test/simple/StorkAttrQueryRequestTest.java | 1612 ++-- .../test/simple/StorkAttrQueryResponseTest.java | 1757 ++--- .../peps/test/simple/StorkAuthRequestTest.java | 1669 ++-- .../peps/test/simple/StorkLogoutRequestTest.java | 129 +- .../peps/test/simple/StorkLogoutResponseTest.java | 223 +- .../peps/test/simple/StorkNewResponseTest.java | 825 +- .../stork/peps/test/simple/StorkResponseTest.java | 1586 ++-- .../src/test/resources/SignModule_Conf0.xml | 14 +- .../src/test/resources/StorkSamlEngine_Conf0.xml | 2 +- .../stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml | 83 +- 342 files changed, 43680 insertions(+), 46821 deletions(-) diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java index 09769641c..4d13c2d92 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java @@ -14,59 +14,57 @@ package eu.stork.peps.auth.commons; /** - * This enum class contains all the STORK PEPS, Commons and Specific errors - * constant identifiers. + * This enum class contains all the STORK PEPS, Commons and Specific errors constant identifiers. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.2 $, $Date: 2010-11-17 05:15:28 $ */ public enum AttributeConstants { - - /** - * Represents the attribute's name index. - */ - ATTR_NAME_INDEX(0), - /** - * Represents the attribute's type index. - */ - ATTR_TYPE_INDEX(1), - /** - * Represents the attribute's value index. - */ - ATTR_VALUE_INDEX(2), - /** - * Represents the attribute's status index. - */ - ATTR_STATUS_INDEX(3), - /** - * Represents the number of allowed tuples. - */ - NUMBER_TUPLES(4); - - /** - * Represents the constant's value. - */ - private int attribute; - - /** - * Solo Constructor. - * - * @param attr The Attribute Constant value. - */ - AttributeConstants(final int attr) { - - this.attribute = attr; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public int intValue() { - - return attribute; - } + + /** + * Represents the attribute's name index. + */ + ATTR_NAME_INDEX(0), + /** + * Represents the attribute's type index. + */ + ATTR_TYPE_INDEX(1), + /** + * Represents the attribute's value index. + */ + ATTR_VALUE_INDEX(2), + /** + * Represents the attribute's status index. + */ + ATTR_STATUS_INDEX(3), + /** + * Represents the number of allowed tuples. + */ + NUMBER_TUPLES(4); + + /** + * Represents the constant's value. + */ + private int attribute; + + /** + * Solo Constructor. + * + * @param attr + * The Attribute Constant value. + */ + AttributeConstants(final int attr) { + + this.attribute = attr; + } + + /** + * Return the Constant Value. + * + * @return The constant value. + */ + public int intValue() { + + return attribute; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java index a44768c7e..f47cca6be 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java @@ -8,67 +8,71 @@ package eu.stork.peps.auth.commons; * @version $Revision: 1.00 $, $Date: 2013-11-26 $ */ public final class AttributeName { - - /** - * Attribute Id. - */ - private String attributeId; - - /** - * Attribute Name. - */ - private String attributeName; - /** - * Attribute Name Constructor. - * - * @param aId Id of the Attribute Name. - * @param aName Name of the Attribute Name. - */ - public AttributeName(final String aId, final String aName) { - - this.attributeId = aId; - this.attributeName = aName; - } - - /** - * Getter for the attributeId value. - * - * @return The attributeId value. - */ - public String getAttributeId() { - - return attributeId; - } - - /** - * Setter for the attributeId value. - * - * @param aId Id of the Attribute Name. - */ - public void setAttributeId(final String aId) { - - this.attributeId = aId; - } - - /** - * Getter for the attributeName value. - * - * @return The attributeName value. - */ - public String getAttributeName() { - - return attributeName; - } - - /** - * Setter for the attributeName value. - * - * @param name Name of the Attribute Name. - */ - public void setAttributeName(final String name) { - - this.attributeName = name; - } - + /** + * Attribute Id. + */ + private String attributeId; + + /** + * Attribute Name. + */ + private String attributeName; + + /** + * Attribute Name Constructor. + * + * @param aId + * Id of the Attribute Name. + * @param aName + * Name of the Attribute Name. + */ + public AttributeName(final String aId, final String aName) { + + this.attributeId = aId; + this.attributeName = aName; + } + + /** + * Getter for the attributeId value. + * + * @return The attributeId value. + */ + public String getAttributeId() { + + return attributeId; + } + + /** + * Setter for the attributeId value. + * + * @param aId + * Id of the Attribute Name. + */ + public void setAttributeId(final String aId) { + + this.attributeId = aId; + } + + /** + * Getter for the attributeName value. + * + * @return The attributeName value. + */ + public String getAttributeName() { + + return attributeName; + } + + /** + * Setter for the attributeName value. + * + * @param name + * Name of the Attribute Name. + */ + public void setAttributeName(final String name) { + + this.attributeName = name; + } + } \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java index 575732e27..08265e8f0 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java @@ -11,113 +11,119 @@ import java.util.List; * @version $Revision: 1.01 $, $Date: 2014-01-13 $ */ public final class AttributeProvider implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = 7210186241917444559L; - - /** - * Provider Id. - */ - private String providerId; - - /** - * Provider Name. - */ - private String providerName; - - /** - * Allowed groups of attribute names. - */ - private List allowedGroups; - - /** - * Attribute Provider Constructor. - * - * @param pId Id of the Attribute Provider. - * @param pName Name of the Attribute Provider. - */ - public AttributeProvider(final String pId, final String pName, final List pAllowedGroups) { - - this.providerId = pId; - this.providerName = pName; - this.allowedGroups = pAllowedGroups; - } - - /** - * Getter for the providerId value. - * - * @return The providerId value. - */ - public String getProviderId() { - - return providerId; - } - - /** - * Setter for the providerId value. - * - * @param pId Id of the Attribute Provider. - */ - public void setProviderId(final String pId) { - - this.providerId = pId; - } - - /** - * Getter for the providerName value. - * - * @return The providerName value. - */ - public String getProviderName() { - - return providerName; - } - - /** - * Setter for the providerName value. - * - * @param name Name of the Attribute Provider. - */ - public void setProviderName(final String name) { - - this.providerName = name; - } - - /** - * Getter for the allowedGroups value. - * - * @return The allowedGroups value. - */ - public List getAllowedGroups() { - - return allowedGroups; - } - - /** - * Setter for the allowedGroups value. - * - * @param name AllowedGroups of the Attribute Provider. - */ - public void setAllowedGroups(final List pAllowedGroups) { - - this.allowedGroups = pAllowedGroups; - } - - /** - * Check if an attribute name is allowed for this Attribute Provider - * - * @param pAttrName the Attribute Name to check - * @return true if the name is allowed, false otherwise - */ - public boolean isAttributeNameAllowed(final String pAttrName) { - if ( allowedGroups==null || pAttrName==null ) - return false; - else if ( allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_ALL.toString()) ) - return true; - else if ( allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_NONE.toString()) ) - return false; - else - return allowedGroups.contains(pAttrName); - } + /** + * Unique identifier. + */ + private static final long serialVersionUID = 7210186241917444559L; + + /** + * Provider Id. + */ + private String providerId; + + /** + * Provider Name. + */ + private String providerName; + + /** + * Allowed groups of attribute names. + */ + private List allowedGroups; + + /** + * Attribute Provider Constructor. + * + * @param pId + * Id of the Attribute Provider. + * @param pName + * Name of the Attribute Provider. + */ + public AttributeProvider(final String pId, final String pName, final List pAllowedGroups) { + + this.providerId = pId; + this.providerName = pName; + this.allowedGroups = pAllowedGroups; + } + + /** + * Getter for the providerId value. + * + * @return The providerId value. + */ + public String getProviderId() { + + return providerId; + } + + /** + * Setter for the providerId value. + * + * @param pId + * Id of the Attribute Provider. + */ + public void setProviderId(final String pId) { + + this.providerId = pId; + } + + /** + * Getter for the providerName value. + * + * @return The providerName value. + */ + public String getProviderName() { + + return providerName; + } + + /** + * Setter for the providerName value. + * + * @param name + * Name of the Attribute Provider. + */ + public void setProviderName(final String name) { + + this.providerName = name; + } + + /** + * Getter for the allowedGroups value. + * + * @return The allowedGroups value. + */ + public List getAllowedGroups() { + + return allowedGroups; + } + + /** + * Setter for the allowedGroups value. + * + * @param name + * AllowedGroups of the Attribute Provider. + */ + public void setAllowedGroups(final List pAllowedGroups) { + + this.allowedGroups = pAllowedGroups; + } + + /** + * Check if an attribute name is allowed for this Attribute Provider + * + * @param pAttrName + * the Attribute Name to check + * @return true if the name is allowed, false otherwise + */ + public boolean isAttributeNameAllowed(final String pAttrName) { + if (allowedGroups == null || pAttrName == null) + return false; + else if (allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_ALL.toString())) + return true; + else if (allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_NONE.toString())) + return false; + else + return allowedGroups.contains(pAttrName); + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java index 85aec2625..24d93f9bb 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java @@ -14,13 +14,12 @@ import org.apache.log4j.Logger; * * @see LinkedHashMap */ -public class AttributeProvidersMap extends LinkedHashMap - implements IAttributeProvidersMap { +public class AttributeProvidersMap extends LinkedHashMap implements IAttributeProvidersMap { /** * Logger object. */ private static final Logger LOG = Logger.getLogger(AttributeProvidersMap.class.getName()); - + /** * Unique identifier. */ @@ -72,10 +71,9 @@ public class AttributeProvidersMap extends LinkedHashMap Attribute Provider: ID [" + source.getProvider().getProviderId() + "], name [" + source.getProvider().getProviderName() + "]"); - } - else { + } else { LOG.trace("-> Country: ID [" + source.getCountry().getCountryId() + "], name [" + source.getCountry().getCountryName() + "]"); } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java index 846f54f67..8064131a7 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java @@ -12,177 +12,184 @@ import org.apache.log4j.Logger; * @version $Revision: 1.10 $, $Date: 2013-11-29 $ */ public final class AttributeSource implements Serializable { - /** - * Unique identifier. - */ - private static final long serialVersionUID = 432243595968469014L; - - public static final int SOURCE_LOCAL_APROVIDER = 1; - public static final int SOURCE_REMOTE_COUNTRY = 2; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(AttributeSource.class.getName()); - - /** - * Provider source. - */ - private int sourceType; - - /** - * Provider URL. - */ - private String providerURL; - - /** - * The local Attribute Provider. - */ - private AttributeProvider provider; - - /** - * The remote Country. - */ - private Country country; - - /** - * Attribute Source Constructor. - * - * @param provider The local Attribute Provider. - * @param pURL URL of the Attribute Provider. - */ - public AttributeSource(final AttributeProvider provider, final String pURL) { - this.setSourceType(SOURCE_LOCAL_APROVIDER); - - this.setProvider(provider); - this.setProviderURL(pURL); - } - - /** - * Attribute Source Constructor. - * - * @param country The remote Country. - * @param pURL URL of the Country. - */ - public AttributeSource(final Country country, final String pURL) { - this.setSourceType(SOURCE_REMOTE_COUNTRY); - - this.setCountry(country); - this.setProviderURL(pURL); - } - - /** - * @param sourceType the sourceType to set - */ - public void setSourceType(final int sourceType) { - this.sourceType = sourceType; - } - - /** - * @return the sourceType - */ - public int getSourceType() { - return sourceType; - } - - /** - * @param providerURL the providerURL to set - */ - public void setProviderURL(final String providerURL) { - this.providerURL = providerURL; - } - - /** - * @return the providerURL - */ - public String getProviderURL() { - return providerURL; - } - - /** - * @param provider the provider to set - */ - public void setProvider(final AttributeProvider provider) { - this.setSourceType(SOURCE_LOCAL_APROVIDER); - - this.provider = provider; - } - - /** - * @return the provider - */ - public AttributeProvider getProvider() { - return provider; - } - - /** - * @param country the country to set - */ - public void setCountry(final Country country) { - this.setSourceType(SOURCE_REMOTE_COUNTRY); - - this.country = country; - } - - /** - * @return the country - */ - public Country getCountry() { - return country; - } - - /** - * {@inheritDoc} - */ - public boolean equals(Object obj) { - boolean outcome = false; - - LOG.debug("Calling equals with Object."); - if ( obj instanceof AttributeSource ) { - LOG.debug("Calling equals with AttributeSource."); - outcome = this.equals((AttributeSource)obj); - } - - LOG.debug("Object equals outcome: " + outcome); - return outcome; - } - - /** - * Compare the given AttributeSource with the current object in order to determinine - * if they are equal. - * - * @param obj The AttributeSource to compare to - * - * @return true if the two objects are equal - */ - public boolean equals(AttributeSource obj) { - boolean outcome = false; - - if ( this.sourceType==obj.getSourceType() ) { - if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER ) { - if ( this.provider.getProviderId().equals(obj.getProvider().getProviderId()) ) - outcome = true; - } - else if ( this.sourceType==AttributeSource.SOURCE_REMOTE_COUNTRY ) { - if ( this.country.getCountryId().equals(obj.getCountry().getCountryId()) ) - outcome = true; - } - } - - LOG.debug("AttributeSource equals outcome: " + outcome); - return outcome; - } - - /** - * {@inheritDoc} - */ - public int hashCode() { - int hash = 1; - hash = hash * 17 + this.sourceType; - if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER ) - hash = hash * 31 + this.provider.getProviderName().hashCode(); - else - hash = hash * 31 + this.country.getCountryName().hashCode(); - return hash; - } + /** + * Unique identifier. + */ + private static final long serialVersionUID = 432243595968469014L; + + public static final int SOURCE_LOCAL_APROVIDER = 1; + public static final int SOURCE_REMOTE_COUNTRY = 2; + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(AttributeSource.class.getName()); + + /** + * Provider source. + */ + private int sourceType; + + /** + * Provider URL. + */ + private String providerURL; + + /** + * The local Attribute Provider. + */ + private AttributeProvider provider; + + /** + * The remote Country. + */ + private Country country; + + /** + * Attribute Source Constructor. + * + * @param provider + * The local Attribute Provider. + * @param pURL + * URL of the Attribute Provider. + */ + public AttributeSource(final AttributeProvider provider, final String pURL) { + this.setSourceType(SOURCE_LOCAL_APROVIDER); + + this.setProvider(provider); + this.setProviderURL(pURL); + } + + /** + * Attribute Source Constructor. + * + * @param country + * The remote Country. + * @param pURL + * URL of the Country. + */ + public AttributeSource(final Country country, final String pURL) { + this.setSourceType(SOURCE_REMOTE_COUNTRY); + + this.setCountry(country); + this.setProviderURL(pURL); + } + + /** + * @param sourceType + * the sourceType to set + */ + public void setSourceType(final int sourceType) { + this.sourceType = sourceType; + } + + /** + * @return the sourceType + */ + public int getSourceType() { + return sourceType; + } + + /** + * @param providerURL + * the providerURL to set + */ + public void setProviderURL(final String providerURL) { + this.providerURL = providerURL; + } + + /** + * @return the providerURL + */ + public String getProviderURL() { + return providerURL; + } + + /** + * @param provider + * the provider to set + */ + public void setProvider(final AttributeProvider provider) { + this.setSourceType(SOURCE_LOCAL_APROVIDER); + + this.provider = provider; + } + + /** + * @return the provider + */ + public AttributeProvider getProvider() { + return provider; + } + + /** + * @param country + * the country to set + */ + public void setCountry(final Country country) { + this.setSourceType(SOURCE_REMOTE_COUNTRY); + + this.country = country; + } + + /** + * @return the country + */ + public Country getCountry() { + return country; + } + + /** + * {@inheritDoc} + */ + public boolean equals(Object obj) { + boolean outcome = false; + + LOG.debug("Calling equals with Object."); + if (obj instanceof AttributeSource) { + LOG.debug("Calling equals with AttributeSource."); + outcome = this.equals((AttributeSource) obj); + } + + LOG.debug("Object equals outcome: " + outcome); + return outcome; + } + + /** + * Compare the given AttributeSource with the current object in order to determinine if they are equal. + * + * @param obj + * The AttributeSource to compare to + * + * @return true if the two objects are equal + */ + public boolean equals(AttributeSource obj) { + boolean outcome = false; + + if (this.sourceType == obj.getSourceType()) { + if (this.sourceType == AttributeSource.SOURCE_LOCAL_APROVIDER) { + if (this.provider.getProviderId().equals(obj.getProvider().getProviderId())) + outcome = true; + } else if (this.sourceType == AttributeSource.SOURCE_REMOTE_COUNTRY) { + if (this.country.getCountryId().equals(obj.getCountry().getCountryId())) + outcome = true; + } + } + + LOG.debug("AttributeSource equals outcome: " + outcome); + return outcome; + } + + /** + * {@inheritDoc} + */ + public int hashCode() { + int hash = 1; + hash = hash * 17 + this.sourceType; + if (this.sourceType == AttributeSource.SOURCE_LOCAL_APROVIDER) + hash = hash * 31 + this.provider.getProviderName().hashCode(); + else + hash = hash * 31 + this.country.getCountryName().hashCode(); + return hash; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java index af7ab6cf3..18218dce4 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java @@ -23,209 +23,196 @@ import org.apache.commons.lang.StringUtils; /** * This class holds static helper methods. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.5 $, $Date: 2010-12-15 23:19:59 $ */ public final class AttributeUtil { - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private AttributeUtil() { - // empty constructor - } - - /** - * Safe escape any given string. - * - * @param value The HTTP Value to escaped. - * - * @return The value escaped value. - */ - public static String escape(final String value) { - - final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); - final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); - final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); - - final String escAttrSep = "%" + (int) attrSep.charAt(0); - final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); - final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); - - return value.replace(attrSep, escAttrSep) - .replace(attrTupleSep, escAttrTupleSep) - .replace(attrValueSep, escAttrValueSep); - } - - /** - * Unescape any given string. - * - * @param value The HTTP Value to be unescaped. - * - * @return The value unescaped value. - */ - public static String unescape(final String value) { - final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); - final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); - final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); - - final String escAttrSep = "%" + (int) attrSep.charAt(0); - final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); - final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); - - return value.replace(escAttrSep, attrSep) - .replace(escAttrTupleSep, attrTupleSep) - .replace(escAttrValueSep, attrValueSep); - } - - /** - * Appends the string representation of an object to a StringBuilder. - * - * @param strBuilder The StringBuilder to append to. - * @param val The string representation of an object. - */ - public static void appendIfNotNull(final StringBuilder strBuilder, - final Object val) { - - if (val != null) { - strBuilder.append(val); - } - } - - /** - * Given a separator and a list of strings, joins the list, as a string, - * separated by the separator string. - * - * @param list The list of strings to join. - * @param separator The separator string. - * @return the list, as a string, separated by the separator string. - */ - public static String listToString(final List list, - final String separator) { - - final StringBuilder strBuilder = new StringBuilder(); - for (final String s : list) { - if (!StringUtils.isEmpty(s)) { - strBuilder.append(AttributeUtil.escape(s) + separator); - } - } - return strBuilder.toString(); - } - - /** - * Given a separator and a map of strings to strings, joins the map, as a - * string, separated by the separator string with the pair key/value - * concatenated with a '='. - * - * @param map The map of strings to join. - * @param separator The separator string. - * - * @return the map of strings, as a string, separated by the separator string - * with the pair key/value concatenated with a '='. - */ - public static String mapToString(final Map map, - final String separator) { - - final StringBuilder strBuilder = new StringBuilder(); - final Iterator> valuesIt = map.entrySet().iterator(); - while (valuesIt.hasNext()) { - final Entry entry = valuesIt.next(); - strBuilder.append(entry.getKey()); - strBuilder.append('='); - strBuilder.append(AttributeUtil.escape(entry.getValue())); - strBuilder.append(separator); - } - return strBuilder.toString(); - } - - /** - * Validates the attribute value format. - * - * @param value The attribute value to validate. - * - * @return true if value has a valid format. - */ - public static boolean isValidValue(final String value) { - boolean retVal = false; - if (value != null && value.charAt(0) == '[' && value.endsWith("]")) { - final String tmpAttrValue = value.substring(1, value.length() - 1); - final String[] vals = - tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - if (tmpAttrValue.length() >= 0 - || (vals.length > 0 && vals[0].length() > 0)) { - retVal = true; - } - } - return retVal; - } - - /** - * Validates the attribute type value. It's case insensitive. E.g. return true - * value to: a) "true", "TRUE", "True", ... b) "false", "FALSE", "False", ... - * - * @param type The attribute type value. - * - * @return true if type has a true or false (case insensitive) value. - */ - public static boolean isValidType(final String type) { - return StringUtils.isNotEmpty(type) && (PEPSValues.TRUE.toString().equalsIgnoreCase(type) || PEPSValues.FALSE.toString().equalsIgnoreCase(type)) ; - } - - /** - * Validates the Personal attribute tuple. E.g. name:type:[value]:status - * - * @param tuples The Personal attribute's tuple. - * - * @return true if the tuples' format is valid. - * - * @see PEPSUtil#validateParameter(String, String, String) - * @see String#equalsIgnoreCase(String) - */ - public static boolean hasValidTuples(final String[] tuples) { - boolean retVal = false; - - final int numberTuples = AttributeConstants.NUMBER_TUPLES.intValue(); - if (tuples != null && tuples.length == numberTuples) { - // validate attrName - final int attrNameIndex = AttributeConstants.ATTR_NAME_INDEX.intValue(); - final int attrTypeIndex = AttributeConstants.ATTR_TYPE_INDEX.intValue(); - final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue(); - - retVal = - StringUtils.isNotEmpty(tuples[attrNameIndex]) - && StringUtils.isNotEmpty(tuples[attrTypeIndex]) - && StringUtils.isNotEmpty(tuples[attrValueIndex]) - && AttributeUtil.isValidType(tuples[attrTypeIndex]) - && AttributeUtil.isValidValue(tuples[attrValueIndex]); - } - return retVal; - } - - /** - * Check if all mandatory attributes have values. - * - * @param personalAttrList The Personal Attributes List. - * - * @return true if all mandatory attributes have values, false if at least one - * attribute doesn't have value. - */ - public static boolean checkMandatoryAttributes( - final IPersonalAttributeList personalAttrList) { - - final Iterator itAttributes = - personalAttrList.values().iterator(); - boolean retVal = true; - while (itAttributes.hasNext() && retVal) { - final PersonalAttribute attr = itAttributes.next(); - if (attr.isRequired() - && !STORKStatusCode.STATUS_AVAILABLE.toString() - .equals(attr.getStatus())) { - retVal = false; - } - } - return retVal; - } + + /** + * Private constructor. Prevents the class from being instantiated. + */ + private AttributeUtil() { + // empty constructor + } + + /** + * Safe escape any given string. + * + * @param value + * The HTTP Value to escaped. + * + * @return The value escaped value. + */ + public static String escape(final String value) { + + final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); + final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); + final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); + + final String escAttrSep = "%" + (int) attrSep.charAt(0); + final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); + final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); + + return value.replace(attrSep, escAttrSep).replace(attrTupleSep, escAttrTupleSep).replace(attrValueSep, escAttrValueSep); + } + + /** + * Unescape any given string. + * + * @param value + * The HTTP Value to be unescaped. + * + * @return The value unescaped value. + */ + public static String unescape(final String value) { + final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString(); + final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(); + final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString(); + + final String escAttrSep = "%" + (int) attrSep.charAt(0); + final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0); + final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0); + + return value.replace(escAttrSep, attrSep).replace(escAttrTupleSep, attrTupleSep).replace(escAttrValueSep, attrValueSep); + } + + /** + * Appends the string representation of an object to a StringBuilder. + * + * @param strBuilder + * The StringBuilder to append to. + * @param val + * The string representation of an object. + */ + public static void appendIfNotNull(final StringBuilder strBuilder, final Object val) { + + if (val != null) { + strBuilder.append(val); + } + } + + /** + * Given a separator and a list of strings, joins the list, as a string, separated by the separator string. + * + * @param list + * The list of strings to join. + * @param separator + * The separator string. + * @return the list, as a string, separated by the separator string. + */ + public static String listToString(final List list, final String separator) { + + final StringBuilder strBuilder = new StringBuilder(); + for (final String s : list) { + if (!StringUtils.isEmpty(s)) { + strBuilder.append(AttributeUtil.escape(s) + separator); + } + } + return strBuilder.toString(); + } + + /** + * Given a separator and a map of strings to strings, joins the map, as a string, separated by the separator string with the pair key/value concatenated with a '='. + * + * @param map + * The map of strings to join. + * @param separator + * The separator string. + * + * @return the map of strings, as a string, separated by the separator string with the pair key/value concatenated with a '='. + */ + public static String mapToString(final Map map, final String separator) { + + final StringBuilder strBuilder = new StringBuilder(); + final Iterator> valuesIt = map.entrySet().iterator(); + while (valuesIt.hasNext()) { + final Entry entry = valuesIt.next(); + strBuilder.append(entry.getKey()); + strBuilder.append('='); + strBuilder.append(AttributeUtil.escape(entry.getValue())); + strBuilder.append(separator); + } + return strBuilder.toString(); + } + + /** + * Validates the attribute value format. + * + * @param value + * The attribute value to validate. + * + * @return true if value has a valid format. + */ + public static boolean isValidValue(final String value) { + boolean retVal = false; + if (value != null && value.charAt(0) == '[' && value.endsWith("]")) { + final String tmpAttrValue = value.substring(1, value.length() - 1); + final String[] vals = tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); + + if (tmpAttrValue.length() >= 0 || (vals.length > 0 && vals[0].length() > 0)) { + retVal = true; + } + } + return retVal; + } + + /** + * Validates the attribute type value. It's case insensitive. E.g. return true value to: a) "true", "TRUE", "True", ... b) "false", "FALSE", "False", ... + * + * @param type + * The attribute type value. + * + * @return true if type has a true or false (case insensitive) value. + */ + public static boolean isValidType(final String type) { + return StringUtils.isNotEmpty(type) && (PEPSValues.TRUE.toString().equalsIgnoreCase(type) || PEPSValues.FALSE.toString().equalsIgnoreCase(type)); + } + + /** + * Validates the Personal attribute tuple. E.g. name:type:[value]:status + * + * @param tuples + * The Personal attribute's tuple. + * + * @return true if the tuples' format is valid. + * + * @see PEPSUtil#validateParameter(String, String, String) + * @see String#equalsIgnoreCase(String) + */ + public static boolean hasValidTuples(final String[] tuples) { + boolean retVal = false; + + final int numberTuples = AttributeConstants.NUMBER_TUPLES.intValue(); + if (tuples != null && tuples.length == numberTuples) { + // validate attrName + final int attrNameIndex = AttributeConstants.ATTR_NAME_INDEX.intValue(); + final int attrTypeIndex = AttributeConstants.ATTR_TYPE_INDEX.intValue(); + final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue(); + + retVal = StringUtils.isNotEmpty(tuples[attrNameIndex]) && StringUtils.isNotEmpty(tuples[attrTypeIndex]) && StringUtils.isNotEmpty(tuples[attrValueIndex]) + && AttributeUtil.isValidType(tuples[attrTypeIndex]) && AttributeUtil.isValidValue(tuples[attrValueIndex]); + } + return retVal; + } + + /** + * Check if all mandatory attributes have values. + * + * @param personalAttrList + * The Personal Attributes List. + * + * @return true if all mandatory attributes have values, false if at least one attribute doesn't have value. + */ + public static boolean checkMandatoryAttributes(final IPersonalAttributeList personalAttrList) { + + final Iterator itAttributes = personalAttrList.values().iterator(); + boolean retVal = true; + while (itAttributes.hasNext() && retVal) { + final PersonalAttribute attr = itAttributes.next(); + if (attr.isRequired() && !STORKStatusCode.STATUS_AVAILABLE.toString().equals(attr.getStatus())) { + retVal = false; + } + } + return retVal; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java index 9ebcfbd5a..a1b6c5a53 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java @@ -17,107 +17,105 @@ import java.util.ArrayList; import java.util.List; /** - * This class is a bean used to store the information relative to the Citizen - * Consent. + * This class is a bean used to store the information relative to the Citizen Consent. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ */ public final class CitizenConsent { - - /** - * Mandatory attributes list. - */ - private List mandatoryList; - - /** - * Optional attributes list. - */ - private List optionalList; - - /** - * Citizen Consent default Constructor. - */ - public CitizenConsent() { - this.mandatoryList = new ArrayList(); - this.optionalList = new ArrayList(); - } - - /** - * Getter for the mandatoryList value. - * - * @return The mandatoryList value. - */ - public List getMandatoryList() { - return this.mandatoryList; - } - - /** - * Setter for the mandatoryList value. - * - * @param mandatoryAttrList Mandatory parameters list. - */ - public void setMandatoryList(final List mandatoryAttrList) { - this.mandatoryList = mandatoryAttrList; - } - - /** - * Setter for some mandatoryAttribute. Adds the input parameter to the - * mandatoryList. - * - * @param mandatoryAttr Attribute to add to the mandatoryList. - */ - public void setMandatoryAttribute(final String mandatoryAttr) { - this.mandatoryList.add(mandatoryAttr); - } - - /** - * Getter for the optionalList value. - * - * @return The optionalList value. - */ - public List getOptionalList() { - return optionalList; - } - - /** - * Setter for the optionalList value. - * - * @param optAttrList Optional parameters list. - */ - public void setOptionalList(final List optAttrList) { - this.optionalList = optAttrList; - } - - /** - * Setter for some optionalAttr. Adds the input parameter to the optionalList. - * - * @param optionalAttr Attribute to add to the optionalList. - */ - public void setOptionalAttribute(final String optionalAttr) { - this.optionalList.add(optionalAttr); - } - - /** - * Returns a string in the following format. "Mandatory attributes: - * mandatoryAttr1;mandatoryAttr2;mandatoryAttrN Optional attributes: - * optionalAttr1;optionalAttr2;optionalAttrN" - * - * @return {@inheritDoc} - */ - public String toString() { - final StringBuilder strbldr = new StringBuilder(46); - strbldr.append("Mandatory attributes: "); - for (final String str : mandatoryList) { - strbldr.append(str).append(';'); - } - strbldr.append(" Optional attributes: "); - for (final String str : optionalList) { - strbldr.append(str).append(';'); - } - return strbldr.toString(); - } - + + /** + * Mandatory attributes list. + */ + private List mandatoryList; + + /** + * Optional attributes list. + */ + private List optionalList; + + /** + * Citizen Consent default Constructor. + */ + public CitizenConsent() { + this.mandatoryList = new ArrayList(); + this.optionalList = new ArrayList(); + } + + /** + * Getter for the mandatoryList value. + * + * @return The mandatoryList value. + */ + public List getMandatoryList() { + return this.mandatoryList; + } + + /** + * Setter for the mandatoryList value. + * + * @param mandatoryAttrList + * Mandatory parameters list. + */ + public void setMandatoryList(final List mandatoryAttrList) { + this.mandatoryList = mandatoryAttrList; + } + + /** + * Setter for some mandatoryAttribute. Adds the input parameter to the mandatoryList. + * + * @param mandatoryAttr + * Attribute to add to the mandatoryList. + */ + public void setMandatoryAttribute(final String mandatoryAttr) { + this.mandatoryList.add(mandatoryAttr); + } + + /** + * Getter for the optionalList value. + * + * @return The optionalList value. + */ + public List getOptionalList() { + return optionalList; + } + + /** + * Setter for the optionalList value. + * + * @param optAttrList + * Optional parameters list. + */ + public void setOptionalList(final List optAttrList) { + this.optionalList = optAttrList; + } + + /** + * Setter for some optionalAttr. Adds the input parameter to the optionalList. + * + * @param optionalAttr + * Attribute to add to the optionalList. + */ + public void setOptionalAttribute(final String optionalAttr) { + this.optionalList.add(optionalAttr); + } + + /** + * Returns a string in the following format. "Mandatory attributes: mandatoryAttr1;mandatoryAttr2;mandatoryAttrN Optional attributes: optionalAttr1;optionalAttr2;optionalAttrN" + * + * @return {@inheritDoc} + */ + public String toString() { + final StringBuilder strbldr = new StringBuilder(46); + strbldr.append("Mandatory attributes: "); + for (final String str : mandatoryList) { + strbldr.append(str).append(';'); + } + strbldr.append(" Optional attributes: "); + for (final String str : optionalList) { + strbldr.append(str).append(';'); + } + return strbldr.toString(); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java index 001f9317a..7bef0c628 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java @@ -18,78 +18,80 @@ import java.io.Serializable; /** * This class is a bean used to store the information relative to the Country. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.10 $, $Date: 2010-11-17 05:15:28 $ */ public final class Country implements Serializable { - - /** + + /** * */ private static final long serialVersionUID = 1135994036496370993L; -/** - * Country Id. - */ - private String countryId; - - /** - * Country Name. - */ - private String countryName; - - /** - * Country Constructor. - * - * @param cId Id of the Country. - * @param cName Name of the Country. - */ - public Country(final String cId, final String cName) { - - this.countryId = cId; - this.countryName = cName; - } - - /** - * Getter for the countryId value. - * - * @return The countryId value. - */ - public String getCountryId() { - - return countryId; - } - - /** - * Setter for the countryId value. - * - * @param cId Id of the Country. - */ - public void setCountryId(final String cId) { - - this.countryId = cId; - } - - /** - * Getter for the countryName value. - * - * @return The countryName value. - */ - public String getCountryName() { - - return countryName; - } - - /** - * Setter for the countryName value. - * - * @param name Name of the Country. - */ - public void setCountryName(final String name) { - - this.countryName = name; - } - + /** + * Country Id. + */ + private String countryId; + + /** + * Country Name. + */ + private String countryName; + + /** + * Country Constructor. + * + * @param cId + * Id of the Country. + * @param cName + * Name of the Country. + */ + public Country(final String cId, final String cName) { + + this.countryId = cId; + this.countryName = cName; + } + + /** + * Getter for the countryId value. + * + * @return The countryId value. + */ + public String getCountryId() { + + return countryId; + } + + /** + * Setter for the countryId value. + * + * @param cId + * Id of the Country. + */ + public void setCountryId(final String cId) { + + this.countryId = cId; + } + + /** + * Getter for the countryName value. + * + * @return The countryName value. + */ + public String getCountryName() { + + return countryName; + } + + /** + * Setter for the countryName value. + * + * @param name + * Name of the Country. + */ + public void setCountryName(final String name) { + + this.countryName = name; + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java index 54345f3ea..5cf7a9751 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java @@ -19,61 +19,43 @@ import java.util.List; /** * This class contains all the ISO 3166-1 Alpha 3 Country Codes. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.2 $, $Date: 2011-04-14 00:24:56 $ */ public final class CountryCodes { - - /** - * Private Constructor. - */ - private CountryCodes() { - - } - - /** - * ISO 3166-1 Alpha 3 Country Codes. - */ - private static List countrysAlpha3 = Arrays.asList("ABW", "AFG", - "AGO", "AIA", "ALA", "ALB", "AND", "ANT", "ARE", "ARG", "ARM", "ASM", - "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI", "BEL", "BEN", "BES", - "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU", - "BOL", "BRA", "BRB", "BRN", "BTN", "BUR", "BVT", "BWA", "BYS", "CAF", - "CAN", "CCK", "CHE", "CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK", - "COL", "COM", "CPV", "CRI", "CSK", "CUB", "CUW", "CXR", "CYM", "CYP", - "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY", "ERI", - "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO", "FSM", - "GAB", "GBR", "GEO", "GGY", "GHA", "GIB", "GIN", "GLP", "GMB", "GNB", - "GNQ", "GRC", "GRD", "GRL", "GTM", "GUF", "GUM", "GUY", "HKG", "HMD", - "HND", "HRV", "HTI", "HUN", "IDN", "IMN", "IND", "IOT", "IRL", "IRN", - "IRQ", "ISL", "ISR", "ITA", "JAM", "JEY", "JOR", "JPN", "KAZ", "KEN", - "KGZ", "KHM", "KIR", "KNA", "KOR", "KWT", "LAO", "LBN", "LBR", "LBY", - "LCA", "LIE", "LKA", "LSO", "LTU", "LUX", "LVA", "MAC", "MAF", "MAR", - "MCO", "MDA", "MDG", "MDV", "MEX", "MHL", "MKD", "MLI", "MLT", "MMR", - "MNE", "MNG", "MNP", "MOZ", "MRT", "MSR", "MTQ", "MUS", "MWI", "MYS", - "MYT", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NIU", "NLD", "NOR", - "NPL", "NRU", "NZL", "OMN", "PAK", "PAN", "PCN", "PER", "PHL", "PLW", - "PNG", "POL", "PRI", "PRK", "PRT", "PRY", "PSE", "PYF", "QAT", "REU", - "ROM", "ROU", "RUS", "RWA", "SAU", "SCG", "SDN", "SEN", "SGP", "SGS", - "SHN", "SJM", "SLB", "SLE", "SLV", "SMR", "SOM", "SPM", "SRB", "STP", - "SUR", "SVK", "SVN", "SXW", "SWE", "SWZ", "SYC", "SYR", "TCA", "TCD", - "TGO", "THA", "TJK", "TKL", "TKM", "TLS", "TMP", "TON", "TTO", "TUN", - "TUR", "TUV", "TWN", "TZA", "UGA", "UKR", "UMI", "URY", "USA", "UZB", - "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", - "YUG", "ZAF", "ZAR", "ZMB", "ZWE"); - - /** - * Searches the CountryCode (3166-1 alpha3 format) an return true if it - * exists. - * - * @param countryCode The Country code to search. - * - * @return true if the CountryCode exists, false otherwise. - */ - public static boolean hasCountryCodeAlpha3(final String countryCode) { - - return CountryCodes.countrysAlpha3.contains(countryCode); - } + + /** + * Private Constructor. + */ + private CountryCodes() { + + } + + /** + * ISO 3166-1 Alpha 3 Country Codes. + */ + private static List countrysAlpha3 = Arrays.asList("ABW", "AFG", "AGO", "AIA", "ALA", "ALB", "AND", "ANT", "ARE", "ARG", "ARM", "ASM", "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI", + "BEL", "BEN", "BES", "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU", "BOL", "BRA", "BRB", "BRN", "BTN", "BUR", "BVT", "BWA", "BYS", "CAF", "CAN", "CCK", "CHE", + "CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK", "COL", "COM", "CPV", "CRI", "CSK", "CUB", "CUW", "CXR", "CYM", "CYP", "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY", + "ERI", "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO", "FSM", "GAB", "GBR", "GEO", "GGY", "GHA", "GIB", "GIN", "GLP", "GMB", "GNB", "GNQ", "GRC", "GRD", "GRL", "GTM", + "GUF", "GUM", "GUY", "HKG", "HMD", "HND", "HRV", "HTI", "HUN", "IDN", "IMN", "IND", "IOT", "IRL", "IRN", "IRQ", "ISL", "ISR", "ITA", "JAM", "JEY", "JOR", "JPN", "KAZ", "KEN", "KGZ", + "KHM", "KIR", "KNA", "KOR", "KWT", "LAO", "LBN", "LBR", "LBY", "LCA", "LIE", "LKA", "LSO", "LTU", "LUX", "LVA", "MAC", "MAF", "MAR", "MCO", "MDA", "MDG", "MDV", "MEX", "MHL", "MKD", + "MLI", "MLT", "MMR", "MNE", "MNG", "MNP", "MOZ", "MRT", "MSR", "MTQ", "MUS", "MWI", "MYS", "MYT", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NIU", "NLD", "NOR", "NPL", "NRU", "NZL", + "OMN", "PAK", "PAN", "PCN", "PER", "PHL", "PLW", "PNG", "POL", "PRI", "PRK", "PRT", "PRY", "PSE", "PYF", "QAT", "REU", "ROM", "ROU", "RUS", "RWA", "SAU", "SCG", "SDN", "SEN", "SGP", + "SGS", "SHN", "SJM", "SLB", "SLE", "SLV", "SMR", "SOM", "SPM", "SRB", "STP", "SUR", "SVK", "SVN", "SXW", "SWE", "SWZ", "SYC", "SYR", "TCA", "TCD", "TGO", "THA", "TJK", "TKL", "TKM", + "TLS", "TMP", "TON", "TTO", "TUN", "TUR", "TUV", "TWN", "TZA", "UGA", "UKR", "UMI", "URY", "USA", "UZB", "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "YUG", + "ZAF", "ZAR", "ZMB", "ZWE"); + + /** + * Searches the CountryCode (3166-1 alpha3 format) an return true if it exists. + * + * @param countryCode + * The Country code to search. + * + * @return true if the CountryCode exists, false otherwise. + */ + public static boolean hasCountryCodeAlpha3(final String countryCode) { + + return CountryCodes.countrysAlpha3.contains(countryCode); + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java index 9c0bd6775..0c59e117f 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java @@ -27,143 +27,134 @@ import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException; /** * This class holds static helper methods for Date Operations. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.4 $, $Date: 2010-11-17 05:15:28 $ */ public final class DateUtil { - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(DateUtil.class.getName()); - - /** - * yyyy Date format size. - */ - private static final int YEAR_DATE_SIZE = 4; - - /** - * yyyyMM Date format size. - */ - private static final int MONTH_DATE_SIZE = 6; - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private DateUtil() { - // empty constructor - } - - /** - * Fulfils dateValue with a valid date. The following roles are applied: a) If - * the dateValue only contains the year then fulfils with last year's day. - * e.g. this method returns 19951231 to the 1995 dateValue. b) If the - * dateValue contains the year and the month then fulfils with last month's - * day. e.g. this method returns 19950630 to the 199505 dateValue. - * - * @param dateValue The date to be fulfilled. - * - * @return The dateValue fulfilled. - */ - private static String fulfilDate(final String dateValue) { - - final StringBuffer strBuf = new StringBuffer(); - strBuf.append(dateValue); - // if the IdP just provides the year then we must fullfil the date. - if (dateValue.length() == YEAR_DATE_SIZE) { - strBuf.append(PEPSValues.LAST_MONTH.toString()); - } - // if the IdP provides the year and the month then we must fullfil the - // date. - if (dateValue.length() == MONTH_DATE_SIZE - || strBuf.length() == MONTH_DATE_SIZE) { - // IdP doesn't provide the day, so we will use DateTime to - // calculate it. - final String noDayCons = PEPSValues.NO_DAY_DATE_FORMAT.toString(); - final DateTimeFormatter fmt = DateTimeFormat.forPattern(noDayCons); - final DateTime dateTime = fmt.parseDateTime(strBuf.toString()); - // Append the last month's day. - strBuf.append(dateTime.dayOfMonth().withMaximumValue().getDayOfMonth()); - } - - return strBuf.toString(); - } - - /** - * Validates the dateValue format: a) if has a valid size; b) if has a numeric - * value; Note: dateValue must have the format yyyyMMdd. - * - * @param dateValueTmp The date to be validated. - * @param pattern The accepted date format. - * - * @return true if the date has a valid format. - */ - public static boolean isValidFormatDate(final String dateValueTmp, - final String pattern) { - - boolean retVal = true; - try { - final String dateValue = DateUtil.fulfilDate(dateValueTmp); - - final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); - fmt.parseDateTime(dateValue); - } catch (final Exception e) { - // We catch Exception because we only have to return false - // value! - retVal = false; - } - return retVal; - } - - /** - * Calculates the age for a given date string. - * - * @param dateVal The date to be validated. - * @param now The current date. - * @param pattern The date pattern. - * - * @return The age value. - */ - public static int calculateAge(final String dateVal, final DateTime now, - final String pattern) { - - if (DateUtil.isValidFormatDate(dateVal, pattern)) { - try { - final String dateValueTemp = DateUtil.fulfilDate(dateVal); - final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); - final DateTime dateTime = fmt.parseDateTime(dateValueTemp); - // Calculating age - final Years age = Years.yearsBetween(dateTime, now); - - return age.getYears(); - } catch (final IllegalArgumentException e) { - LOG.warn("Invalid date format (" + pattern - + ") or an invalid dateValue."); - throw new SecurityPEPSException( - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()), - e); - } - } else { - LOG.warn("Couldn't calculate Age, invalid date!"); - throw new SecurityPEPSException( - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage())); - } - - } - - /** - * Generates the current timestamp. - * - * @return timestamp The current timestamp - */ - public static Timestamp currentTimeStamp() { - final GregorianCalendar cal = new GregorianCalendar(); - final long millis = cal.getTimeInMillis(); - return new Timestamp(millis); - } - + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(DateUtil.class.getName()); + + /** + * yyyy Date format size. + */ + private static final int YEAR_DATE_SIZE = 4; + + /** + * yyyyMM Date format size. + */ + private static final int MONTH_DATE_SIZE = 6; + + /** + * Private constructor. Prevents the class from being instantiated. + */ + private DateUtil() { + // empty constructor + } + + /** + * Fulfils dateValue with a valid date. The following roles are applied: a) If the dateValue only contains the year then fulfils with last year's day. e.g. this method returns 19951231 to the 1995 + * dateValue. b) If the dateValue contains the year and the month then fulfils with last month's day. e.g. this method returns 19950630 to the 199505 dateValue. + * + * @param dateValue + * The date to be fulfilled. + * + * @return The dateValue fulfilled. + */ + private static String fulfilDate(final String dateValue) { + + final StringBuffer strBuf = new StringBuffer(); + strBuf.append(dateValue); + // if the IdP just provides the year then we must fullfil the date. + if (dateValue.length() == YEAR_DATE_SIZE) { + strBuf.append(PEPSValues.LAST_MONTH.toString()); + } + // if the IdP provides the year and the month then we must fullfil the + // date. + if (dateValue.length() == MONTH_DATE_SIZE || strBuf.length() == MONTH_DATE_SIZE) { + // IdP doesn't provide the day, so we will use DateTime to + // calculate it. + final String noDayCons = PEPSValues.NO_DAY_DATE_FORMAT.toString(); + final DateTimeFormatter fmt = DateTimeFormat.forPattern(noDayCons); + final DateTime dateTime = fmt.parseDateTime(strBuf.toString()); + // Append the last month's day. + strBuf.append(dateTime.dayOfMonth().withMaximumValue().getDayOfMonth()); + } + + return strBuf.toString(); + } + + /** + * Validates the dateValue format: a) if has a valid size; b) if has a numeric value; Note: dateValue must have the format yyyyMMdd. + * + * @param dateValueTmp + * The date to be validated. + * @param pattern + * The accepted date format. + * + * @return true if the date has a valid format. + */ + public static boolean isValidFormatDate(final String dateValueTmp, final String pattern) { + + boolean retVal = true; + try { + final String dateValue = DateUtil.fulfilDate(dateValueTmp); + + final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); + fmt.parseDateTime(dateValue); + } catch (final Exception e) { + // We catch Exception because we only have to return false + // value! + retVal = false; + } + return retVal; + } + + /** + * Calculates the age for a given date string. + * + * @param dateVal + * The date to be validated. + * @param now + * The current date. + * @param pattern + * The date pattern. + * + * @return The age value. + */ + public static int calculateAge(final String dateVal, final DateTime now, final String pattern) { + + if (DateUtil.isValidFormatDate(dateVal, pattern)) { + try { + final String dateValueTemp = DateUtil.fulfilDate(dateVal); + final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern); + final DateTime dateTime = fmt.parseDateTime(dateValueTemp); + // Calculating age + final Years age = Years.yearsBetween(dateTime, now); + + return age.getYears(); + } catch (final IllegalArgumentException e) { + LOG.warn("Invalid date format (" + pattern + ") or an invalid dateValue."); + throw new SecurityPEPSException(PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()), e); + } + } else { + LOG.warn("Couldn't calculate Age, invalid date!"); + throw new SecurityPEPSException(PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage())); + } + + } + + /** + * Generates the current timestamp. + * + * @return timestamp The current timestamp + */ + public static Timestamp currentTimeStamp() { + final GregorianCalendar cal = new GregorianCalendar(); + final long millis = cal.getTimeInMillis(); + return new Timestamp(millis); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java index b13c70f04..ffae4ae67 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java @@ -13,136 +13,144 @@ import java.util.Map; * @see IPersonalAttributeList */ public interface IAttributeListProcessor { - - /** - * Checks if attribute list only contains allowed attributes. - * - * @param attrList the requested attribute list - * @param attributes the allowed attributes - * - * @return true is all the attributes are allowed. - * - * @see IPersonalAttributeList - */ - boolean hasAllowedAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Lookup for business attribute. - * - * @param attrList the requested attribute list - * @param normalAttributes the normal attributes - * - * @return true is at least one business attribute was requested. - * - * @see IPersonalAttributeList - */ - boolean hasBusinessAttributes(final IPersonalAttributeList attrList, final List normalAttributes); - - /** - * Lookup for business attribute in normal attribute list (loaded by - * implementation). - * - * @param attrList the requested attribute list - * - * @return true is at least one business attribute was requested. - * - * @see IPersonalAttributeList - */ - boolean hasBusinessAttributes(final IPersonalAttributeList attrList); - - /** - * Adds eIdentifier, name, surname, and DateOfBirth attributes to get business - * attributes from some AP. - * - * @param attrList the requested attribute list - * @param attributes the list of attributes to add (eIdentifier, name, - * surname, and DateOfBirth). - * - * @return the requested attribute list and the new attributes added - * (eIdentifier, name, surname, and DateOfBirth). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Adds eIdentifier, name, surname, and DateOfBirth attributes, loaded by - * implementation, to get business attributes from some AP. - * - * @param attrList the requested attribute list - * - * @return the requested attribute list and the new attributes added - * (eIdentifier, name, surname, and DateOfBirth). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList); - - /** - * Removes from attribute list the given list of attributes. - * - * @param attrList the requested attribute list - * @param attributes the list of attributes to remove. - * - * @return the requested attribute list and the attributes removed. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList removeAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); - - /** - * Removes from attribute list the given list of attributes and change - * attributes status if attribute was optional in the request. - * - * @param attrList the requested attribute list - * @param attributes the map of attributes (attribute name, mandatory/optional) to remove. - * - * @return the requested attribute list and the attributes removed - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList removeAPMandatoryAttributes(IPersonalAttributeList attrList, Map attributes); - - /** - * Checks if mandate attribute exist in the requested Attribute List. Power - * attribute name to lookup is loaded by implementation. - * - * @param attrList the requested attribute list. - * - * @return true if mandate attribute exists or false otherwise. - * - * @see IPersonalAttributeList - */ - boolean hasPowerAttribute(final IPersonalAttributeList attrList); - - /** - * Checks if attribute name was requested and has value. - * - * @param attrList the requested attribute list. - * @param attrName the attribute name to lookup for . - * - * @return true if attribute was requested and has value or false otherwise. - * - * @see IPersonalAttributeList - */ - boolean hasAttributeValue(final IPersonalAttributeList attrList, final String attrName); - - /** - * Checks if attribute has value. - * - * @param attr the attribute to check. - * - * @return true if has value; - * - * @see PersonalAttribute - */ - boolean hasAttributeValue(final PersonalAttribute attr); - - /** - * Gets a map (attribute name, attribute isRequired) of attributes added to attribute list. - * - * @return the Map of attributes added and if is required to attribute list. - */ - Map getNormalAttributesAdded(); + + /** + * Checks if attribute list only contains allowed attributes. + * + * @param attrList + * the requested attribute list + * @param attributes + * the allowed attributes + * + * @return true is all the attributes are allowed. + * + * @see IPersonalAttributeList + */ + boolean hasAllowedAttributes(final IPersonalAttributeList attrList, final List attributes); + + /** + * Lookup for business attribute. + * + * @param attrList + * the requested attribute list + * @param normalAttributes + * the normal attributes + * + * @return true is at least one business attribute was requested. + * + * @see IPersonalAttributeList + */ + boolean hasBusinessAttributes(final IPersonalAttributeList attrList, final List normalAttributes); + + /** + * Lookup for business attribute in normal attribute list (loaded by implementation). + * + * @param attrList + * the requested attribute list + * + * @return true is at least one business attribute was requested. + * + * @see IPersonalAttributeList + */ + boolean hasBusinessAttributes(final IPersonalAttributeList attrList); + + /** + * Adds eIdentifier, name, surname, and DateOfBirth attributes to get business attributes from some AP. + * + * @param attrList + * the requested attribute list + * @param attributes + * the list of attributes to add (eIdentifier, name, surname, and DateOfBirth). + * + * @return the requested attribute list and the new attributes added (eIdentifier, name, surname, and DateOfBirth). + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); + + /** + * Adds eIdentifier, name, surname, and DateOfBirth attributes, loaded by implementation, to get business attributes from some AP. + * + * @param attrList + * the requested attribute list + * + * @return the requested attribute list and the new attributes added (eIdentifier, name, surname, and DateOfBirth). + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList); + + /** + * Removes from attribute list the given list of attributes. + * + * @param attrList + * the requested attribute list + * @param attributes + * the list of attributes to remove. + * + * @return the requested attribute list and the attributes removed. + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList removeAPMandatoryAttributes(final IPersonalAttributeList attrList, final List attributes); + + /** + * Removes from attribute list the given list of attributes and change attributes status if attribute was optional in the request. + * + * @param attrList + * the requested attribute list + * @param attributes + * the map of attributes (attribute name, mandatory/optional) to remove. + * + * @return the requested attribute list and the attributes removed + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList removeAPMandatoryAttributes(IPersonalAttributeList attrList, Map attributes); + + /** + * Checks if mandate attribute exist in the requested Attribute List. Power attribute name to lookup is loaded by implementation. + * + * @param attrList + * the requested attribute list. + * + * @return true if mandate attribute exists or false otherwise. + * + * @see IPersonalAttributeList + */ + boolean hasPowerAttribute(final IPersonalAttributeList attrList); + + /** + * Checks if attribute name was requested and has value. + * + * @param attrList + * the requested attribute list. + * @param attrName + * the attribute name to lookup for . + * + * @return true if attribute was requested and has value or false otherwise. + * + * @see IPersonalAttributeList + */ + boolean hasAttributeValue(final IPersonalAttributeList attrList, final String attrName); + + /** + * Checks if attribute has value. + * + * @param attr + * the attribute to check. + * + * @return true if has value; + * + * @see PersonalAttribute + */ + boolean hasAttributeValue(final PersonalAttribute attr); + + /** + * Gets a map (attribute name, attribute isRequired) of attributes added to attribute list. + * + * @return the Map of attributes added and if is required to attribute list. + */ + Map getNormalAttributesAdded(); } \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java index 733399ca3..aa0ddf85b 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java @@ -10,73 +10,72 @@ import java.util.Iterator; * @version $Revision: 1.00 $, $Date: 2013-09-20 $ */ public interface IAttributeProvidersMap { - - /** - * Returns the object associated the the given key. - * - * @param key with which the specified value is to be associated. - * - * @return The object associated the the given key. - */ - IPersonalAttributeList get(AttributeSource key); - - /** - * Associates a key to a value, and inserts them in the session object. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object put(AttributeSource key, IPersonalAttributeList value); - - /** - * Removes the mapping for this key. - * - * @param key with which the specified value is to be associated. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - IPersonalAttributeList remove(AttributeSource key); - - /** - * Returns the number of key-value mappings in this map. - * - * @return the number of key-value mappings in this map. - */ - int size(); - - /** - * Returns true if this map contains a mapping for the specified key. - * - * @param key with which the specified value is to be associated. - * - * @return true if this map contains a mapping for the specified key. - */ - boolean containsKey(AttributeSource key); - - /** - * Removes all mappings from this map. - */ - void clear(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); - /** - * Returns an Iterator of the keys contained in this map. The implementation must - * take care in order for the Iterator to have predictable order of the returned - * keys. - * - * @return an iterator of the keys contained in this map - */ - Iterator keyIterator(); + /** + * Returns the object associated the the given key. + * + * @param key + * with which the specified value is to be associated. + * + * @return The object associated the the given key. + */ + IPersonalAttributeList get(AttributeSource key); + + /** + * Associates a key to a value, and inserts them in the session object. + * + * @param key + * with which the specified value is to be associated. + * @param value + * to be associated with the specified key. + * + * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key. + */ + Object put(AttributeSource key, IPersonalAttributeList value); + + /** + * Removes the mapping for this key. + * + * @param key + * with which the specified value is to be associated. + * + * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key. + */ + IPersonalAttributeList remove(AttributeSource key); + + /** + * Returns the number of key-value mappings in this map. + * + * @return the number of key-value mappings in this map. + */ + int size(); + + /** + * Returns true if this map contains a mapping for the specified key. + * + * @param key + * with which the specified value is to be associated. + * + * @return true if this map contains a mapping for the specified key. + */ + boolean containsKey(AttributeSource key); + + /** + * Removes all mappings from this map. + */ + void clear(); + + /** + * Returns true if this map contains no key-value mappings. + * + * @return true if this map contains no key-value mappings. + */ + boolean isEmpty(); + + /** + * Returns an Iterator of the keys contained in this map. The implementation must take care in order for the Iterator to have predictable order of the returned keys. + * + * @return an iterator of the keys contained in this map + */ + Iterator keyIterator(); } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java index b24c915c0..71b3400b4 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java @@ -20,175 +20,158 @@ import java.util.Set; /** * Interface for {@link PersonalAttributeList}. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.16 $, $Date: 2010-11-17 05:15:28 $ * * @see PersonalAttribute */ @SuppressWarnings("PMD.CloneMethodMustImplementCloneable") -public interface IPersonalAttributeList extends Iterable, - Cloneable { - - /** - * Associates the specified value with the specified key in this Personal - * Attribute List. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return the previous value associated with key, or null if there was no - * mapping for key. - * - * @see PersonalAttribute - */ - PersonalAttribute put(String key, PersonalAttribute value); - - /** - * Returns the value to which the specified key is mapped, or null if this map - * contains no mapping for the key. - * - * @param key whose associated value is to be returned. - * - * @return The value to which the specified key is mapped, or null if this map - * contains no mapping for the key. - * - * @see PersonalAttribute - */ - PersonalAttribute get(Object key); - - /** - * Adds to the PersonalAttributeList the given PersonalAttribute. It sets the - * attribute name as the key to the attribute value. - * - * @param value PersonalAttribute to add to the PersonalAttributeList - */ - void add(PersonalAttribute value); - - /** - * Get the size of the Personal Attribute List. - * - * @return size of the Personal Attribute List. - */ - int size(); - - /** - * Checks if the Personal Attribute List contains the given key. - * - * @param key with which the specified value is to be associated. - * - * @return true if the Personal Attribute List contains the given key, false - * otherwise. - */ - boolean containsKey(Object key); - - /** - * Getter for the iterator of the Personal Attribute List values. - * - * @return The iterator for the Personal Attribute List values. - * - * @see PersonalAttribute - */ - Iterator iterator(); - - /** - * Creates a Personal Attribute List from a String representing an Attribute - * List. - * - * @param attrList String Object representing the attribute list. - */ - void populate(String attrList); - - /** - * Removes the mapping for this key from this map if present. - * - * @param key key whose mapping is to be removed from the map. - * @return previous value associated with specified key, or null if - * there was no mapping for key. A null return can also - * indicate that the map previously associated null with the - * specified key. - */ - PersonalAttribute remove(Object key); - - /** - * Returns a collection view of the values contained in this map. The - * collection is backed by the map, so changes to the map are reflected in the - * collection, and vice-versa. The collection supports element removal, which - * removes the corresponding mapping from this map, via the - * Iterator.remove, Collection.remove, removeAll, - * retainAll, and clear operations. It does not support the - * add or addAll operations. - * - * @return a collection view of the values contained in this map. - */ - Collection values(); - - /** - * Returns a {@link Set} view of the keys contained in this map. - * The set is backed by the map, so changes to the map are - * reflected in the set, and vice-versa. If the map is modified - * while an iteration over the set is in progress (except through - * the iterator's own remove operation), the results of - * the iteration are undefined. The set supports element removal, - * which removes the corresponding mapping from the map, via the - * Iterator.remove, Set.remove, - * removeAll, retainAll, and clear - * operations. It does not support the add or addAll - * operations. - * - * @return a set view of the keys contained in this map - */ - Set keySet(); - - - /** - * Returns a IPersonalAttributeList of the complex attributes. - * - * @return an IPersonalAttributeList of the complex attributes. - */ - IPersonalAttributeList getComplexAttributes(); - - /** - * Returns a IPersonalAttributeList of the simple value attributes. - * - * @return an IPersonalAttributeList of the simple value attributes. - */ - IPersonalAttributeList getSimpleValueAttributes(); - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - IPersonalAttributeList getMandatoryAttributes(); - - /** - * Returns a IPersonalAttributeList of the optional attributes in this map. - * - * @return an IPersonalAttributeList of the optional attributes contained in this map. - */ - IPersonalAttributeList getOptionalAttributes(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); - - /** - * Returns true if this map contains at least one element that doesn't have value. - * - * @return true if this map contains at least one element that doesn't have value. - */ - boolean hasMissingValues(); - - /** - * Returns a copy of this IPersonalAttributeList instance. - * - * @return The copy of this IPersonalAttributeList. - */ - Object clone() throws CloneNotSupportedException; - +public interface IPersonalAttributeList extends Iterable, Cloneable { + + /** + * Associates the specified value with the specified key in this Personal Attribute List. + * + * @param key + * with which the specified value is to be associated. + * @param value + * to be associated with the specified key. + * + * @return the previous value associated with key, or null if there was no mapping for key. + * + * @see PersonalAttribute + */ + PersonalAttribute put(String key, PersonalAttribute value); + + /** + * Returns the value to which the specified key is mapped, or null if this map contains no mapping for the key. + * + * @param key + * whose associated value is to be returned. + * + * @return The value to which the specified key is mapped, or null if this map contains no mapping for the key. + * + * @see PersonalAttribute + */ + PersonalAttribute get(Object key); + + /** + * Adds to the PersonalAttributeList the given PersonalAttribute. It sets the attribute name as the key to the attribute value. + * + * @param value + * PersonalAttribute to add to the PersonalAttributeList + */ + void add(PersonalAttribute value); + + /** + * Get the size of the Personal Attribute List. + * + * @return size of the Personal Attribute List. + */ + int size(); + + /** + * Checks if the Personal Attribute List contains the given key. + * + * @param key + * with which the specified value is to be associated. + * + * @return true if the Personal Attribute List contains the given key, false otherwise. + */ + boolean containsKey(Object key); + + /** + * Getter for the iterator of the Personal Attribute List values. + * + * @return The iterator for the Personal Attribute List values. + * + * @see PersonalAttribute + */ + Iterator iterator(); + + /** + * Creates a Personal Attribute List from a String representing an Attribute List. + * + * @param attrList + * String Object representing the attribute list. + */ + void populate(String attrList); + + /** + * Removes the mapping for this key from this map if present. + * + * @param key + * key whose mapping is to be removed from the map. + * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null + * with the specified key. + */ + PersonalAttribute remove(Object key); + + /** + * Returns a collection view of the values contained in this map. The collection is backed by the map, so changes to the map are reflected in the collection, and vice-versa. The collection + * supports element removal, which removes the corresponding mapping from this map, via the Iterator.remove, Collection.remove, removeAll, retainAll, and + * clear operations. It does not support the add or addAll operations. + * + * @return a collection view of the values contained in this map. + */ + Collection values(); + + /** + * Returns a {@link Set} view of the keys contained in this map. The set is backed by the map, so changes to the map are reflected in the set, and vice-versa. If the map is modified while an + * iteration over the set is in progress (except through the iterator's own remove operation), the results of the iteration are undefined. The set supports element removal, which removes + * the corresponding mapping from the map, via the Iterator.remove, Set.remove, removeAll, retainAll, and clear operations. It does not support the + * add or addAll operations. + * + * @return a set view of the keys contained in this map + */ + Set keySet(); + + /** + * Returns a IPersonalAttributeList of the complex attributes. + * + * @return an IPersonalAttributeList of the complex attributes. + */ + IPersonalAttributeList getComplexAttributes(); + + /** + * Returns a IPersonalAttributeList of the simple value attributes. + * + * @return an IPersonalAttributeList of the simple value attributes. + */ + IPersonalAttributeList getSimpleValueAttributes(); + + /** + * Returns a IPersonalAttributeList of the mandatory attributes in this map. + * + * @return an IPersonalAttributeList of the mandatory attributes contained in this map. + */ + IPersonalAttributeList getMandatoryAttributes(); + + /** + * Returns a IPersonalAttributeList of the optional attributes in this map. + * + * @return an IPersonalAttributeList of the optional attributes contained in this map. + */ + IPersonalAttributeList getOptionalAttributes(); + + /** + * Returns true if this map contains no key-value mappings. + * + * @return true if this map contains no key-value mappings. + */ + boolean isEmpty(); + + /** + * Returns true if this map contains at least one element that doesn't have value. + * + * @return true if this map contains at least one element that doesn't have value. + */ + boolean hasMissingValues(); + + /** + * Returns a copy of this IPersonalAttributeList instance. + * + * @return The copy of this IPersonalAttributeList. + */ + Object clone() throws CloneNotSupportedException; + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java index 33eb618f0..1bb8cffa8 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java @@ -16,224 +16,234 @@ package eu.stork.peps.auth.commons; /** * Interface for stork logging. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $ */ public interface IStorkLogger { - - /** - * Getter for SpApplication. - * - * @return The SpApplication value. - */ - String getSpApplication(); - - /** - * Setter for SpApplication. - * - * @param spApplication The SP Application. - */ - void setSpApplication(String spApplication); - - /** - * Getter for ProviderName. - * - * @return The ProviderName value. - */ - String getProviderName(); - - /** - * Setter for ProviderName. - * - * @param providerName The provider name. - */ - void setProviderName(String providerName); - - /** - * - * Getter for Origin. - * - * @return The Origin value. - * - */ - String getOrigin(); - - /** - * Setter for Origin. - * - * @param origin The origin. - */ - void setOrigin(String origin); - - /** - * - * Getter for QAA Level. - * - * @return The QAA Level value. - * - */ - int getQaaLevel(); - - /** - * Setter for QAA Level. - * - * @param qaaLevel The qaa level. - */ - void setQaaLevel(int qaaLevel); - - /** - * - * Getter for timestamp. - * - * @return The timestamp value. - * - */ - String getTimestamp(); - - /** - * Setter for timestamp. - * - * @param timestamp The request's timestamp. - */ - void setTimestamp(String timestamp); - - /** - * Getter for InResponseTo. - * - * @return The InResponseTo value. - */ - String getInResponseTo(); - - /** - * Setter for InResponseTo. - * - * @param inResponseTo The Saml's response id. - */ - void setInResponseTo(String inResponseTo); - - /** - * Getter for InResponseToSPReq. - * - * @return The InResponseToSPReq value. - */ - String getInResponseToSPReq(); - - /** - * Setter for InResponseToSPRequ. - * - * @param inResponseToSPReq The Saml's response id. - */ - void setInResponseToSPReq(String inResponseToSPReq); - - /** - * Getter for opType. - * - * @return The opType value. - */ - String getOpType(); - - /** - * Setter for opType. - * - * @param opType The operation type. - */ - void setOpType(String opType); - - /** - * Getter for destination. - * - * @return The destination value. - */ - String getDestination(); - - /** - * Setter for destinationIp. - * - * @param destination The remote IP. - */ - void setDestination(String destination); - - /** - * Getter for message or assertion consumer. - * - * @return The message or assertion consumer. - */ - String getMessage(); - - /** - * Setter for message or assertion consumer. - * - * @param message or assertion consumer. - */ - void setMessage(String message); - - /** - * Getter for country. - * - * @return The country value. - */ - String getCountry(); - - /** - * Setter for country. - * - * @param country The country. - */ - void setCountry(String country); - - /** - * Getter for samlHash. - * - * @return The samlHash value. - */ - byte[] getSamlHash(); - - /** - * Setter for samlHash. - * - * @param samlHash the encrypted SAML token - */ - void setSamlHash(byte[] samlHash); - - /** - * Getter for msgId. - * - * @return the msgId - */ - String getMsgId(); - - /** - * Setter for msgId. - * - * @param msgId the ID of the originator of this message - */ - void setMsgId(String msgId); - - /** - * Getter for sPMsgId. - * - * @return the sPMsgId - */ - String getSPMsgId(); - - /** - * Setter for sPMsgId. - * - * @param sPMsgId the ID of the originator of this message - */ - void setSPMsgId(String sPMsgId); - - /** - * The format of the returned String must be the following: - * "requestCounter#ddMMMyyyykk:mm:ss#opType#originIp#originName - * #destinationIp#destinationName#samlHash#[originatorName#msgId#]" - * - * The values enclosed in '[]' only apply when logging responses. - * - * @return {@inheritDoc} - */ - @Override - String toString(); + + /** + * Getter for SpApplication. + * + * @return The SpApplication value. + */ + String getSpApplication(); + + /** + * Setter for SpApplication. + * + * @param spApplication + * The SP Application. + */ + void setSpApplication(String spApplication); + + /** + * Getter for ProviderName. + * + * @return The ProviderName value. + */ + String getProviderName(); + + /** + * Setter for ProviderName. + * + * @param providerName + * The provider name. + */ + void setProviderName(String providerName); + + /** + * + * Getter for Origin. + * + * @return The Origin value. + * + */ + String getOrigin(); + + /** + * Setter for Origin. + * + * @param origin + * The origin. + */ + void setOrigin(String origin); + + /** + * + * Getter for QAA Level. + * + * @return The QAA Level value. + * + */ + int getQaaLevel(); + + /** + * Setter for QAA Level. + * + * @param qaaLevel + * The qaa level. + */ + void setQaaLevel(int qaaLevel); + + /** + * + * Getter for timestamp. + * + * @return The timestamp value. + * + */ + String getTimestamp(); + + /** + * Setter for timestamp. + * + * @param timestamp + * The request's timestamp. + */ + void setTimestamp(String timestamp); + + /** + * Getter for InResponseTo. + * + * @return The InResponseTo value. + */ + String getInResponseTo(); + + /** + * Setter for InResponseTo. + * + * @param inResponseTo + * The Saml's response id. + */ + void setInResponseTo(String inResponseTo); + + /** + * Getter for InResponseToSPReq. + * + * @return The InResponseToSPReq value. + */ + String getInResponseToSPReq(); + + /** + * Setter for InResponseToSPRequ. + * + * @param inResponseToSPReq + * The Saml's response id. + */ + void setInResponseToSPReq(String inResponseToSPReq); + + /** + * Getter for opType. + * + * @return The opType value. + */ + String getOpType(); + + /** + * Setter for opType. + * + * @param opType + * The operation type. + */ + void setOpType(String opType); + + /** + * Getter for destination. + * + * @return The destination value. + */ + String getDestination(); + + /** + * Setter for destinationIp. + * + * @param destination + * The remote IP. + */ + void setDestination(String destination); + + /** + * Getter for message or assertion consumer. + * + * @return The message or assertion consumer. + */ + String getMessage(); + + /** + * Setter for message or assertion consumer. + * + * @param message + * or assertion consumer. + */ + void setMessage(String message); + + /** + * Getter for country. + * + * @return The country value. + */ + String getCountry(); + + /** + * Setter for country. + * + * @param country + * The country. + */ + void setCountry(String country); + + /** + * Getter for samlHash. + * + * @return The samlHash value. + */ + byte[] getSamlHash(); + + /** + * Setter for samlHash. + * + * @param samlHash + * the encrypted SAML token + */ + void setSamlHash(byte[] samlHash); + + /** + * Getter for msgId. + * + * @return the msgId + */ + String getMsgId(); + + /** + * Setter for msgId. + * + * @param msgId + * the ID of the originator of this message + */ + void setMsgId(String msgId); + + /** + * Getter for sPMsgId. + * + * @return the sPMsgId + */ + String getSPMsgId(); + + /** + * Setter for sPMsgId. + * + * @param sPMsgId + * the ID of the originator of this message + */ + void setSPMsgId(String sPMsgId); + + /** + * The format of the returned String must be the following: "requestCounter#ddMMMyyyykk:mm:ss#opType#originIp#originName #destinationIp#destinationName#samlHash#[originatorName#msgId#]" + * + * The values enclosed in '[]' only apply when logging responses. + * + * @return {@inheritDoc} + */ + @Override + String toString(); } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java index f38b41838..33105c58f 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java @@ -16,70 +16,69 @@ package eu.stork.peps.auth.commons; /** * Interface for stork session. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $ */ public interface IStorkSession { - - /** - * Returns the object associated the the given key. - * - * @param key with which the specified value is to be associated. - * - * @return The object associated the the given key. - */ - Object get(Object key); - - /** - * Associates a key to a value, and inserts them in the session object. - * - * @param key with which the specified value is to be associated. - * @param value to be associated with the specified key. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object put(String key, Object value); - - /** - * Removes the mapping for this key. - * - * @param key with which the specified value is to be associated. - * - * @return previous value associated with specified key, or null if there was - * no mapping for key. A null return can also indicate that the map - * previously associated null with the specified key. - */ - Object remove(Object key); - - /** - * Returns the number of key-value mappings in this map. - * - * @return the number of key-value mappings in this map. - */ - int size(); - - /** - * Returns true if this map contains a mapping for the specified key. - * - * @param key with which the specified value is to be associated. - * - * @return true if this map contains a mapping for the specified key. - */ - boolean containsKey(Object key); - - /** - * Removes all mappings from this map. - */ - void clear(); - - /** - * Returns true if this map contains no key-value mappings. - * - * @return true if this map contains no key-value mappings. - */ - boolean isEmpty(); + + /** + * Returns the object associated the the given key. + * + * @param key + * with which the specified value is to be associated. + * + * @return The object associated the the given key. + */ + Object get(Object key); + + /** + * Associates a key to a value, and inserts them in the session object. + * + * @param key + * with which the specified value is to be associated. + * @param value + * to be associated with the specified key. + * + * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key. + */ + Object put(String key, Object value); + + /** + * Removes the mapping for this key. + * + * @param key + * with which the specified value is to be associated. + * + * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key. + */ + Object remove(Object key); + + /** + * Returns the number of key-value mappings in this map. + * + * @return the number of key-value mappings in this map. + */ + int size(); + + /** + * Returns true if this map contains a mapping for the specified key. + * + * @param key + * with which the specified value is to be associated. + * + * @return true if this map contains a mapping for the specified key. + */ + boolean containsKey(Object key); + + /** + * Removes all mappings from this map. + */ + void clear(); + + /** + * Returns true if this map contains no key-value mappings. + * + * @return true if this map contains no key-value mappings. + */ + boolean isEmpty(); } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java index 94882de77..f82f6fbcc 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java @@ -9,11 +9,9 @@ import java.util.List; import org.apache.log4j.Logger; /** - * This class is a bean used to store the information of Attribute Providers, the Attribute - * List to be requested, the Assertions returned by the Attribute Providers and the values - * that each Attribute has. This information along with the current status of the Linker (the - * attribute providers that were queried and the remaining providers) is used by the PEPS - * actions in order to complete the Attribute gathering. + * This class is a bean used to store the information of Attribute Providers, the Attribute List to be requested, the Assertions returned by the Attribute Providers and the values that each Attribute + * has. This information along with the current status of the Linker (the attribute providers that were queried and the remaining providers) is used by the PEPS actions in order to complete the + * Attribute gathering. * * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr) * @@ -56,7 +54,7 @@ public final class Linker implements Serializable { public Linker() { localIndex = 0; remoteIndex = 0; - + assertions = new LinkedHashMap(); } @@ -74,13 +72,13 @@ public final class Linker implements Serializable { found = null; - if ( attributeProvidersMap!=null && !attributeProvidersMap.isEmpty() ) { + if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) { iterator = attributeProvidersMap.keyIterator(); while (iterator.hasNext()) { source = iterator.next(); - if ( source.getSourceType()==AttributeSource.SOURCE_LOCAL_APROVIDER ) { - if ( curIndex>=localIndex ) { + if (source.getSourceType() == AttributeSource.SOURCE_LOCAL_APROVIDER) { + if (curIndex >= localIndex) { found = source; break; @@ -108,13 +106,13 @@ public final class Linker implements Serializable { found = null; - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { + if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) { iterator = attributeProvidersMap.keyIterator(); while (iterator.hasNext()) { source = iterator.next(); - if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) { - if ( curIndex>=remoteIndex ) { + if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY) { + if (curIndex >= remoteIndex) { found = source; break; @@ -129,28 +127,29 @@ public final class Linker implements Serializable { } /** - * It updates the Linker with the values returned by the Attribute Source. It also advances - * to the next index in order to mark this attribute source as completed. + * It updates the Linker with the values returned by the Attribute Source. It also advances to the next index in order to mark this attribute source as completed. * - * @param source The Attribute Source that was queried for attribute values. - * @param attrResponse The attrResponse returned by the Attribute Source that contains the attribute values. + * @param source + * The Attribute Source that was queried for attribute values. + * @param attrResponse + * The attrResponse returned by the Attribute Source that contains the attribute values. * * @see AttributeSource, STORKAttrQueryResponse */ public void setProviderReponse(AttributeSource source, STORKAttrQueryResponse attrResponse) { - if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) + if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY) remoteIndex++; else localIndex++; - //Assertion storage + // Assertion storage this.assertions.put(source, attrResponse); - // previously: getTotalPersonalAttributeList() in both cases - if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) + // previously: getTotalPersonalAttributeList() in both cases + if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY) this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList()); else - this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList()); - //this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList()); + this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList()); + // this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList()); } /** @@ -170,7 +169,8 @@ public final class Linker implements Serializable { /** * Setter for attributeProvidersMap. * - * @param attributeProvidersMap The attributeProvidersMap to set. + * @param attributeProvidersMap + * The attributeProvidersMap to set. */ public void setAttributeProvidersMap(IAttributeProvidersMap attributeProvidersMap) { this.attributeProvidersMap = attributeProvidersMap; @@ -188,14 +188,15 @@ public final class Linker implements Serializable { /** * Returns the Personal Attribute list of the provided Attribute Source. * - * @param source The attributeSource in reference + * @param source + * The attributeSource in reference * * @return The IPersonalAttributeList assosiated with this source or null if empty * * @see IPersonalAttributeList */ public IPersonalAttributeList getProviderAttributes(AttributeSource source) { - if ( attributeProvidersMap.containsKey(source) ) + if (attributeProvidersMap.containsKey(source)) return attributeProvidersMap.get(source); else return null; @@ -215,7 +216,7 @@ public final class Linker implements Serializable { merged = null; - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { + if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) { iterator = attributeProvidersMap.keyIterator(); merged = new PersonalAttributeList(); @@ -233,29 +234,26 @@ public final class Linker implements Serializable { } /** - * Returns a List with all the assertions gathered by the AAS-PEPS module - * returned both by local APs or remote A-PEPS. + * Returns a List with all the assertions gathered by the AAS-PEPS module returned both by local APs or remote A-PEPS. * * @return The assertions returned from the APs and A-PEPS */ public List getAttrQueryResponseList() { List originalAssertions; - + originalAssertions = new ArrayList(); - //Gather all assertions - for (STORKAttrQueryResponse element : this.assertions.values()) { + // Gather all assertions + for (STORKAttrQueryResponse element : this.assertions.values()) { originalAssertions.add(element); - } + } return originalAssertions; } /** - * Checks the internal state of the Linker and if all Attribute Sources where visited - * returns true, otherwise it returns false. So if you go directly from AtPLinkerAction - * to MoreAttributesAction the call will have, since the method setProviderReponse - * was not executed from every Attribute Source. + * Checks the internal state of the Linker and if all Attribute Sources where visited returns true, otherwise it returns false. So if you go directly from AtPLinkerAction to MoreAttributesAction + * the call will have, since the method setProviderReponse was not executed from every Attribute Source. * * @return true if everything is OK, false otherwise */ @@ -263,11 +261,10 @@ public final class Linker implements Serializable { boolean outcome = false; LOG.debug("Check if linkder is complete: R[" + remoteIndex + "], L[" + localIndex + "], S[" + attributeProvidersMap.size() + "]"); - if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) { - if ( (remoteIndex + localIndex)==attributeProvidersMap.size() ) + if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) { + if ((remoteIndex + localIndex) == attributeProvidersMap.size()) outcome = true; - } - else { + } else { outcome = true; } @@ -275,33 +272,33 @@ public final class Linker implements Serializable { } /** - * Merge the two Linker objects. + * Merge the two Linker objects. * - * @param previous The other Linker object to merge with this one. + * @param previous + * The other Linker object to merge with this one. */ public void mergeWith(Linker previous) { - //BEFORE - if ( LOG.isDebugEnabled() ) { + // BEFORE + if (LOG.isDebugEnabled()) { LOG.debug("The attributeProvidersMap from the current object."); - ((AttributeProvidersMap)this.attributeProvidersMap).trace(); + ((AttributeProvidersMap) this.attributeProvidersMap).trace(); LOG.debug("The attributeProvidersMap from the provided object."); - ((AttributeProvidersMap)previous.getAttributeProvidersMap()).trace(); + ((AttributeProvidersMap) previous.getAttributeProvidersMap()).trace(); } IAttributeProvidersMap map = previous.getAttributeProvidersMap(); Iterator items = map.keyIterator(); - while( items.hasNext() ) { + while (items.hasNext()) { AttributeSource item = items.next(); IPersonalAttributeList pal = map.get(item); - if ( this.attributeProvidersMap.containsKey(item) ) { + if (this.attributeProvidersMap.containsKey(item)) { IPersonalAttributeList new_pal = this.attributeProvidersMap.get(item); - for(PersonalAttribute pa : pal) + for (PersonalAttribute pa : pal) new_pal.add(pa); - } - else { - if ( item.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) + } else { + if (item.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY) remoteIndex++; else localIndex++; @@ -310,10 +307,10 @@ public final class Linker implements Serializable { } } - //AFTER - if ( LOG.isDebugEnabled() ) { + // AFTER + if (LOG.isDebugEnabled()) { LOG.debug("The attributeProvidersMap after the merge."); - ((AttributeProvidersMap)this.attributeProvidersMap).trace(); + ((AttributeProvidersMap) this.attributeProvidersMap).trace(); } } } \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java index f2493db4e..ac83d5ddf 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java @@ -14,384 +14,371 @@ package eu.stork.peps.auth.commons; /** - * This enum class contains all the STORK PEPS, Commons and Specific errors - * constant identifiers. + * This enum class contains all the STORK PEPS, Commons and Specific errors constant identifiers. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $ */ public enum PEPSErrors { - - /** - * Represents the 'authenticationFailed' constant error identifier. - */ - AUTHENTICATION_FAILED_ERROR("authenticationFailed"), - /** - * Represents the 'spCountrySelector.errorCreatingSAML' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_ERROR_CREATE_SAML("spCountrySelector.errorCreatingSAML"), - /** - * Represents the 'spCountrySelector.destNull' constant error identifier. - */ - SP_COUNTRY_SELECTOR_DESTNULL("spCountrySelector.destNull"), - /** - * Represents the 'spCountrySelector.invalidAttr' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_ATTR("spCountrySelector.invalidAttr"), - /** - * Represents the 'spCountrySelector.invalidProviderName' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_PROVIDER_NAME( - "spCountrySelector.invalidProviderName"), - /** - * Represents the 'spCountrySelector.invalidQaaSPid' constant error - * identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_QAASPID("spCountrySelector.invalidQaaSPid"), - /** - * Represents the 'spCountrySelector.invalidSpId' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPID("spCountrySelector.invalidSpId"), - /** - * Represents the 'spCountrySelector.invalidSPQAA' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPQAA("spCountrySelector.invalidSPQAA"), - /** - * Represents the 'spCountrySelector.invalidSpURL' constant error identifier. - */ - SP_COUNTRY_SELECTOR_INVALID_SPURL("spCountrySelector.invalidSpURL"), - /** - * Represents the 'spCountrySelector.spNotAllowed' constant error identifier. - */ - SP_COUNTRY_SELECTOR_SPNOTALLOWED("spCountrySelector.spNotAllowed"), - - /** - * Represents the 'sProviderAction.errorCreatingSAML' constant error - * identifier. - */ - SPROVIDER_SELECTOR_ERROR_CREATE_SAML("sProviderAction.errorCreatingSAML"), - /** - * Represents the 'sProviderAction.attr' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_ATTR("sProviderAction.invalidAttr"), - /** - * Represents the 'sProviderAction.country' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_COUNTRY("sProviderAction.invalidCountry"), - /** - * Represents the 'sProviderAction.relayState' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_RELAY_STATE("sProviderAction.invalidRelayState"), - /** - * Represents the 'sProviderAction.saml' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SAML("sProviderAction.invalidSaml"), - /** - * Represents the 'sProviderAction.spAlias' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPALIAS("sProviderAction.invalidSPAlias"), - /** - * Represents the 'sProviderAction.spDomain' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPDOMAIN("sProviderAction.invalidSPDomain"), - /** - * Represents the 'sProviderAction.spId' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPID("sProviderAction.invalidSPId"), - /** - * Represents the 'sProviderAction.spQAA' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPQAA("sProviderAction.invalidSPQAA"), - /** - * Represents the 'sProviderAction.spQAAId' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPQAAID("sProviderAction.invalidSPQAAId"), - /** - * Represents the 'sProviderAction.spRedirect' constant error identifier. - */ - SPROVIDER_SELECTOR_INVALID_SPREDIRECT("sProviderAction.invalidSPRedirect"), - /** - * Represents the 'sPPowerValidationAction.invalidSPPVAttrList' constant error identifier. - */ - SPPOWERVALIDATION_SELECTOR_INVALID_SP_PV_ATTR_LIST("sPPowerValidationAction.invalidSPPVAttrList"), - - /** - * Represents the 'sProviderAction.invalidSPProviderName' constant error - * identifier. - */ - SPROVIDER_SELECTOR_INVALID_SP_PROVIDERNAME( - "sProviderAction.invalidSPProviderName"), - /** - * Represents the 'sProviderAction.spNotAllowed' constant error identifier. - */ - SPROVIDER_SELECTOR_SPNOTALLOWED("sProviderAction.spNotAllowed"), - - /** - * Represents the 'internalError' constant error identifier. - */ - INTERNAL_ERROR("internalError"), - - /** - * Represents the 'colleagueRequest.attrNull' constant error identifier. - */ - COLLEAGUE_REQ_ATTR_NULL("colleagueRequest.attrNull"), - /** - * Represents the 'colleagueRequest.errorCreatingSAML' constant error - * identifier. - */ - COLLEAGUE_REQ_ERROR_CREATE_SAML("colleagueRequest.errorCreatingSAML"), - /** - * Represents the 'colleagueRequest.invalidCountryCode' constant error - * identifier. - */ - COLLEAGUE_REQ_INVALID_COUNTRYCODE("colleagueRequest.invalidCountryCode"), - /** - * Represents the 'colleagueRequest.invalidDestUrl' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_DEST_URL("colleagueRequest.invalidDestUrl"), - /** - * Represents the 'colleagueRequest.invalidQaa' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_QAA("colleagueRequest.invalidQaa"), - /** - * Represents the 'colleagueRequest.invalidRedirect' constant error - * identifier. - */ - COLLEAGUE_REQ_INVALID_REDIRECT("colleagueRequest.invalidRedirect"), - /** - * Represents the 'colleagueRequest.invalidSAML' constant error identifier. - */ - COLLEAGUE_REQ_INVALID_SAML("colleagueRequest.invalidSAML"), - - /** - * Represents the 'colleaguePVRequest.invalidPVAttrList' constant error identifier. - */ - COLLEAGUE_PV_REQ_INVALID_PV_ATTR_LIST("colleaguePVRequest.invalidPVAttrList"), - - - /** - * Represents the 'cpepsRedirectUrl' constant error identifier. - */ - CPEPS_REDIRECT_URL("cpepsRedirectUrl"), - /** - * Represents the 'spepsRedirectUrl' constant error identifier. - */ - SPEPS_REDIRECT_URL("spepsRedirectUrl"), - /** - * Represents the 'sProviderAction.invCountry' constant error identifier. - */ - SP_ACTION_INV_COUNTRY("sProviderAction.invCountry"), - - /** - * Represents the 'providernameAlias.invalid' constant error identifier. - */ - PROVIDER_ALIAS_INVALID("providernameAlias.invalid"), - - - /** - * Represents the 'cPeps.attrNull' constant error identifier. - */ - CPEPS_ATTR_NULL("cPeps.attrNull"), - - /** - * Represents the 'colleagueResponse.invalidSAML' constant error identifier. - */ - COLLEAGUE_RESP_INVALID_SAML("colleagueResponse.invalidSAML"), - - /** - * Represents the 'citizenNoConsent.mandatory' constant error identifier. - */ - CITIZEN_NO_CONSENT_MANDATORY("citizenNoConsent.mandatory"), - /** - * Represents the 'citizenResponse.mandatory' constant error identifier. - */ - CITIZEN_RESPONSE_MANDATORY("citizenResponse.mandatory"), - /** - * Represents the 'attVerification.mandatory' constant error identifier. - */ - ATT_VERIFICATION_MANDATORY("attVerification.mandatory"), - /** - * Represents the 'attrValue.verification' constant error identifier. - */ - ATTR_VALUE_VERIFICATION("attrValue.verification"), - - /** - * Represents the 'audienceRestrictionError' constant error identifier. - */ - AUDIENCE_RESTRICTION("audienceRestrictionError"), - /** - * Represents the 'auRequestIdError' constant error identifier. - */ - AU_REQUEST_ID("auRequestIdError"), - /** - * Represents the 'domain' constant error identifier. - */ - DOMAIN("domain"), - /** - * Represents the 'hash.error' constant error identifier. - */ - HASH_ERROR("hash.error"), - /** - * Represents the 'invalidAttributeList' constant error identifier. - */ - INVALID_ATTRIBUTE_LIST("invalidAttributeList"), - /** - * Represents the 'invalidAttributeValue' constant error identifier. - */ - INVALID_ATTRIBUTE_VALUE("invalidAttributeValue"), - /** - * Represents the 'qaaLevel' constant error identifier. - */ - QAALEVEL("qaaLevel"), - /** - * Represents the 'requests' constant error identifier. - */ - REQUESTS("requests"), - /** - * Represents the 'SPSAMLRequest' constant error identifier. - */ - SP_SAML_REQUEST("SPSAMLRequest"), - /** - * Represents the 'spepsSAMLRequest' constant error identifier. - */ - SPEPS_SAML_REQUEST("spepsSAMLRequest"), - /** - * Represents the 'IdPSAMLResponse' constant error identifier. - */ - IDP_SAML_RESPONSE("IdPSAMLResponse"), - /** - * Represents the 'cpepsSAMLResponse' constant error identifier. - */ - CPEPS_SAML_RESPONSE("cpepsSAMLResponse"), - /** - * Represents the 'cpepsSAMLResponse' constant error identifier. - */ - SPEPS_SAML_RESPONSE("spepsSAMLResponse"), - /** - * Represents the 'session' constant error identifier. - */ - SESSION("session"), - /** - * Represents the 'invalid.session' constant error identifier. - */ - INVALID_SESSION("invalid.session"), - /** - * Represents the 'invalid.sessionId' constant error identifier. - */ - INVALID_SESSION_ID("invalid.sessionId"), - /** - * Represents the 'missing.sessionId' constant error identifier. - */ - MISSING_SESSION_ID("sessionError"), - /** - * Represents the 'missing.mandate' constant error identifier. - */ - MISSING_MANDATE("missing.mandate"), - /** - * Represents the 'AtPSAMLResponse' constant error identifier. - */ - ATP_SAML_RESPONSE("AtPSAMLResponse"), - - /** - * Represents the 'AtPSAMLResponse' constant error identifier. - */ - ATP_RESPONSE_ERROR("atp.response.error"), - - /** - * Represents the 'apepsSAMLRequest' constant error identifier. - */ - APEPS_SAML_REQUEST("apepsSAMLRequest"), - - /** - * Represents the 'apepsSAMLResponse' constant error identifier. - */ - APEPS_SAML_RESPONSE("apepsSAMLResponse"), - - /** - * Represents the 'invalid.apepsRedirectUrl' constant error identifier. - */ - INVALID_APEPS_REDIRECT_URL("invalid.apepsRedirectUrl"), - - /** - * Represents the 'invalid.apepsCallbackUrl' constant error identifier. - */ - INVALID_APEPS_CALLBACK_URL("invalid.apepsCallbackUrl"), - - /** - * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier. - */ - COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"), + /** + * Represents the 'authenticationFailed' constant error identifier. + */ + AUTHENTICATION_FAILED_ERROR("authenticationFailed"), + /** + * Represents the 'spCountrySelector.errorCreatingSAML' constant error identifier. + */ + SP_COUNTRY_SELECTOR_ERROR_CREATE_SAML("spCountrySelector.errorCreatingSAML"), + /** + * Represents the 'spCountrySelector.destNull' constant error identifier. + */ + SP_COUNTRY_SELECTOR_DESTNULL("spCountrySelector.destNull"), + /** + * Represents the 'spCountrySelector.invalidAttr' constant error identifier. + */ + SP_COUNTRY_SELECTOR_INVALID_ATTR("spCountrySelector.invalidAttr"), + /** + * Represents the 'spCountrySelector.invalidProviderName' constant error identifier. + */ + SP_COUNTRY_SELECTOR_INVALID_PROVIDER_NAME("spCountrySelector.invalidProviderName"), + /** + * Represents the 'spCountrySelector.invalidQaaSPid' constant error identifier. + */ + SP_COUNTRY_SELECTOR_INVALID_QAASPID("spCountrySelector.invalidQaaSPid"), + /** + * Represents the 'spCountrySelector.invalidSpId' constant error identifier. + */ + SP_COUNTRY_SELECTOR_INVALID_SPID("spCountrySelector.invalidSpId"), + /** + * Represents the 'spCountrySelector.invalidSPQAA' constant error identifier. + */ + SP_COUNTRY_SELECTOR_INVALID_SPQAA("spCountrySelector.invalidSPQAA"), + /** + * Represents the 'spCountrySelector.invalidSpURL' constant error identifier. + */ + SP_COUNTRY_SELECTOR_INVALID_SPURL("spCountrySelector.invalidSpURL"), + /** + * Represents the 'spCountrySelector.spNotAllowed' constant error identifier. + */ + SP_COUNTRY_SELECTOR_SPNOTALLOWED("spCountrySelector.spNotAllowed"), - /** - * Represents the 'invalid.attr.country.code' constant error identifier. - */ - INVALID_COUNTRY_CODE("invalid.attr.country.code"); + /** + * Represents the 'sProviderAction.errorCreatingSAML' constant error identifier. + */ + SPROVIDER_SELECTOR_ERROR_CREATE_SAML("sProviderAction.errorCreatingSAML"), + /** + * Represents the 'sProviderAction.attr' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_ATTR("sProviderAction.invalidAttr"), + /** + * Represents the 'sProviderAction.country' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_COUNTRY("sProviderAction.invalidCountry"), + /** + * Represents the 'sProviderAction.relayState' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_RELAY_STATE("sProviderAction.invalidRelayState"), + /** + * Represents the 'sProviderAction.saml' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SAML("sProviderAction.invalidSaml"), + /** + * Represents the 'sProviderAction.spAlias' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SPALIAS("sProviderAction.invalidSPAlias"), + /** + * Represents the 'sProviderAction.spDomain' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SPDOMAIN("sProviderAction.invalidSPDomain"), + /** + * Represents the 'sProviderAction.spId' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SPID("sProviderAction.invalidSPId"), + /** + * Represents the 'sProviderAction.spQAA' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SPQAA("sProviderAction.invalidSPQAA"), + /** + * Represents the 'sProviderAction.spQAAId' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SPQAAID("sProviderAction.invalidSPQAAId"), + /** + * Represents the 'sProviderAction.spRedirect' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SPREDIRECT("sProviderAction.invalidSPRedirect"), + /** + * Represents the 'sPPowerValidationAction.invalidSPPVAttrList' constant error identifier. + */ + SPPOWERVALIDATION_SELECTOR_INVALID_SP_PV_ATTR_LIST("sPPowerValidationAction.invalidSPPVAttrList"), - /** - * Represents the constant's value. - */ - private String error; - - /** - * Solo Constructor. - * - * @param nError The Constant error value. - */ - PEPSErrors(final String nError) { - this.error = nError; - } - - /** - * Construct the errorCode Constant value. - * - * @return The errorCode Constant. - */ - public String errorCode() { - return error + ".code"; - } - - /** - * Construct the errorCode Constant value with the given code text. - * - * @param text the code text to append to the constant. - * - * @return The errorCode Constant for the given code text. - */ - public String errorCode(final String text) { - return error + "." + text + ".code"; - } - - /** - * Construct the errorMessage constant value. - * - * @return The errorMessage constant. - */ - public String errorMessage() { - return error + ".message"; - } - - /** - * Construct the errorMessage Constant value with the given message text. - * - * @param text the message text to append to the constant. - * - * @return The errorMessage Constant for the given text. - */ - public String errorMessage(final String text) { - return error + "." + text + ".message"; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - return error; - } + /** + * Represents the 'sProviderAction.invalidSPProviderName' constant error identifier. + */ + SPROVIDER_SELECTOR_INVALID_SP_PROVIDERNAME("sProviderAction.invalidSPProviderName"), + /** + * Represents the 'sProviderAction.spNotAllowed' constant error identifier. + */ + SPROVIDER_SELECTOR_SPNOTALLOWED("sProviderAction.spNotAllowed"), + + /** + * Represents the 'internalError' constant error identifier. + */ + INTERNAL_ERROR("internalError"), + + /** + * Represents the 'colleagueRequest.attrNull' constant error identifier. + */ + COLLEAGUE_REQ_ATTR_NULL("colleagueRequest.attrNull"), + /** + * Represents the 'colleagueRequest.errorCreatingSAML' constant error identifier. + */ + COLLEAGUE_REQ_ERROR_CREATE_SAML("colleagueRequest.errorCreatingSAML"), + /** + * Represents the 'colleagueRequest.invalidCountryCode' constant error identifier. + */ + COLLEAGUE_REQ_INVALID_COUNTRYCODE("colleagueRequest.invalidCountryCode"), + /** + * Represents the 'colleagueRequest.invalidDestUrl' constant error identifier. + */ + COLLEAGUE_REQ_INVALID_DEST_URL("colleagueRequest.invalidDestUrl"), + /** + * Represents the 'colleagueRequest.invalidQaa' constant error identifier. + */ + COLLEAGUE_REQ_INVALID_QAA("colleagueRequest.invalidQaa"), + /** + * Represents the 'colleagueRequest.invalidRedirect' constant error identifier. + */ + COLLEAGUE_REQ_INVALID_REDIRECT("colleagueRequest.invalidRedirect"), + /** + * Represents the 'colleagueRequest.invalidSAML' constant error identifier. + */ + COLLEAGUE_REQ_INVALID_SAML("colleagueRequest.invalidSAML"), + + /** + * Represents the 'colleaguePVRequest.invalidPVAttrList' constant error identifier. + */ + COLLEAGUE_PV_REQ_INVALID_PV_ATTR_LIST("colleaguePVRequest.invalidPVAttrList"), + + /** + * Represents the 'cpepsRedirectUrl' constant error identifier. + */ + CPEPS_REDIRECT_URL("cpepsRedirectUrl"), + /** + * Represents the 'spepsRedirectUrl' constant error identifier. + */ + SPEPS_REDIRECT_URL("spepsRedirectUrl"), + /** + * Represents the 'sProviderAction.invCountry' constant error identifier. + */ + SP_ACTION_INV_COUNTRY("sProviderAction.invCountry"), + + /** + * Represents the 'providernameAlias.invalid' constant error identifier. + */ + PROVIDER_ALIAS_INVALID("providernameAlias.invalid"), + + /** + * Represents the 'cPeps.attrNull' constant error identifier. + */ + CPEPS_ATTR_NULL("cPeps.attrNull"), + + /** + * Represents the 'colleagueResponse.invalidSAML' constant error identifier. + */ + COLLEAGUE_RESP_INVALID_SAML("colleagueResponse.invalidSAML"), + + /** + * Represents the 'citizenNoConsent.mandatory' constant error identifier. + */ + CITIZEN_NO_CONSENT_MANDATORY("citizenNoConsent.mandatory"), + /** + * Represents the 'citizenResponse.mandatory' constant error identifier. + */ + CITIZEN_RESPONSE_MANDATORY("citizenResponse.mandatory"), + /** + * Represents the 'attVerification.mandatory' constant error identifier. + */ + ATT_VERIFICATION_MANDATORY("attVerification.mandatory"), + /** + * Represents the 'attrValue.verification' constant error identifier. + */ + ATTR_VALUE_VERIFICATION("attrValue.verification"), + + /** + * Represents the 'audienceRestrictionError' constant error identifier. + */ + AUDIENCE_RESTRICTION("audienceRestrictionError"), + /** + * Represents the 'auRequestIdError' constant error identifier. + */ + AU_REQUEST_ID("auRequestIdError"), + /** + * Represents the 'domain' constant error identifier. + */ + DOMAIN("domain"), + /** + * Represents the 'hash.error' constant error identifier. + */ + HASH_ERROR("hash.error"), + /** + * Represents the 'invalidAttributeList' constant error identifier. + */ + INVALID_ATTRIBUTE_LIST("invalidAttributeList"), + /** + * Represents the 'invalidAttributeValue' constant error identifier. + */ + INVALID_ATTRIBUTE_VALUE("invalidAttributeValue"), + /** + * Represents the 'qaaLevel' constant error identifier. + */ + QAALEVEL("qaaLevel"), + /** + * Represents the 'requests' constant error identifier. + */ + REQUESTS("requests"), + /** + * Represents the 'SPSAMLRequest' constant error identifier. + */ + SP_SAML_REQUEST("SPSAMLRequest"), + /** + * Represents the 'spepsSAMLRequest' constant error identifier. + */ + SPEPS_SAML_REQUEST("spepsSAMLRequest"), + /** + * Represents the 'IdPSAMLResponse' constant error identifier. + */ + IDP_SAML_RESPONSE("IdPSAMLResponse"), + /** + * Represents the 'cpepsSAMLResponse' constant error identifier. + */ + CPEPS_SAML_RESPONSE("cpepsSAMLResponse"), + /** + * Represents the 'cpepsSAMLResponse' constant error identifier. + */ + SPEPS_SAML_RESPONSE("spepsSAMLResponse"), + /** + * Represents the 'session' constant error identifier. + */ + SESSION("session"), + /** + * Represents the 'invalid.session' constant error identifier. + */ + INVALID_SESSION("invalid.session"), + /** + * Represents the 'invalid.sessionId' constant error identifier. + */ + INVALID_SESSION_ID("invalid.sessionId"), + /** + * Represents the 'missing.sessionId' constant error identifier. + */ + MISSING_SESSION_ID("sessionError"), + /** + * Represents the 'missing.mandate' constant error identifier. + */ + MISSING_MANDATE("missing.mandate"), + /** + * Represents the 'AtPSAMLResponse' constant error identifier. + */ + ATP_SAML_RESPONSE("AtPSAMLResponse"), + + /** + * Represents the 'AtPSAMLResponse' constant error identifier. + */ + ATP_RESPONSE_ERROR("atp.response.error"), + + /** + * Represents the 'apepsSAMLRequest' constant error identifier. + */ + APEPS_SAML_REQUEST("apepsSAMLRequest"), + + /** + * Represents the 'apepsSAMLResponse' constant error identifier. + */ + APEPS_SAML_RESPONSE("apepsSAMLResponse"), + + /** + * Represents the 'invalid.apepsRedirectUrl' constant error identifier. + */ + INVALID_APEPS_REDIRECT_URL("invalid.apepsRedirectUrl"), + + /** + * Represents the 'invalid.apepsCallbackUrl' constant error identifier. + */ + INVALID_APEPS_CALLBACK_URL("invalid.apepsCallbackUrl"), + + /** + * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier. + */ + COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"), + + /** + * Represents the 'invalid.attr.country.code' constant error identifier. + */ + INVALID_COUNTRY_CODE("invalid.attr.country.code"); + + /** + * Represents the constant's value. + */ + private String error; + + /** + * Solo Constructor. + * + * @param nError + * The Constant error value. + */ + PEPSErrors(final String nError) { + this.error = nError; + } + + /** + * Construct the errorCode Constant value. + * + * @return The errorCode Constant. + */ + public String errorCode() { + return error + ".code"; + } + + /** + * Construct the errorCode Constant value with the given code text. + * + * @param text + * the code text to append to the constant. + * + * @return The errorCode Constant for the given code text. + */ + public String errorCode(final String text) { + return error + "." + text + ".code"; + } + + /** + * Construct the errorMessage constant value. + * + * @return The errorMessage constant. + */ + public String errorMessage() { + return error + ".message"; + } + + /** + * Construct the errorMessage Constant value with the given message text. + * + * @param text + * the message text to append to the constant. + * + * @return The errorMessage Constant for the given text. + */ + public String errorMessage(final String text) { + return error + "." + text + ".message"; + } + + /** + * Return the Constant Value. + * + * @return The constant value. + */ + public String toString() { + return error; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java index dd534499d..ec967a2ee 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java @@ -16,622 +16,617 @@ package eu.stork.peps.auth.commons; /** * This enum class contains all the STORK PEPS, Commons and Specific Parameters. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.13 $, $Date: 2011-07-07 20:48:45 $ */ public enum PEPSParameters { - - /** - * Represents the 'apId' parameter constant. - */ - AP_ID("apId"), - /** - * Represents the 'apUrl' parameter constant. - */ - AP_URL("apUrl"), - /** - * Represents the 'ap.number' parameter constant. - */ - AP_NUMBER("ap.number"), - - /** - * Represents the 'assertionConsumerServiceURL' parameter constant. - */ - ASSERTION_CONSUMER_S_URL("assertionConsumerServiceURL"), - - /** - * Represents the 'auth' parameter constant. - */ - AUTHENTICATION("auth"), - - /** - * Represents the 'attr' parameter constant. - */ - ATTRIBUTE("attr"), - /** - * Represents the 'attrName' parameter constant. - */ - ATTRIBUTE_NAME("attrName"), - /** - * Represents the 'attrStatus' parameter constant. - */ - ATTRIBUTE_STATUS("attrStatus"), - /** - * Represents the 'attrType' parameter constant. - */ - ATTRIBUTE_TYPE("attrType"), - /** - * Represents the 'attrValue' parameter constant. - */ - ATTRIBUTE_VALUE("attrValue"), - /** - * Represents the 'attrList' parameter constant. - */ - ATTRIBUTE_LIST("attrList"), - /** - * Represents the 'apMandAttrList' parameter constant. - */ - AP_MANDATORY_ATTRIBUTE_LIST("apMandAttrList"), - /** - * Represents the 'attrTuple' parameter constant. - */ - ATTRIBUTE_TUPLE("attrTuple"), - /** - * Represents the 'attribute-missing' parameter constant. - */ - ATTRIBUTE_MISSING("attribute-missing"), - /** - * Represents the 'attributesNotAllowed' parameter constant. - */ - ATTRIBUTES_NOT_ALLOWED("attributesNotAllowed"), - /** - * Represents the 'authnRequest' parameter constant. - */ - AUTH_REQUEST("authnRequest"), - - /** - * Represents the 'attrValue.number' parameter constant. - */ - ATTR_VALUE_NUMBER("attrValue.number"), - - /** - * Represents the 'derivation.date.format' parameter constant. - */ - DERIVATION_DATE_FORMAT("derivation.date.format"), - /** - * Represents the 'deriveAttr.number' parameter constant. - */ - DERIVE_ATTRIBUTE_NUMBER("deriveAttr.number"), - - /** - * Represents the complex attributes parameter constant. - */ - COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"), - COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"), - COMPLEX_HASDEGREE_VALUE("hasDegree"), - COMPLEX_MANDATECONTENT_VALUE("mandateContent"), - /** - * Represents the 'consent-type' parameter constant. - */ - CONSENT_TYPE("consent-type"), - /** - * Represents the 'consent-value' parameter constant. - */ - CONSENT_VALUE("consent-value"), - /** - * Represents the 'country' parameter constant. - */ - COUNTRY("country"), - /** - * Represents the 'countryOrigin' parameter constant. - */ - COUNTRY_ORIGIN("countryOrigin"), - - /** - * Represents the 'cpepsURL' parameter constant. - */ - CPEPS_URL("cpepsURL"), - /** - * Represents the 'callback' parameter constant. - */ - CPEPS_CALLBACK("callback"), - /** - * Represents the 'peps.specificidpredirect.url' parameter constant. - */ - CPEPS_IDP_CALLBACK_VALUE("peps.specificidpredirect.url"), - /** - * Represents the 'peps.specificapredirect.url' parameter constant. - */ - CPEPS_AP_CALLBACK_VALUE("peps.specificapredirect.url"), - - /** - * Represents the 'errorCode' parameter constant. - */ - ERROR_CODE("errorCode"), - /** - * Represents the 'subCode' parameter constant. - */ - ERROR_SUBCODE("subCode"), - /** - * Represents the 'errorMessage' parameter constant. - */ - ERROR_MESSAGE("errorMessage"), - /** - * Represents the 'errorRedirectUrl' parameter constant. - */ - ERROR_REDIRECT_URL("errorRedirectUrl"), - - /** - * errorRedirectUrl Represents the 'external-authentication' parameter - * constant. - */ - EXTERNAL_AUTH("external-authentication"), - /** - * Represents the 'external-ap' parameter constant. - */ - EXTERNAL_AP("external-ap"), - /** - * Represents the 'external-pv' parameter constant. - */ - EXTERNAL_PV("external-pv"), - /** - * Represents the 'external-sig-module' parameter constant. - */ - EXT_SIG_CREATOR_MOD("external-sig-module"), - - /** - * Represents the 'http-x-forwarded-for' parameter constant. - */ - HTTP_X_FORWARDED_FOR("http-x-forwarded-for"), - - /** - * Represents the 'idp.url' parameter constant. - */ - IDP_URL("idp.url"), - /** - * Represents the 'internal-authentication' parameter constant. - */ - INTERNAL_AUTH("internal-authentication"), - /** - * Represents the 'internal-ap' parameter constant. - */ - INTERNAL_AP("internal-ap"), - /** - * Represents the 'internal-pv' parameter constant. - */ - INTERNAL_PV("internal-pv"), - - /** - * Represents the 'samlIssuer' parameter constant. - */ - ISSUER("samlIssuer"), - /** - * Represents the 'samlIssuer.idp' parameter constant. - */ - ISSUER_IDP("samlIssuer.idp"), - /** - * Represents the 'samlIssuer.atp' parameter constant. - */ - ISSUER_ATP("samlIssuer.atp"), - - /** - * Represents the 'mandatory' parameter constant. - */ - MANDATORY("mandatory"), - /** - * Represents the 'mandatoryAttributeMissing' parameter constant. - */ - MANDATORY_ATTR_MISSING("mandatoryAttributeMissing"), - /** - * Represents the 'mandatoryConsentAttrMissing' parameter constant. - */ - MANDATORY_CONSENT_MISSING("mandatoryConsentAttrMissing"), - /** - * Represents the 'missing-attrs' parameter constant. - */ - MISSING_ATTRS("missing-attrs"), - /** - * Represents the 'no-more-attrs' parameter constant. - */ - NO_MORE_ATTRS("no-more-attrs"), - - /** - * Represents the 'optional' parameter constant. - */ - OPTIONAL("optional"), - - /** - * Represents the 'no-consent-type' parameter constant. - */ - NO_CONSENT_TYPE("no-consent-type"), - /** - * Represents the 'no-consent-value' parameter constant. - */ - NO_CONSENT_VALUE("no-consent-value"), - - /** - * Represents the 'provider.name' parameter constant. - */ - PROVIDER_NAME_VALUE("providerName"), - /** - * Represents the 'cpeps.askconsent' parameter constant. - */ - PEPS_ASK_CONSENT("cpeps.askconsent"), - /** - * Represents the 'cpeps.askconsentvalue' parameter constant. - */ - PEPS_ASK_CONSENT_VALUE("cpeps.askconsentvalue"), - /** - * Represents the 'pepsAuth' parameter constant. - */ - PEPS_AUTH_CONSENT("pepsAuth"), - /** - * Represents the 'validation.bypass' parameter constant. - */ - PEPS_BYPASS("validation.bypass"), - /** - * Represents the 'cpeps.number' parameter constant. - */ - PEPS_NUMBER("cpeps.number"), - /** - * Represents the 'cpeps.specificapredirect.url' parameter constant. - */ - PEPS_SPECIFIC_URL("cpeps.specificapredirect.url"), - /** - * Represents the 'pv.url' parameter constant. - */ - PV_URL("pv.url"), - - /** - * Represents the 'qaaLevel' parameter constant. - */ - QAALEVEL("qaaLevel"), - - /** - * Represents the 'speps.redirectUrl' parameter constant. - */ - SPEPS_REDIRECT_URL("speps.redirectUrl"), - - /** - * Represents the 'sp.redirectUrl' parameter constant. - */ - SP_REDIRECT_URL("sp.redirectUrl"), - /** - * Represents the 'cpeps.redirectUrl' parameter constant. - */ - CPEPS_REDIRECT_URL("cpeps.redirectUrl"), - /** - * Represents the 'RelayState' parameter constant. - */ - RELAY_STATE("RelayState"), - /** - * Represents the 'remoteAddr' parameter constant. - */ - REMOTE_ADDR("remoteAddr"), - /** - * Represents the 'remoteUser' parameter constant. - */ - REMOTE_USER("remoteUser"), - - /** - * Represents the 'SAMLRequest' parameter constant. - */ - SAML_REQUEST("SAMLRequest"), - /** - * Represents the 'SAMLResponse' parameter constant. - */ - SAML_RESPONSE("SAMLResponse"), - /** - * Represents the 'SAMLFail' parameter constant. - */ - SAML_TOKEN_FAIL("SAMLFail"), - /** - * Represents the 'TokenId' parameter constant. - */ - SAML_TOKEN_ID("TokenId"), - /** - * Represents the 'inResponseTo' parameter constant. - */ - SAML_IN_RESPONSE_TO("inResponseTo"), - /** - * Represents the 'inResponseTo.idp' parameter constant. - */ - SAML_IN_RESPONSE_TO_IDP("inResponseTo.idp"), - /** - * Represents the 'inResponseTo.atp' parameter constant. - */ - SAML_IN_RESPONSE_TO_ATP("inResponseTo.atp"), - /** - * Represents the 'SignatureResponse' parameter constant. - */ - SIGNATURE_RESPONSE("SignatureResponse"), - - /** - * Represents the 'cPepsSession' parameter constant. - */ - SESSION_ID_URL("cPepsSession"), - /** - * Represents the 'spId' parameter constant. - */ - SP_ID("spId"), - /** - * Represents the 'spQaaLevel' parameter constant. - */ - SP_QAALEVEL("spQaaLevel"), - /** - * Represents the 'spUrl' parameter constant. - */ - SP_URL("spUrl"), - - /** - * Represents the 'allow.derivation.all' parameter constant. - */ - SPECIFIC_ALLOW_DERIVATION_ALL("allow.derivation.all"), - /** - * Represents the ''allow.unknowns parameter constant. - */ - SPECIFIC_ALLOW_UNKNOWNS("allow.unknowns"), - /** - * Represents the 'derivation.date.separator' parameter constant. - */ - SPECIFIC_DERIVATION_DATE_SEP("derivation.date.separator"), - /** - * Represents the 'derivation.month.position' parameter constant. - */ - SPECIFIC_DERIVATION_MONTH_POS("derivation.month.position"), - /** - * Represents the 'derivation.day.position' parameter constant. - */ - SPECIFIC_DERIVATION_DAY_POS("derivation.day.position"), - /** - * Represents the 'derivation.year.position' parameter constant. - */ - SPECIFIC_DERIVATION_YEAR_POS("derivation.year.position"), - - /** - * sp.authorized.parameters Represents the '' parameter constant. - */ - SPEPS_AUTHORIZED("sp.authorized.parameters"), - - /** - * Represents the 'spSector' constant value. - */ - SPSECTOR("spSector"), - /** - * Represents the 'spApplication' constant value. - */ - SPAPPLICATION("spApplication"), - /** - * Represents the 'spCountry' constant value. - */ - SPCOUNTRY("spCountry"), - - /** - * Represents the 'spInstitution' constant value. - */ - SPINSTITUTION("spInstitution"), - - /** - * Represents the 'spCountryCode' constant value. - */ - SP_COUNTRY_CODE("spCountryCode"), - - /** - * Represents the 'storkAttribute.number' parameter constant. - */ - STORK_ATTRIBUTE_NUMBER("storkAttribute.number"), - /** - * Represents the 'storkAttributeValue.number' parameter constant. - */ - STORK_ATTRIBUTE_VALUE_NUMBER("storkAttributeValue.number"), - - /** - * Represents the 'username' parameter constant. - */ - USERNAME("username"), - - /** - * Represents the 'tooManyParameters' parameter constant. - */ - TOO_MANY_PARAMETERS("tooManyParameters"), - /** - * Represents the 'validation.active' parameter constant. - */ - VALIDATION_ACTIVE("validation.active"), - - /** - * Represents the 'x-forwarded-for' parameter constant. - */ - X_FORWARDED_FOR("x-forwarded-for"), - /** - * Represents the 'x-forwarded-host' parameter constant. - */ - X_FORWARDED_HOST("x-forwarded-host"), - /** - * Represents the 'XMLResponse' parameter constant. - */ - XML_RESPONSE("XMLResponse"), - - /** - * Represents the 'ap-cpeps.number' parameter constant. - */ - AP_PEPS_NUMBER("ap-cpeps.number"), - - /** - * Represents the 'atp.number' parameter constant. - */ - ATTRIBUTE_PROVIDER_NUMBER("atp.number"), - - /** - * Represents the 'atn.number' parameter constant. - */ - ATTRIBUTE_NAME_NUMBER("atn.number"), - - /** - * Represents the 'apLinker' parameter constant. - */ - AP_LINKER("apLinker"), - - /** - * Represents the 'prevApLinker' parameter constant. - */ - PREV_AP_LINKER("prevApLinker"), - - /** - * Represents the 'NOSEL' parameter constant (no attribute provider selected). - */ - AP_NO_SELECTION("NOSEL"), - - /** - * Represents the 'OCSEL' parameter constant (attribute provider in another country). - */ - AP_OTHER_COUNTRY("OCSEL"), - - /** - * Represents the '_provider' suffix parameter constant. - */ - AP_PROVIDER_SELECT_SUFFIX("_provider"), - - /** - * Represents the '_country' suffix parameter constant. - */ - AP_COUNTRY_SELECT_SUFFIX("_country"), - - /** - * Represents the '_name' suffix parameter constant. - */ - AP_NAME_SELECT_SUFFIX("_name"), - - /** - * Represents the 'next-ap' parameter constant. - */ - NEXT_AP("next-ap"), - - /** - * Represents the 'next-apeps' parameter constant. - */ - NEXT_APEPS("next-apeps"), - - /** - * Represents the 'back-to-apeps' parameter constant. - */ - BACK_TO_APEPS("back-to-apeps"), - - /** - * Represents the 'is-remote-apeps' parameter constant. - */ - IS_REMOTE_APEPS("is-remote-apeps"), - - /** - * Represents the 'more-attributes' parameter constant. - */ - MORE_ATTRIBUTES("more-attributes"), - - /** - * Represents the 'attr-filter.number' parameter constant. - */ - ATTRIBUTES_FILTER_NUMBER("attr-filter.number"), - - /** - * Represents the 'attr-group' parameter constant. - */ - ATTRIBUTE_GROUPS("attr-group"), - - /** - * Represents the 'all' parameter constant for attribute groups. - */ - ATTRIBUTE_GROUPS_ALL("all"), - - /** - * Represents the 'none' parameter constant for attribute groups. - */ - ATTRIBUTE_GROUPS_NONE("none"), - - /** - * Represents the 'atp.url' parameter constant. - */ - ATP_URL("atp.url"), - /** - * Represents the 'apepsURL' parameter constant. - */ - APEPS_URL("apepsUrl"), - - /** - * Represents the 'apepsCountry' parameter constant. - */ - APEPS_COUNTRY("apepsCountry"), - - /** - * Represents the 'apepsAuthRequest' parameter constant. - */ - APEPS_ATTR_REQUEST("apepsAttrRequest"), - - /** - * Represents the 'isApepsRequest' parameter constant. - */ - APEPS_REQUEST_COMPLETE("apeps-request-complete"), - - /** - * Represents the 'apeps.callbackUrl' parameter constant. - */ - APEPS_CALLBACK_URL("apeps.callbackUrl"), - /** - * Represents the 'attrListMand' parameter constant. - */ - ATTR_LIST_MAND("attrListMand"), - - /** - * Represents the 'attrListOpt' parameter constant. - */ - ATTR_LIST_OPT("attrListOpt"), - - /** - * Represents the 'simpleAttrListMand' parameter constant. - */ - SIMPLE_ATTR_LIST_MAND("simpleAttrListMand"), - - /** - * Represents the 'simpleAttrListOpt' parameter constant. - */ - SIMPLE_ATTR_LIST_OPT("simpleAttrListOpt"), - - /** - * Represents the 'complexAttrListMand' parameter constant. - */ - COMPLEX_ATTR_LIST_MAND("complexAttrListMand"), - - /** - * Represents the 'complexAttrListOpt' parameter constant. - */ - COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"), - /** - * Represents the 'idPDerivedAttrList' parameter constant. - */ - - IDP_DERIVED_ATTR_LIST("idPDerivedAttrList"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param nValue The Constant value. - */ - PEPSParameters(final String nValue) { - this.value = nValue; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - return value; - } + + /** + * Represents the 'apId' parameter constant. + */ + AP_ID("apId"), + /** + * Represents the 'apUrl' parameter constant. + */ + AP_URL("apUrl"), + /** + * Represents the 'ap.number' parameter constant. + */ + AP_NUMBER("ap.number"), + + /** + * Represents the 'assertionConsumerServiceURL' parameter constant. + */ + ASSERTION_CONSUMER_S_URL("assertionConsumerServiceURL"), + + /** + * Represents the 'auth' parameter constant. + */ + AUTHENTICATION("auth"), + + /** + * Represents the 'attr' parameter constant. + */ + ATTRIBUTE("attr"), + /** + * Represents the 'attrName' parameter constant. + */ + ATTRIBUTE_NAME("attrName"), + /** + * Represents the 'attrStatus' parameter constant. + */ + ATTRIBUTE_STATUS("attrStatus"), + /** + * Represents the 'attrType' parameter constant. + */ + ATTRIBUTE_TYPE("attrType"), + /** + * Represents the 'attrValue' parameter constant. + */ + ATTRIBUTE_VALUE("attrValue"), + /** + * Represents the 'attrList' parameter constant. + */ + ATTRIBUTE_LIST("attrList"), + /** + * Represents the 'apMandAttrList' parameter constant. + */ + AP_MANDATORY_ATTRIBUTE_LIST("apMandAttrList"), + /** + * Represents the 'attrTuple' parameter constant. + */ + ATTRIBUTE_TUPLE("attrTuple"), + /** + * Represents the 'attribute-missing' parameter constant. + */ + ATTRIBUTE_MISSING("attribute-missing"), + /** + * Represents the 'attributesNotAllowed' parameter constant. + */ + ATTRIBUTES_NOT_ALLOWED("attributesNotAllowed"), + /** + * Represents the 'authnRequest' parameter constant. + */ + AUTH_REQUEST("authnRequest"), + + /** + * Represents the 'attrValue.number' parameter constant. + */ + ATTR_VALUE_NUMBER("attrValue.number"), + + /** + * Represents the 'derivation.date.format' parameter constant. + */ + DERIVATION_DATE_FORMAT("derivation.date.format"), + /** + * Represents the 'deriveAttr.number' parameter constant. + */ + DERIVE_ATTRIBUTE_NUMBER("deriveAttr.number"), + + /** + * Represents the complex attributes parameter constant. + */ + COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"), COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"), COMPLEX_HASDEGREE_VALUE("hasDegree"), COMPLEX_MANDATECONTENT_VALUE("mandateContent"), + /** + * Represents the 'consent-type' parameter constant. + */ + CONSENT_TYPE("consent-type"), + /** + * Represents the 'consent-value' parameter constant. + */ + CONSENT_VALUE("consent-value"), + /** + * Represents the 'country' parameter constant. + */ + COUNTRY("country"), + /** + * Represents the 'countryOrigin' parameter constant. + */ + COUNTRY_ORIGIN("countryOrigin"), + + /** + * Represents the 'cpepsURL' parameter constant. + */ + CPEPS_URL("cpepsURL"), + /** + * Represents the 'callback' parameter constant. + */ + CPEPS_CALLBACK("callback"), + /** + * Represents the 'peps.specificidpredirect.url' parameter constant. + */ + CPEPS_IDP_CALLBACK_VALUE("peps.specificidpredirect.url"), + /** + * Represents the 'peps.specificapredirect.url' parameter constant. + */ + CPEPS_AP_CALLBACK_VALUE("peps.specificapredirect.url"), + + /** + * Represents the 'errorCode' parameter constant. + */ + ERROR_CODE("errorCode"), + /** + * Represents the 'subCode' parameter constant. + */ + ERROR_SUBCODE("subCode"), + /** + * Represents the 'errorMessage' parameter constant. + */ + ERROR_MESSAGE("errorMessage"), + /** + * Represents the 'errorRedirectUrl' parameter constant. + */ + ERROR_REDIRECT_URL("errorRedirectUrl"), + + /** + * errorRedirectUrl Represents the 'external-authentication' parameter constant. + */ + EXTERNAL_AUTH("external-authentication"), + /** + * Represents the 'external-ap' parameter constant. + */ + EXTERNAL_AP("external-ap"), + /** + * Represents the 'external-pv' parameter constant. + */ + EXTERNAL_PV("external-pv"), + /** + * Represents the 'external-sig-module' parameter constant. + */ + EXT_SIG_CREATOR_MOD("external-sig-module"), + + /** + * Represents the 'http-x-forwarded-for' parameter constant. + */ + HTTP_X_FORWARDED_FOR("http-x-forwarded-for"), + + /** + * Represents the 'idp.url' parameter constant. + */ + IDP_URL("idp.url"), + /** + * Represents the 'internal-authentication' parameter constant. + */ + INTERNAL_AUTH("internal-authentication"), + /** + * Represents the 'internal-ap' parameter constant. + */ + INTERNAL_AP("internal-ap"), + /** + * Represents the 'internal-pv' parameter constant. + */ + INTERNAL_PV("internal-pv"), + + /** + * Represents the 'samlIssuer' parameter constant. + */ + ISSUER("samlIssuer"), + /** + * Represents the 'samlIssuer.idp' parameter constant. + */ + ISSUER_IDP("samlIssuer.idp"), + /** + * Represents the 'samlIssuer.atp' parameter constant. + */ + ISSUER_ATP("samlIssuer.atp"), + + /** + * Represents the 'mandatory' parameter constant. + */ + MANDATORY("mandatory"), + /** + * Represents the 'mandatoryAttributeMissing' parameter constant. + */ + MANDATORY_ATTR_MISSING("mandatoryAttributeMissing"), + /** + * Represents the 'mandatoryConsentAttrMissing' parameter constant. + */ + MANDATORY_CONSENT_MISSING("mandatoryConsentAttrMissing"), + /** + * Represents the 'missing-attrs' parameter constant. + */ + MISSING_ATTRS("missing-attrs"), + /** + * Represents the 'no-more-attrs' parameter constant. + */ + NO_MORE_ATTRS("no-more-attrs"), + + /** + * Represents the 'optional' parameter constant. + */ + OPTIONAL("optional"), + + /** + * Represents the 'no-consent-type' parameter constant. + */ + NO_CONSENT_TYPE("no-consent-type"), + /** + * Represents the 'no-consent-value' parameter constant. + */ + NO_CONSENT_VALUE("no-consent-value"), + + /** + * Represents the 'provider.name' parameter constant. + */ + PROVIDER_NAME_VALUE("providerName"), + /** + * Represents the 'cpeps.askconsent' parameter constant. + */ + PEPS_ASK_CONSENT("cpeps.askconsent"), + /** + * Represents the 'cpeps.askconsentvalue' parameter constant. + */ + PEPS_ASK_CONSENT_VALUE("cpeps.askconsentvalue"), + /** + * Represents the 'pepsAuth' parameter constant. + */ + PEPS_AUTH_CONSENT("pepsAuth"), + /** + * Represents the 'validation.bypass' parameter constant. + */ + PEPS_BYPASS("validation.bypass"), + /** + * Represents the 'cpeps.number' parameter constant. + */ + PEPS_NUMBER("cpeps.number"), + /** + * Represents the 'cpeps.specificapredirect.url' parameter constant. + */ + PEPS_SPECIFIC_URL("cpeps.specificapredirect.url"), + /** + * Represents the 'pv.url' parameter constant. + */ + PV_URL("pv.url"), + + /** + * Represents the 'qaaLevel' parameter constant. + */ + QAALEVEL("qaaLevel"), + + /** + * Represents the 'speps.redirectUrl' parameter constant. + */ + SPEPS_REDIRECT_URL("speps.redirectUrl"), + + /** + * Represents the 'sp.redirectUrl' parameter constant. + */ + SP_REDIRECT_URL("sp.redirectUrl"), + /** + * Represents the 'cpeps.redirectUrl' parameter constant. + */ + CPEPS_REDIRECT_URL("cpeps.redirectUrl"), + /** + * Represents the 'RelayState' parameter constant. + */ + RELAY_STATE("RelayState"), + /** + * Represents the 'remoteAddr' parameter constant. + */ + REMOTE_ADDR("remoteAddr"), + /** + * Represents the 'remoteUser' parameter constant. + */ + REMOTE_USER("remoteUser"), + + /** + * Represents the 'SAMLRequest' parameter constant. + */ + SAML_REQUEST("SAMLRequest"), + /** + * Represents the 'SAMLResponse' parameter constant. + */ + SAML_RESPONSE("SAMLResponse"), + /** + * Represents the 'SAMLFail' parameter constant. + */ + SAML_TOKEN_FAIL("SAMLFail"), + /** + * Represents the 'TokenId' parameter constant. + */ + SAML_TOKEN_ID("TokenId"), + /** + * Represents the 'inResponseTo' parameter constant. + */ + SAML_IN_RESPONSE_TO("inResponseTo"), + /** + * Represents the 'inResponseTo.idp' parameter constant. + */ + SAML_IN_RESPONSE_TO_IDP("inResponseTo.idp"), + /** + * Represents the 'inResponseTo.atp' parameter constant. + */ + SAML_IN_RESPONSE_TO_ATP("inResponseTo.atp"), + /** + * Represents the 'SignatureResponse' parameter constant. + */ + SIGNATURE_RESPONSE("SignatureResponse"), + + /** + * Represents the 'cPepsSession' parameter constant. + */ + SESSION_ID_URL("cPepsSession"), + /** + * Represents the 'spId' parameter constant. + */ + SP_ID("spId"), + /** + * Represents the 'spQaaLevel' parameter constant. + */ + SP_QAALEVEL("spQaaLevel"), + /** + * Represents the 'spUrl' parameter constant. + */ + SP_URL("spUrl"), + + /** + * Represents the 'allow.derivation.all' parameter constant. + */ + SPECIFIC_ALLOW_DERIVATION_ALL("allow.derivation.all"), + /** + * Represents the ''allow.unknowns parameter constant. + */ + SPECIFIC_ALLOW_UNKNOWNS("allow.unknowns"), + /** + * Represents the 'derivation.date.separator' parameter constant. + */ + SPECIFIC_DERIVATION_DATE_SEP("derivation.date.separator"), + /** + * Represents the 'derivation.month.position' parameter constant. + */ + SPECIFIC_DERIVATION_MONTH_POS("derivation.month.position"), + /** + * Represents the 'derivation.day.position' parameter constant. + */ + SPECIFIC_DERIVATION_DAY_POS("derivation.day.position"), + /** + * Represents the 'derivation.year.position' parameter constant. + */ + SPECIFIC_DERIVATION_YEAR_POS("derivation.year.position"), + + /** + * sp.authorized.parameters Represents the '' parameter constant. + */ + SPEPS_AUTHORIZED("sp.authorized.parameters"), + + /** + * Represents the 'spSector' constant value. + */ + SPSECTOR("spSector"), + /** + * Represents the 'spApplication' constant value. + */ + SPAPPLICATION("spApplication"), + /** + * Represents the 'spCountry' constant value. + */ + SPCOUNTRY("spCountry"), + + /** + * Represents the 'spInstitution' constant value. + */ + SPINSTITUTION("spInstitution"), + + /** + * Represents the 'spCountryCode' constant value. + */ + SP_COUNTRY_CODE("spCountryCode"), + + /** + * Represents the 'storkAttribute.number' parameter constant. + */ + STORK_ATTRIBUTE_NUMBER("storkAttribute.number"), + /** + * Represents the 'storkAttributeValue.number' parameter constant. + */ + STORK_ATTRIBUTE_VALUE_NUMBER("storkAttributeValue.number"), + + /** + * Represents the 'username' parameter constant. + */ + USERNAME("username"), + + /** + * Represents the 'tooManyParameters' parameter constant. + */ + TOO_MANY_PARAMETERS("tooManyParameters"), + /** + * Represents the 'validation.active' parameter constant. + */ + VALIDATION_ACTIVE("validation.active"), + + /** + * Represents the 'x-forwarded-for' parameter constant. + */ + X_FORWARDED_FOR("x-forwarded-for"), + /** + * Represents the 'x-forwarded-host' parameter constant. + */ + X_FORWARDED_HOST("x-forwarded-host"), + /** + * Represents the 'XMLResponse' parameter constant. + */ + XML_RESPONSE("XMLResponse"), + + /** + * Represents the 'ap-cpeps.number' parameter constant. + */ + AP_PEPS_NUMBER("ap-cpeps.number"), + + /** + * Represents the 'atp.number' parameter constant. + */ + ATTRIBUTE_PROVIDER_NUMBER("atp.number"), + + /** + * Represents the 'atn.number' parameter constant. + */ + ATTRIBUTE_NAME_NUMBER("atn.number"), + + /** + * Represents the 'apLinker' parameter constant. + */ + AP_LINKER("apLinker"), + + /** + * Represents the 'prevApLinker' parameter constant. + */ + PREV_AP_LINKER("prevApLinker"), + + /** + * Represents the 'NOSEL' parameter constant (no attribute provider selected). + */ + AP_NO_SELECTION("NOSEL"), + + /** + * Represents the 'OCSEL' parameter constant (attribute provider in another country). + */ + AP_OTHER_COUNTRY("OCSEL"), + + /** + * Represents the '_provider' suffix parameter constant. + */ + AP_PROVIDER_SELECT_SUFFIX("_provider"), + + /** + * Represents the '_country' suffix parameter constant. + */ + AP_COUNTRY_SELECT_SUFFIX("_country"), + + /** + * Represents the '_name' suffix parameter constant. + */ + AP_NAME_SELECT_SUFFIX("_name"), + + /** + * Represents the 'next-ap' parameter constant. + */ + NEXT_AP("next-ap"), + + /** + * Represents the 'next-apeps' parameter constant. + */ + NEXT_APEPS("next-apeps"), + + /** + * Represents the 'back-to-apeps' parameter constant. + */ + BACK_TO_APEPS("back-to-apeps"), + + /** + * Represents the 'is-remote-apeps' parameter constant. + */ + IS_REMOTE_APEPS("is-remote-apeps"), + + /** + * Represents the 'more-attributes' parameter constant. + */ + MORE_ATTRIBUTES("more-attributes"), + + /** + * Represents the 'attr-filter.number' parameter constant. + */ + ATTRIBUTES_FILTER_NUMBER("attr-filter.number"), + + /** + * Represents the 'attr-group' parameter constant. + */ + ATTRIBUTE_GROUPS("attr-group"), + + /** + * Represents the 'all' parameter constant for attribute groups. + */ + ATTRIBUTE_GROUPS_ALL("all"), + + /** + * Represents the 'none' parameter constant for attribute groups. + */ + ATTRIBUTE_GROUPS_NONE("none"), + + /** + * Represents the 'atp.url' parameter constant. + */ + ATP_URL("atp.url"), + /** + * Represents the 'apepsURL' parameter constant. + */ + APEPS_URL("apepsUrl"), + + /** + * Represents the 'apepsCountry' parameter constant. + */ + APEPS_COUNTRY("apepsCountry"), + + /** + * Represents the 'apepsAuthRequest' parameter constant. + */ + APEPS_ATTR_REQUEST("apepsAttrRequest"), + + /** + * Represents the 'isApepsRequest' parameter constant. + */ + APEPS_REQUEST_COMPLETE("apeps-request-complete"), + + /** + * Represents the 'apeps.callbackUrl' parameter constant. + */ + APEPS_CALLBACK_URL("apeps.callbackUrl"), + /** + * Represents the 'attrListMand' parameter constant. + */ + ATTR_LIST_MAND("attrListMand"), + + /** + * Represents the 'attrListOpt' parameter constant. + */ + ATTR_LIST_OPT("attrListOpt"), + + /** + * Represents the 'simpleAttrListMand' parameter constant. + */ + SIMPLE_ATTR_LIST_MAND("simpleAttrListMand"), + + /** + * Represents the 'simpleAttrListOpt' parameter constant. + */ + SIMPLE_ATTR_LIST_OPT("simpleAttrListOpt"), + + /** + * Represents the 'complexAttrListMand' parameter constant. + */ + COMPLEX_ATTR_LIST_MAND("complexAttrListMand"), + + /** + * Represents the 'complexAttrListOpt' parameter constant. + */ + COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"), + /** + * Represents the 'idPDerivedAttrList' parameter constant. + */ + + IDP_DERIVED_ATTR_LIST("idPDerivedAttrList"); + + /** + * Represents the constant's value. + */ + private String value; + + /** + * Solo Constructor. + * + * @param nValue + * The Constant value. + */ + PEPSParameters(final String nValue) { + this.value = nValue; + } + + /** + * Return the Constant Value. + * + * @return The constant value. + */ + public String toString() { + return value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java index 69729c0bb..c026ebdbe 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java @@ -30,362 +30,363 @@ import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException; /** * This class holds static helper methods. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.75 $, $Date: 2010-11-23 00:05:35 $ */ public final class PEPSUtil { - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(PEPSUtil.class.getName()); - - /** - * Configurations object. - */ - private static Properties configs; - - /** - * Max prefix. - */ - private static final String MAX_PARAM_PREFIX = "max."; - - /** - * Code prefix to get error code. - */ - private static final String CODE_PARAM_SUFFIX = ".code"; - - /** - * param's size prefix to get max param size. - */ - private static final String MAX_PARAM_SUFFIX = ".size"; - - /** - * Message prefix to get error message. - */ - private static final String MSG_PARAM_SUFFIX = ".message"; - - /** - * Private constructor. Prevents the class from being instantiated. - */ - private PEPSUtil() { - // empty constructor - } - - /** - * Creates a single instance of this class and sets the properties. - * - * @param nConfigs The set of available configurations. - * - * @return The created PEPSUtil's class. - */ - public static PEPSUtil createInstance(final Properties nConfigs) { - if (nConfigs != null) { - PEPSUtil.configs = nConfigs; - } - return new PEPSUtil(); - } - - /** - * Getter for the Properties. - * - * @return configs The properties value. - */ - public Properties getConfigs() { - return configs; - } - - /** - * Setter for the Properties. - * - * @param nConfigs The new properties value. - */ - public static void setConfigs(final Properties nConfigs) { - if (nConfigs != null) { - PEPSUtil.configs = nConfigs; - } - } - - /** - * Returns the identifier of some configuration given a set of configurations - * and the corresponding configuration key. - * - * @param configKey The key that IDs some configuration. - * - * @return The configuration String value. - */ - public static String getConfig(final String configKey) { - return configs.getProperty(configKey); - } - - /** - * Validates the input paramValue identified by the paramName. - * - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * - * @return true if the parameter is valid. - */ - public static boolean isValidParameter(final String paramName, - final String paramValue) { - - final String validationParam = - PEPSUtil.getConfig(PEPSParameters.VALIDATION_ACTIVE.toString()); - boolean retVal = true; - - final String paramConf = MAX_PARAM_PREFIX + paramName + MAX_PARAM_SUFFIX; - - if (PEPSValues.TRUE.toString().equals(validationParam)) { - final String paramSizeStr = PEPSUtil.getConfig(paramConf); - // Checking if the parameter size exists and if it's numeric - if (StringUtils.isNumeric(paramSizeStr)) { - final int maxParamSize = Integer.valueOf(paramSizeStr); - if (StringUtils.isEmpty(paramValue) - || paramValue.length() > maxParamSize) { - retVal = false; - LOG.warn("Invalid parameter [" + paramName + "] value " + paramValue); - } - } else { - retVal = false; - LOG.error("Missing " + paramConf - + " configuration in the pepsUtils.properties configuration file"); - } - } - return retVal; - } - - /** - * Validates the Parameter and throws an exception if an error occurs. Throws - * an InvalidParameterPEPSException runtime exception if the parameter is - * invalid. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - */ - public static void validateParameter(final String className, - final String paramName, final Object paramValue) { - - if (paramValue == null) { - PEPSUtil.validateParameter(className, paramName, ""); - } else { - PEPSUtil.validateParameter(className, paramName, paramValue.toString()); - } - } - - /** - * Validates the Parameters and throws an exception if an error occurs. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue) { - - PEPSUtil.validateParameter(className, paramName, paramValue, - PEPSUtil.getErrorCode(paramName), PEPSUtil.getErrorMessage(paramName)); - } - - /** - * Validates the Parameters and throws an exception if an error occurs. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * @param error The PEPSError to get error code and messages from configs. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue, final PEPSErrors error) { - - PEPSUtil.validateParameter(className, paramName, paramValue, - PEPSUtil.getConfig(error.errorCode()), - PEPSUtil.getConfig(error.errorMessage())); - } - - /** - * Validates the HTTP Parameter and throws an exception if an error occurs. - * Throws an InvalidParameterPEPSException runtime exception if the parameter - * is invalid. - * - * @param className The Class Name that invoked the method. - * @param paramName The name of the parameter to validate. - * @param paramValue The value of the parameter to validate. - * @param errorCode The error code to include on the exception. - * @param errorMessage The error message to include on the exception. - */ - public static void validateParameter(final String className, - final String paramName, final String paramValue, final String errorCode, - final String errorMessage) { - - if (!isValidParameter(paramName, paramValue)) { - LOG.warn("Invalid parameter [" + paramName + "] value found at " - + className); - throw new InvalidParameterPEPSException(errorCode, errorMessage); - } - } - - /** - * Getter for the error code of some given error related to the input param. - * - * @param paramName The name of the parameter associated with the error. - * - * @return The code of the error. - */ - private static String getErrorCode(final String paramName) { - return getConfig(paramName + CODE_PARAM_SUFFIX); - } - - /** - * Getter for the error message of some given error related to the input - * parameter. - * - * @param paramName The name of the parameter associated with the message. - * - * @return The message for the error. - */ - private static String getErrorMessage(final String paramName) { - return getConfig(paramName + MSG_PARAM_SUFFIX); - } - - /** - * {@link Base64} encodes the input samlToken parameter. - * - * @param samlToken the SAML Token to be encoded. - * - * @return The Base64 String representing the samlToken. - * - * @see Base64#encode - */ - public static String encodeSAMLToken(final byte[] samlToken) { - try { - return new String(Base64.encode(samlToken), "UTF8"); - } catch (final UnsupportedEncodingException e) { - LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e); - return null; - } - } - - /** - * Encode samltoken url safe - * @param samlToken the saml token to encode - * @return the bas64 encoded string - */ - public static String encodeSAMLTokenUrlSafe(final byte[] samlToken) { - try { - return new String(UrlBase64.encode(samlToken), "UTF8"); - } catch (final UnsupportedEncodingException e) { - LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e); - return null; - } - } - - /** - * Decodes the {@link Base64} String input parameter representing a samlToken. - * - * @param samlToken the SAML Token to be decoded. - * - * @return The samlToken decoded bytes. - * - * @see Base64#decode - */ - public static byte[] decodeSAMLToken(final String samlToken) { - return Base64.decode(samlToken); - } - - /** - * Decode URL save base64 saml token - * @param samlToken the SAML toke to decode - * @return The decoded bytes - */ - public static byte[] decodeSAMLTokenUrlSafe(final String samlToken) { - return UrlBase64.decode(samlToken); - } - - /** - * Hashes a SAML token. Throws an InternalErrorPEPSException runtime exception - * if the Cryptographic Engine fails. - * - * @param samlToken the SAML Token to be hashed. - * - * @return byte[] with the hashed SAML Token. - */ - public static byte[] hashPersonalToken(final byte[] samlToken) { - try { - final String className = - PEPSUtil.getConfig(PEPSValues.HASH_DIGEST_CLASS.toString()); - - final Digest digest = - (Digest) Class.forName(className).getConstructor() - .newInstance((Object[]) null); - digest.update(samlToken, 0, samlToken.length); - - final int retLength = digest.getDigestSize(); - final byte[] ret = new byte[retLength]; - - digest.doFinal(ret, 0); - return ret; - - } catch (final Exception e) { - // For all those exceptions that could be thrown, we always log it and - // thrown an InternalErrorPEPSException. - LOG.error(PEPSErrors.HASH_ERROR.errorMessage(), e); - throw new InternalErrorPEPSException( - PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorCode()), - PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorMessage()), e); - } - } - - /** - * Gets the Stork error code in the error message if exists! - * - * @param errorMessage The message to get the error code if exists; - * - * @return the error code if exists. Returns null otherwise. - */ - public static String getStorkErrorCode(final String errorMessage) { - if (StringUtils.isNotBlank(errorMessage) - && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { - final String[] msgSplitted = - errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); - if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { - return msgSplitted[0]; - } - } - return null; - } - - /** - * Gets the Stork error message in the saml message if exists! - * - * @param errorMessage The message to get in the saml message if exists; - * - * @return the error message if exists. Returns the original message - * otherwise. - */ - public static String getStorkErrorMessage(final String errorMessage) { - if (StringUtils.isNotBlank(errorMessage) - && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { - final String[] msgSplitted = - errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); - if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { - return msgSplitted[1]; - } - } - return errorMessage; - } - - /** - * Get inputstream from string - * @param string the string to convert - * @param codePage the codepage of string - * @return an inputstream - * @throws UnsupportedEncodingException - */ - public static InputStream getStream(final String string, final String codePage) throws UnsupportedEncodingException - { + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(PEPSUtil.class.getName()); + + /** + * Configurations object. + */ + private static Properties configs; + + /** + * Max prefix. + */ + private static final String MAX_PARAM_PREFIX = "max."; + + /** + * Code prefix to get error code. + */ + private static final String CODE_PARAM_SUFFIX = ".code"; + + /** + * param's size prefix to get max param size. + */ + private static final String MAX_PARAM_SUFFIX = ".size"; + + /** + * Message prefix to get error message. + */ + private static final String MSG_PARAM_SUFFIX = ".message"; + + /** + * Private constructor. Prevents the class from being instantiated. + */ + private PEPSUtil() { + // empty constructor + } + + /** + * Creates a single instance of this class and sets the properties. + * + * @param nConfigs + * The set of available configurations. + * + * @return The created PEPSUtil's class. + */ + public static PEPSUtil createInstance(final Properties nConfigs) { + if (nConfigs != null) { + PEPSUtil.configs = nConfigs; + } + return new PEPSUtil(); + } + + /** + * Getter for the Properties. + * + * @return configs The properties value. + */ + public Properties getConfigs() { + return configs; + } + + /** + * Setter for the Properties. + * + * @param nConfigs + * The new properties value. + */ + public static void setConfigs(final Properties nConfigs) { + if (nConfigs != null) { + PEPSUtil.configs = nConfigs; + } + } + + /** + * Returns the identifier of some configuration given a set of configurations and the corresponding configuration key. + * + * @param configKey + * The key that IDs some configuration. + * + * @return The configuration String value. + */ + public static String getConfig(final String configKey) { + return configs.getProperty(configKey); + } + + /** + * Validates the input paramValue identified by the paramName. + * + * @param paramName + * The name of the parameter to validate. + * @param paramValue + * The value of the parameter to validate. + * + * @return true if the parameter is valid. + */ + public static boolean isValidParameter(final String paramName, final String paramValue) { + + final String validationParam = PEPSUtil.getConfig(PEPSParameters.VALIDATION_ACTIVE.toString()); + boolean retVal = true; + + final String paramConf = MAX_PARAM_PREFIX + paramName + MAX_PARAM_SUFFIX; + + if (PEPSValues.TRUE.toString().equals(validationParam)) { + final String paramSizeStr = PEPSUtil.getConfig(paramConf); + // Checking if the parameter size exists and if it's numeric + if (StringUtils.isNumeric(paramSizeStr)) { + final int maxParamSize = Integer.valueOf(paramSizeStr); + if (StringUtils.isEmpty(paramValue) || paramValue.length() > maxParamSize) { + retVal = false; + LOG.warn("Invalid parameter [" + paramName + "] value " + paramValue); + } + } else { + retVal = false; + LOG.error("Missing " + paramConf + " configuration in the pepsUtils.properties configuration file"); + } + } + return retVal; + } + + /** + * Validates the Parameter and throws an exception if an error occurs. Throws an InvalidParameterPEPSException runtime exception if the parameter is invalid. + * + * @param className + * The Class Name that invoked the method. + * @param paramName + * The name of the parameter to validate. + * @param paramValue + * The value of the parameter to validate. + */ + public static void validateParameter(final String className, final String paramName, final Object paramValue) { + + if (paramValue == null) { + PEPSUtil.validateParameter(className, paramName, ""); + } else { + PEPSUtil.validateParameter(className, paramName, paramValue.toString()); + } + } + + /** + * Validates the Parameters and throws an exception if an error occurs. + * + * @param className + * The Class Name that invoked the method. + * @param paramName + * The name of the parameter to validate. + * @param paramValue + * The value of the parameter to validate. + */ + public static void validateParameter(final String className, final String paramName, final String paramValue) { + + PEPSUtil.validateParameter(className, paramName, paramValue, PEPSUtil.getErrorCode(paramName), PEPSUtil.getErrorMessage(paramName)); + } + + /** + * Validates the Parameters and throws an exception if an error occurs. + * + * @param className + * The Class Name that invoked the method. + * @param paramName + * The name of the parameter to validate. + * @param paramValue + * The value of the parameter to validate. + * @param error + * The PEPSError to get error code and messages from configs. + */ + public static void validateParameter(final String className, final String paramName, final String paramValue, final PEPSErrors error) { + + PEPSUtil.validateParameter(className, paramName, paramValue, PEPSUtil.getConfig(error.errorCode()), PEPSUtil.getConfig(error.errorMessage())); + } + + /** + * Validates the HTTP Parameter and throws an exception if an error occurs. Throws an InvalidParameterPEPSException runtime exception if the parameter is invalid. + * + * @param className + * The Class Name that invoked the method. + * @param paramName + * The name of the parameter to validate. + * @param paramValue + * The value of the parameter to validate. + * @param errorCode + * The error code to include on the exception. + * @param errorMessage + * The error message to include on the exception. + */ + public static void validateParameter(final String className, final String paramName, final String paramValue, final String errorCode, final String errorMessage) { + + if (!isValidParameter(paramName, paramValue)) { + LOG.warn("Invalid parameter [" + paramName + "] value found at " + className); + throw new InvalidParameterPEPSException(errorCode, errorMessage); + } + } + + /** + * Getter for the error code of some given error related to the input param. + * + * @param paramName + * The name of the parameter associated with the error. + * + * @return The code of the error. + */ + private static String getErrorCode(final String paramName) { + return getConfig(paramName + CODE_PARAM_SUFFIX); + } + + /** + * Getter for the error message of some given error related to the input parameter. + * + * @param paramName + * The name of the parameter associated with the message. + * + * @return The message for the error. + */ + private static String getErrorMessage(final String paramName) { + return getConfig(paramName + MSG_PARAM_SUFFIX); + } + + /** + * {@link Base64} encodes the input samlToken parameter. + * + * @param samlToken + * the SAML Token to be encoded. + * + * @return The Base64 String representing the samlToken. + * + * @see Base64#encode + */ + public static String encodeSAMLToken(final byte[] samlToken) { + try { + return new String(Base64.encode(samlToken), "UTF8"); + } catch (final UnsupportedEncodingException e) { + LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e); + return null; + } + } + + /** + * Encode samltoken url safe + * + * @param samlToken + * the saml token to encode + * @return the bas64 encoded string + */ + public static String encodeSAMLTokenUrlSafe(final byte[] samlToken) { + try { + return new String(UrlBase64.encode(samlToken), "UTF8"); + } catch (final UnsupportedEncodingException e) { + LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e); + return null; + } + } + + /** + * Decodes the {@link Base64} String input parameter representing a samlToken. + * + * @param samlToken + * the SAML Token to be decoded. + * + * @return The samlToken decoded bytes. + * + * @see Base64#decode + */ + public static byte[] decodeSAMLToken(final String samlToken) { + return Base64.decode(samlToken); + } + + /** + * Decode URL save base64 saml token + * + * @param samlToken + * the SAML toke to decode + * @return The decoded bytes + */ + public static byte[] decodeSAMLTokenUrlSafe(final String samlToken) { + return UrlBase64.decode(samlToken); + } + + /** + * Hashes a SAML token. Throws an InternalErrorPEPSException runtime exception if the Cryptographic Engine fails. + * + * @param samlToken + * the SAML Token to be hashed. + * + * @return byte[] with the hashed SAML Token. + */ + public static byte[] hashPersonalToken(final byte[] samlToken) { + try { + final String className = PEPSUtil.getConfig(PEPSValues.HASH_DIGEST_CLASS.toString()); + + final Digest digest = (Digest) Class.forName(className).getConstructor().newInstance((Object[]) null); + digest.update(samlToken, 0, samlToken.length); + + final int retLength = digest.getDigestSize(); + final byte[] ret = new byte[retLength]; + + digest.doFinal(ret, 0); + return ret; + + } catch (final Exception e) { + // For all those exceptions that could be thrown, we always log it and + // thrown an InternalErrorPEPSException. + LOG.error(PEPSErrors.HASH_ERROR.errorMessage(), e); + throw new InternalErrorPEPSException(PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorCode()), PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorMessage()), e); + } + } + + /** + * Gets the Stork error code in the error message if exists! + * + * @param errorMessage + * The message to get the error code if exists; + * + * @return the error code if exists. Returns null otherwise. + */ + public static String getStorkErrorCode(final String errorMessage) { + if (StringUtils.isNotBlank(errorMessage) && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { + final String[] msgSplitted = errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); + if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { + return msgSplitted[0]; + } + } + return null; + } + + /** + * Gets the Stork error message in the saml message if exists! + * + * @param errorMessage + * The message to get in the saml message if exists; + * + * @return the error message if exists. Returns the original message otherwise. + */ + public static String getStorkErrorMessage(final String errorMessage) { + if (StringUtils.isNotBlank(errorMessage) && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) { + final String[] msgSplitted = errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString()); + if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) { + return msgSplitted[1]; + } + } + return errorMessage; + } + + /** + * Get inputstream from string + * + * @param string + * the string to convert + * @param codePage + * the codepage of string + * @return an inputstream + * @throws UnsupportedEncodingException + */ + public static InputStream getStream(final String string, final String codePage) throws UnsupportedEncodingException { return new ByteArrayInputStream(string.getBytes(codePage)); - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java index 89cf8fa9b..9cc587d7f 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java @@ -16,327 +16,326 @@ package eu.stork.peps.auth.commons; /** * This enum class contains all the value constants. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.17 $, $Date: 2011-07-07 20:48:45 $ */ public enum PEPSValues { - - /** - * Represents the 'all' constant value. - */ - ALL("all"), - /** - * Represents the 'none' constant value. - */ - NONE("none"), - /** - * Represents the 'true' constant value. - */ - TRUE("true"), - /** - * Represents the 'false' constant value. - */ - FALSE("false"), - /** - * Represents the empty string constant value. - */ - EMPTY_STRING(""), - - /** - * Represents the ',' separator constant value. - */ - ATTRIBUTE_VALUE_SEP(","), - /** - * Represents the ';' separator constant value. - */ - ATTRIBUTE_SEP(";"), - /** - * Represents the ':' separator constant value. - */ - ATTRIBUTE_TUPLE_SEP(":"), - /** - * Represents the '/' separator constant value. - */ - EID_SEPARATOR("/"), - /** - * Represents the ' - ' separator constant value. - */ - ERROR_MESSAGE_SEP(" - "), - /** - * Represents the '#' parameter constant value. - */ - LOGGER_SEP("#"), - /** - * Represents the 'NOT_AVAILABLE' parameter constant value. - */ - NOT_AVAILABLE("NotAvailable"), - /** - * Represents the ';' parameter constant value. - */ - SPEPS_AUTHORIZED_SEP(";"), - - /** - * Represents the 'ap' constant value. - */ - AP("ap"), - /** - * Represents the 'C-PEPS' constant value. - */ - CPEPS("C-PEPS"), - /** - * Represents the 'cpeps' constant value. - */ - CPEPS_PREFIX("cpeps"), - /** - * Represents the 'peps' constant value. - */ - PEPS("peps"), - /** - * Represents the '-PEPS' constant value. - */ - PEPS_SUFFIX("-PEPS"), - /** - * Represents the 'SP' constant value. - */ - SP("SP"), - /** - * Represents the 'S-PEPS' constant value. - */ - SPEPS("S-PEPS"), - /** - * Represents the 'speps' constant value. - */ - SPEPS_PREFIX("speps"), - /** - * Represents the 'sp.default.parameters' constant value. - */ - DEFAULT("sp.default.parameters"), - /** - * Represents the default saml id constant value. - */ - DEFAULT_SAML_ID("1"), - /** - * Represents the 'hashDigest.className' constant value. - */ - HASH_DIGEST_CLASS("hashDigest.className"), - - /** - * Represents the 'eu.stork.communication.requests' constant value. - */ - STORK_PACKAGE_REQUEST_LOGGER_VALUE("eu.stork.communication.requests"), - /** - * Represents the 'eu.stork.communication.responses' constant value. - */ - STORK_PACKAGE_RESPONSE_LOGGER_VALUE("eu.stork.communication.responses"), - - /** - * Represents the 'S-PEPS receives request from SP' constant value. - */ - SP_REQUEST("S-PEPS receives request from SP"), - /** - * Represents the 'Get Citizen Consent' constant value. - */ - CITIZEN_CONSENT_LOG("Get Citizen Consent"), - /** - * Represents the 'C-PEPS receives request from S-PEPS' constant value. - */ - CPEPS_REQUEST("C-PEPS receives request from S-PEPS"), - /** - * Represents the 'C-PEPS generates response to S-PEPS' constant value. - */ - CPEPS_RESPONSE("C-PEPS generates response to S-PEPS"), - /** - * Represents the 'S-PEPS generates request to C-PEPS' constant value. - */ - SPEPS_REQUEST("S-PEPS generates request to C-PEPS"), - /** - * Represents the 'S-PEPS receives response from C-PEPS' constant value. - */ - SPEPS_RESPONSE("S-PEPS receives response from C-PEPS"), - /** - * Represents the 'S-PEPS generates response to SP' constant value. - */ - SP_RESPONSE("S-PEPS generates response to SP"), - /** - * Represents the 'Success' constant value. - */ - SUCCESS("Success"), - /** - * Represents the December's month number constant value. - */ - LAST_MONTH("12"), - /** - * Represents the yyyyMM constant value. - */ - NO_DAY_DATE_FORMAT("yyyyMM"), - - /** - * Represents the 'attrValue' constant value. - */ - ATTRIBUTE("attrValue"), - /** - * Represents the 'derivedAttr' constant value. - */ - DERIVE_ATTRIBUTE("deriveAttr"), - /** - * Represents the 'storkAttribute' constant value. - */ - STORK_ATTRIBUTE("storkAttribute"), - - /** - * Represents the 'properties' constant value. - */ - PROPERTIES("properties"), - /** - * Represents the 'referer' constant value. - */ - REFERER("referer"), - /** - * Represents the 'host' constant value. - */ - HOST("host"), - /** - * Represents the 'spid' constant value. - */ - SPID("spid"), - /** - * Represents the 'domain' constant value. - */ - DOMAIN("domain"), - /** - * Represents the '.validation' constant value. - */ - VALIDATION_SUFFIX(".validation"), - /** - * Represents the 'jsessionid' constant value. - */ - EQUAL("="), - /** - * Represents the 'HttpOnly' constant value. - */ - HTTP_ONLY("HttpOnly"), - /** - * Represents the 'SET-COOKIE' constant value. - */ - JSSESSION("JSESSIONID"), - /** - * Represents the '=' constant value. - */ - SETCOOKIE("SET-COOKIE"), - /** - * Represents the ';' constant value. - */ - SEMICOLON(";"), - /** - * Represents the ' ' constant value. - */ - SPACE(" "), - /** - * Represents the 'atp' constant value. - */ - APROVIDER_PREFIX("atp"), - /** - * Represents the 'atn' constant value. - */ - ANAME_PREFIX("atn"), - /** - * Represents the 'ap-cpeps' constant value. - */ - AP_CPEPS_PREFIX("ap-cpeps"), - /** - * Represents the 'attr-filter' constant value. - */ - AP_ATTRFILTER_PREFIX("attr-filter"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - PEPSValues(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".id". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String index(final int index) { - - return value + index + ".id"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".value". - * - * @param index the number. - * - * @return The concatenated string value. - */ - public String value(final int index) { - - return value + index + ".value"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".name". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String name(final int index) { - - return value + index + ".name"; - } - - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".url". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String url(final int index) { - - return value + index + ".url"; - } - /** - * Construct the return value with the following structure - * CONSTANT_VALUE+index+".allowedGroups". - * - * @param index the number. - * - * @return The concatenated String value. - */ - public String allowedGroups(final int index) { - - return value + index + ".allowedGroups"; - } + /** + * Represents the 'all' constant value. + */ + ALL("all"), + /** + * Represents the 'none' constant value. + */ + NONE("none"), + /** + * Represents the 'true' constant value. + */ + TRUE("true"), + /** + * Represents the 'false' constant value. + */ + FALSE("false"), + /** + * Represents the empty string constant value. + */ + EMPTY_STRING(""), + + /** + * Represents the ',' separator constant value. + */ + ATTRIBUTE_VALUE_SEP(","), + /** + * Represents the ';' separator constant value. + */ + ATTRIBUTE_SEP(";"), + /** + * Represents the ':' separator constant value. + */ + ATTRIBUTE_TUPLE_SEP(":"), + /** + * Represents the '/' separator constant value. + */ + EID_SEPARATOR("/"), + /** + * Represents the ' - ' separator constant value. + */ + ERROR_MESSAGE_SEP(" - "), + /** + * Represents the '#' parameter constant value. + */ + LOGGER_SEP("#"), + /** + * Represents the 'NOT_AVAILABLE' parameter constant value. + */ + NOT_AVAILABLE("NotAvailable"), + /** + * Represents the ';' parameter constant value. + */ + SPEPS_AUTHORIZED_SEP(";"), + + /** + * Represents the 'ap' constant value. + */ + AP("ap"), + /** + * Represents the 'C-PEPS' constant value. + */ + CPEPS("C-PEPS"), + /** + * Represents the 'cpeps' constant value. + */ + CPEPS_PREFIX("cpeps"), + /** + * Represents the 'peps' constant value. + */ + PEPS("peps"), + /** + * Represents the '-PEPS' constant value. + */ + PEPS_SUFFIX("-PEPS"), + /** + * Represents the 'SP' constant value. + */ + SP("SP"), + /** + * Represents the 'S-PEPS' constant value. + */ + SPEPS("S-PEPS"), + /** + * Represents the 'speps' constant value. + */ + SPEPS_PREFIX("speps"), + /** + * Represents the 'sp.default.parameters' constant value. + */ + DEFAULT("sp.default.parameters"), + /** + * Represents the default saml id constant value. + */ + DEFAULT_SAML_ID("1"), + /** + * Represents the 'hashDigest.className' constant value. + */ + HASH_DIGEST_CLASS("hashDigest.className"), + + /** + * Represents the 'eu.stork.communication.requests' constant value. + */ + STORK_PACKAGE_REQUEST_LOGGER_VALUE("eu.stork.communication.requests"), + /** + * Represents the 'eu.stork.communication.responses' constant value. + */ + STORK_PACKAGE_RESPONSE_LOGGER_VALUE("eu.stork.communication.responses"), + + /** + * Represents the 'S-PEPS receives request from SP' constant value. + */ + SP_REQUEST("S-PEPS receives request from SP"), + /** + * Represents the 'Get Citizen Consent' constant value. + */ + CITIZEN_CONSENT_LOG("Get Citizen Consent"), + /** + * Represents the 'C-PEPS receives request from S-PEPS' constant value. + */ + CPEPS_REQUEST("C-PEPS receives request from S-PEPS"), + /** + * Represents the 'C-PEPS generates response to S-PEPS' constant value. + */ + CPEPS_RESPONSE("C-PEPS generates response to S-PEPS"), + /** + * Represents the 'S-PEPS generates request to C-PEPS' constant value. + */ + SPEPS_REQUEST("S-PEPS generates request to C-PEPS"), + /** + * Represents the 'S-PEPS receives response from C-PEPS' constant value. + */ + SPEPS_RESPONSE("S-PEPS receives response from C-PEPS"), + /** + * Represents the 'S-PEPS generates response to SP' constant value. + */ + SP_RESPONSE("S-PEPS generates response to SP"), + /** + * Represents the 'Success' constant value. + */ + SUCCESS("Success"), + /** + * Represents the December's month number constant value. + */ + LAST_MONTH("12"), + /** + * Represents the yyyyMM constant value. + */ + NO_DAY_DATE_FORMAT("yyyyMM"), + + /** + * Represents the 'attrValue' constant value. + */ + ATTRIBUTE("attrValue"), + /** + * Represents the 'derivedAttr' constant value. + */ + DERIVE_ATTRIBUTE("deriveAttr"), + /** + * Represents the 'storkAttribute' constant value. + */ + STORK_ATTRIBUTE("storkAttribute"), + + /** + * Represents the 'properties' constant value. + */ + PROPERTIES("properties"), + /** + * Represents the 'referer' constant value. + */ + REFERER("referer"), + /** + * Represents the 'host' constant value. + */ + HOST("host"), + /** + * Represents the 'spid' constant value. + */ + SPID("spid"), + /** + * Represents the 'domain' constant value. + */ + DOMAIN("domain"), + /** + * Represents the '.validation' constant value. + */ + VALIDATION_SUFFIX(".validation"), + /** + * Represents the 'jsessionid' constant value. + */ + EQUAL("="), + /** + * Represents the 'HttpOnly' constant value. + */ + HTTP_ONLY("HttpOnly"), + /** + * Represents the 'SET-COOKIE' constant value. + */ + JSSESSION("JSESSIONID"), + /** + * Represents the '=' constant value. + */ + SETCOOKIE("SET-COOKIE"), + /** + * Represents the ';' constant value. + */ + SEMICOLON(";"), + /** + * Represents the ' ' constant value. + */ + SPACE(" "), + /** + * Represents the 'atp' constant value. + */ + APROVIDER_PREFIX("atp"), + /** + * Represents the 'atn' constant value. + */ + ANAME_PREFIX("atn"), + /** + * Represents the 'ap-cpeps' constant value. + */ + AP_CPEPS_PREFIX("ap-cpeps"), + /** + * Represents the 'attr-filter' constant value. + */ + AP_ATTRFILTER_PREFIX("attr-filter"); + + /** + * Represents the constant's value. + */ + private String value; + + /** + * Solo Constructor. + * + * @param val + * The Constant value. + */ + PEPSValues(final String val) { + + this.value = val; + } + + /** + * Return the Constant Value. + * + * @return The constant value. + */ + public String toString() { + + return value; + } + + /** + * Construct the return value with the following structure CONSTANT_VALUE+index+".id". + * + * @param index + * the number. + * + * @return The concatenated String value. + */ + public String index(final int index) { + + return value + index + ".id"; + } + + /** + * Construct the return value with the following structure CONSTANT_VALUE+index+".value". + * + * @param index + * the number. + * + * @return The concatenated string value. + */ + public String value(final int index) { + + return value + index + ".value"; + } + + /** + * Construct the return value with the following structure CONSTANT_VALUE+index+".name". + * + * @param index + * the number. + * + * @return The concatenated String value. + */ + public String name(final int index) { + + return value + index + ".name"; + } + + /** + * Construct the return value with the following structure CONSTANT_VALUE+index+".url". + * + * @param index + * the number. + * + * @return The concatenated String value. + */ + public String url(final int index) { + + return value + index + ".url"; + } + + /** + * Construct the return value with the following structure CONSTANT_VALUE+index+".allowedGroups". + * + * @param index + * the number. + * + * @return The concatenated String value. + */ + public String allowedGroups(final int index) { + + return value + index + ".allowedGroups"; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java index 15803fb68..49ea3e695 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java @@ -25,324 +25,322 @@ import org.apache.log4j.Logger; import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException; /** - * This class is a bean used to store the information relative to the - * PersonalAttribute. + * This class is a bean used to store the information relative to the PersonalAttribute. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.22 $, $Date: 2010-11-17 05:15:28 $ */ public final class PersonalAttribute implements Serializable, Cloneable { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 2612951678412632174L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(PersonalAttribute.class - .getName()); - - /** - * Name of the personal attribute. - */ - private String name; - - /** - * Values of the personal attribute. - */ - private List value = new ArrayList(); - - /** - * Type of the personal attribute. - */ - private String type; - - /** - * Complex values of the personal attribute. - */ - private Map complexValue = new ConcurrentHashMap(); - - /** - * Is the personal attribute mandatory? - */ - private boolean required; - - /** - * Returned status of the attribute from the IdP. - */ - private String status; - - /** - * Name of the personal attribute. - */ - private String friendlyName; - - /** - * Empty Constructor. - */ - public PersonalAttribute() { - super(); - } - - /** - * PersonalAttribute Constructor for complex values. - * - * @param attrName The attribute name. - * @param attrIsRequired The attribute type value. - * @param attrComplexValue The attribute's value. - * @param attrStatus The attribute's status value. - */ - public PersonalAttribute(final String attrName, final boolean attrIsRequired, - final List attrComplexValue, final String attrStatus) { - this.setName(attrName); - this.setIsRequired(attrIsRequired); - this.setValue(attrComplexValue); - this.setStatus(attrStatus); - } - - /** - * PersonalAttribute Constructor for complex values. - * - * @param attrName The attribute name. - * @param attrIsRequired The attribute type value. - * @param attrComplexValue The attribute's complex value. - * @param attrStatus The attribute's status value. - */ - public PersonalAttribute(final String attrName, final boolean attrIsRequired, - final Map attrComplexValue, final String attrStatus) { - this.setName(attrName); - this.setIsRequired(attrIsRequired); - this.setComplexValue(attrComplexValue); - this.setStatus(attrStatus); - } - - /** - * {@inheritDoc} - */ - @SuppressWarnings("unchecked") - public Object clone() { - - try { - final PersonalAttribute personalAttr = (PersonalAttribute) super.clone(); - personalAttr.setIsRequired(this.isRequired()); - personalAttr.setName(this.getName()); - personalAttr.setStatus(this.getStatus()); - if (!isEmptyValue()) { - final List val = - (List) ((ArrayList) this.getValue()).clone(); - personalAttr.setValue(val); - } - if (!isEmptyComplexValue()) { - final Map complexVal = - (Map) ((HashMap) this - .getComplexValue()).clone(); - personalAttr.setComplexValue(complexVal); - } - return personalAttr; - } catch (final CloneNotSupportedException e) { - // assert false; - LOG.trace("Nothing to do."); - throw new InternalErrorPEPSException( - PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorCode()), - PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorMessage()), e); - } - } - - /** - * Getter for the required value. - * - * @return The required value. - */ - public boolean isRequired() { - return required; - } - - /** - * Setter for the required value. - * - * @param attrIsRequired this attribute? - */ - public void setIsRequired(final boolean attrIsRequired) { - this.required = attrIsRequired; - } - - /** - * Getter for the name value. - * - * @return The name value. - */ - public String getName() { - return name; - } - - /** - * Setter for the name value. - * - * @param attrName The personal attribute name. - */ - public void setName(final String attrName) { - this.name = attrName; - } - - /** - * Getter for the value. - * - * @return The list of values. - */ - public List getValue() { - return value; - } - - /** - * Setter for the list of values. - * - * @param attrValue The personal attribute value. - */ - public void setValue(final List attrValue) { - if (attrValue != null) { - this.value = attrValue; - } - } - - - /** - * Getter for the type value. - * - * @return The name value. - */ - public String getType() { - return type; - } - - /** - * Setter for the type value. - * - * @param attrName The personal attribute type. - */ - public void setType(final String attrType) { - this.type = attrType; - } - - /** - * Getter for the status. - * - * @return The status value. - */ - public String getStatus() { - return status; - } - - /** - * Setter for the status value. - * - * @param attrStatus The personal attribute status. - */ - public void setStatus(final String attrStatus) { - this.status = attrStatus; - } - - /** - * Getter for the complex value. - * - * @return The complex value. - */ - public Map getComplexValue() { - return complexValue; - } - - /** - * Setter for the complex value. - * - * @param complexVal The personal attribute Complex value. - */ - public void setComplexValue(final Map complexVal) { - if (complexVal != null) { - this.complexValue = complexVal; - } - } - - /** - * Getter for the personal's friendly name. - * - * @return The personal's friendly name value. - */ - public String getFriendlyName() { - return friendlyName; - } - - /** - * Setter for the personal's friendly name. - * - * @param fName The personal's friendly name. - */ - public void setFriendlyName(final String fName) { - this.friendlyName = fName; - } - - /** - * Return true the value is empty. - * - * @return True if the value is empty "[]"; - */ - public boolean isEmptyValue() { - return value.isEmpty() || (value.size() == 1 && value.get(0).length() == 0); - } - - /** - * Returns true if the Complex Value is empty. - * - * @return True if the Complex Value is empty; - */ - public boolean isEmptyComplexValue() { - return complexValue.isEmpty(); - } - - /** - * Returns true if the Status is empty. - * - * @return True if the Status is empty; - */ - public boolean isEmptyStatus() { - return (status == null || status.length() == 0); - } - - /** - * Prints the PersonalAttribute in the following format. - * name:required:[v,a,l,u,e,s]|[v=a,l=u,e=s]:status; - * - * @return The PersonalAttribute as a string. - */ - public String toString() { - final StringBuilder strBuild = new StringBuilder(); - - AttributeUtil.appendIfNotNull(strBuild, getName()); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - AttributeUtil.appendIfNotNull(strBuild, String.valueOf(isRequired())); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - strBuild.append('['); - - if (isEmptyValue()) { - if (!isEmptyComplexValue()) { - AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.mapToString( - getComplexValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); - } - } else { - AttributeUtil.appendIfNotNull( - strBuild, - AttributeUtil.listToString(getValue(), - PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); - } - - strBuild.append(']'); - strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); - AttributeUtil.appendIfNotNull(strBuild, getStatus()); - strBuild.append(PEPSValues.ATTRIBUTE_SEP.toString()); - - return strBuild.toString(); - } - + + /** + * Unique identifier. + */ + private static final long serialVersionUID = 2612951678412632174L; + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(PersonalAttribute.class.getName()); + + /** + * Name of the personal attribute. + */ + private String name; + + /** + * Values of the personal attribute. + */ + private List value = new ArrayList(); + + /** + * Type of the personal attribute. + */ + private String type; + + /** + * Complex values of the personal attribute. + */ + private Map complexValue = new ConcurrentHashMap(); + + /** + * Is the personal attribute mandatory? + */ + private boolean required; + + /** + * Returned status of the attribute from the IdP. + */ + private String status; + + /** + * Name of the personal attribute. + */ + private String friendlyName; + + /** + * Empty Constructor. + */ + public PersonalAttribute() { + super(); + } + + /** + * PersonalAttribute Constructor for complex values. + * + * @param attrName + * The attribute name. + * @param attrIsRequired + * The attribute type value. + * @param attrComplexValue + * The attribute's value. + * @param attrStatus + * The attribute's status value. + */ + public PersonalAttribute(final String attrName, final boolean attrIsRequired, final List attrComplexValue, final String attrStatus) { + this.setName(attrName); + this.setIsRequired(attrIsRequired); + this.setValue(attrComplexValue); + this.setStatus(attrStatus); + } + + /** + * PersonalAttribute Constructor for complex values. + * + * @param attrName + * The attribute name. + * @param attrIsRequired + * The attribute type value. + * @param attrComplexValue + * The attribute's complex value. + * @param attrStatus + * The attribute's status value. + */ + public PersonalAttribute(final String attrName, final boolean attrIsRequired, final Map attrComplexValue, final String attrStatus) { + this.setName(attrName); + this.setIsRequired(attrIsRequired); + this.setComplexValue(attrComplexValue); + this.setStatus(attrStatus); + } + + /** + * {@inheritDoc} + */ + @SuppressWarnings("unchecked") + public Object clone() { + + try { + final PersonalAttribute personalAttr = (PersonalAttribute) super.clone(); + personalAttr.setIsRequired(this.isRequired()); + personalAttr.setName(this.getName()); + personalAttr.setStatus(this.getStatus()); + if (!isEmptyValue()) { + final List val = (List) ((ArrayList) this.getValue()).clone(); + personalAttr.setValue(val); + } + if (!isEmptyComplexValue()) { + final Map complexVal = (Map) ((HashMap) this.getComplexValue()).clone(); + personalAttr.setComplexValue(complexVal); + } + return personalAttr; + } catch (final CloneNotSupportedException e) { + // assert false; + LOG.trace("Nothing to do."); + throw new InternalErrorPEPSException(PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorCode()), PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorMessage()), e); + } + } + + /** + * Getter for the required value. + * + * @return The required value. + */ + public boolean isRequired() { + return required; + } + + /** + * Setter for the required value. + * + * @param attrIsRequired + * this attribute? + */ + public void setIsRequired(final boolean attrIsRequired) { + this.required = attrIsRequired; + } + + /** + * Getter for the name value. + * + * @return The name value. + */ + public String getName() { + return name; + } + + /** + * Setter for the name value. + * + * @param attrName + * The personal attribute name. + */ + public void setName(final String attrName) { + this.name = attrName; + } + + /** + * Getter for the value. + * + * @return The list of values. + */ + public List getValue() { + return value; + } + + /** + * Setter for the list of values. + * + * @param attrValue + * The personal attribute value. + */ + public void setValue(final List attrValue) { + if (attrValue != null) { + this.value = attrValue; + } + } + + /** + * Getter for the type value. + * + * @return The name value. + */ + public String getType() { + return type; + } + + /** + * Setter for the type value. + * + * @param attrName + * The personal attribute type. + */ + public void setType(final String attrType) { + this.type = attrType; + } + + /** + * Getter for the status. + * + * @return The status value. + */ + public String getStatus() { + return status; + } + + /** + * Setter for the status value. + * + * @param attrStatus + * The personal attribute status. + */ + public void setStatus(final String attrStatus) { + this.status = attrStatus; + } + + /** + * Getter for the complex value. + * + * @return The complex value. + */ + public Map getComplexValue() { + return complexValue; + } + + /** + * Setter for the complex value. + * + * @param complexVal + * The personal attribute Complex value. + */ + public void setComplexValue(final Map complexVal) { + if (complexVal != null) { + this.complexValue = complexVal; + } + } + + /** + * Getter for the personal's friendly name. + * + * @return The personal's friendly name value. + */ + public String getFriendlyName() { + return friendlyName; + } + + /** + * Setter for the personal's friendly name. + * + * @param fName + * The personal's friendly name. + */ + public void setFriendlyName(final String fName) { + this.friendlyName = fName; + } + + /** + * Return true the value is empty. + * + * @return True if the value is empty "[]"; + */ + public boolean isEmptyValue() { + return value.isEmpty() || (value.size() == 1 && value.get(0).length() == 0); + } + + /** + * Returns true if the Complex Value is empty. + * + * @return True if the Complex Value is empty; + */ + public boolean isEmptyComplexValue() { + return complexValue.isEmpty(); + } + + /** + * Returns true if the Status is empty. + * + * @return True if the Status is empty; + */ + public boolean isEmptyStatus() { + return (status == null || status.length() == 0); + } + + /** + * Prints the PersonalAttribute in the following format. name:required:[v,a,l,u,e,s]|[v=a,l=u,e=s]:status; + * + * @return The PersonalAttribute as a string. + */ + public String toString() { + final StringBuilder strBuild = new StringBuilder(); + + AttributeUtil.appendIfNotNull(strBuild, getName()); + strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); + AttributeUtil.appendIfNotNull(strBuild, String.valueOf(isRequired())); + strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); + strBuild.append('['); + + if (isEmptyValue()) { + if (!isEmptyComplexValue()) { + AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.mapToString(getComplexValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); + } + } else { + AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.listToString(getValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString())); + } + + strBuild.append(']'); + strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()); + AttributeUtil.appendIfNotNull(strBuild, getStatus()); + strBuild.append(PEPSValues.ATTRIBUTE_SEP.toString()); + + return strBuild.toString(); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java index 9a0f87488..8f60bdc0d 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java @@ -26,372 +26,353 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; /** - * This class is a bean used to store the information relative to the - * PersonalAttributeList. + * This class is a bean used to store the information relative to the PersonalAttributeList. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.27 $, $Date: 2010-11-18 22:54:56 $ * * @see PersonalAttribute */ @SuppressWarnings("PMD") -public final class PersonalAttributeList extends - ConcurrentHashMap implements IPersonalAttributeList, Serializable { - - /** - * Logger object. - */ - private static final Logger LOG = Logger - .getLogger(PersonalAttributeList.class.getName()); - - /** - * Serial id. - */ - private static final long serialVersionUID = 7375127363889975062L; - - /** - * Hash with the latest fetched attribute name alias. - */ - private final Map latestAttrAlias = - new HashMap(); - - /** - * Hash with mapping number of alias or the attribute name. - */ - private final Map attrAliasNumber = - new HashMap(); - - /** - * Default constructor. - */ - public PersonalAttributeList() { - // The best practices recommend to call the super constructor. - super(); - } - - /** - * Constructor with initial capacity for the PersonalAttributeList size. - * - * @param capacity The initial capacity for the PersonalAttributeList. - */ - public PersonalAttributeList(final int capacity) { - super(capacity); - } - - /** - * {@inheritDoc} - */ - public Iterator iterator() { - return this.values().iterator(); - } - - /** - * {@inheritDoc} - */ - public PersonalAttribute get(final Object key) { - String attrName = (String) key; - - if (this.latestAttrAlias.containsKey(key)) { - attrName = attrName + this.latestAttrAlias.get(key); - } else { - if (this.attrAliasNumber.containsKey(key)) { - this.latestAttrAlias.put(attrName, this.attrAliasNumber.get(key)); - } - } - return super.get(attrName); - } - - /** - * {@inheritDoc} - */ - public void add(final PersonalAttribute value) { - if (value != null) { - this.put(value.getName(), value); - } - } - - /** - * {@inheritDoc} - */ - public PersonalAttribute put(final String key, final PersonalAttribute val) { - if (StringUtils.isNotEmpty(key) && val != null) { - // Validate if attribute name already exists! - String attrAlias = key; - if (this.containsKey(attrAlias)) { - //TODO isAgeOver should not be hardcoded, a better way of handling multipe isAgeOver requests should be implemented. - if (!val.isEmptyValue() && StringUtils.isNumeric(val.getValue().get(0)) && "isAgeOver".equals( val.getName() ) ) { - final String attrValue = val.getValue().get(0); - attrAlias = key + attrValue; - this.attrAliasNumber.put(key, Integer.valueOf(attrValue)); - } else { - final PersonalAttribute attr = super.get(key); - if (!attr.isEmptyValue() - && StringUtils.isNumeric(attr.getValue().get(0))) { - attrAlias = key + attr.getValue().get(0); - super.put(key, (PersonalAttribute) attr); - this.attrAliasNumber.put(key, null); - } - } - } - return super.put(attrAlias, val); - } else { - return null; - } - } - - /** - * {@inheritDoc} - */ - public void populate(final String attrList) { - final StringTokenizer strToken = - new StringTokenizer(attrList, PEPSValues.ATTRIBUTE_SEP.toString()); - - while (strToken.hasMoreTokens()) { - final PersonalAttribute persAttr = new PersonalAttribute(); - String[] tuples = - strToken.nextToken().split(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(), - AttributeConstants.NUMBER_TUPLES.intValue()); - - // Convert to the new format if needed! - tuples = convertFormat(tuples); - - if (AttributeUtil.hasValidTuples(tuples)) { - final int attrValueIndex = - AttributeConstants.ATTR_VALUE_INDEX.intValue(); - final String tmpAttrValue = - tuples[attrValueIndex].substring(1, - tuples[attrValueIndex].length() - 1); - final String[] vals = - tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); - - persAttr.setName(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()]); - persAttr.setIsRequired(Boolean - .valueOf(tuples[AttributeConstants.ATTR_TYPE_INDEX.intValue()])); - - // check if it is a complex value - if (isComplexValue(vals)) { - persAttr.setComplexValue(createComplexValue(vals)); - } - else - { - persAttr.setValue(createValues(vals)); - } - - if (tuples.length == AttributeConstants.NUMBER_TUPLES.intValue()) { - persAttr.setStatus(tuples[AttributeConstants.ATTR_STATUS_INDEX - .intValue()]); - } - this.put(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()], - persAttr); - - } else { - LOG.warn("Invalid personal attribute list tuples"); - } - - } - } - - /** - * Returns a copy of this IPersonalAttributeList instance. - * - * @return The copy of this IPersonalAttributeList. - */ - public Object clone() { - try { - return (PersonalAttributeList) super.clone(); - } catch (CloneNotSupportedException e) { - return null; - } - } - - /** - * Creates a string in the following format. - * - * attrName:attrType:[attrValue1,attrValue2=attrComplexValue]:attrStatus; - * - * @return {@inheritDoc} - */ - @Override - public String toString() { - final Iterator> itAttrs = - this.entrySet().iterator(); - final StringBuilder strBuilder = new StringBuilder(); - - while (itAttrs.hasNext()) { - final Entry attrEntry = itAttrs.next(); - final PersonalAttribute attr = attrEntry.getValue(); - //strBuilder.append(attr.toString()); - strBuilder.insert(0, attr.toString()); - } - - return strBuilder.toString(); - } - - /** - * Validates and creates the attribute's complex values. - * - * @param values The complex values. - * - * @return The {@link Map} with the complex values. - * - * @see Map - */ - private Map createComplexValue(final String[] values) { - final Map complexValue = new HashMap(); - for (final String val : values) { - final String[] tVal = val.split("="); - if (StringUtils.isNotEmpty(val) && tVal.length == 2) { - complexValue.put(tVal[0], AttributeUtil.unescape(tVal[1])); - } - } - return complexValue; - } - - /** - * Checks if value is complex or not - * @param values The values to check - * @return True if succesful - */ - private boolean isComplexValue(final String[] values) { - boolean isComplex = false; - if (values.length > 0) { - final String[] tVal = values[0].split("="); - if (StringUtils.isNotEmpty(values[0]) && tVal.length == 2) { - isComplex = true; - } - } - return isComplex; - } - - /** - * Validates and creates the attribute values. - * - * @param vals The attribute values. - * - * @return The {@link List} with the attribute values. - * - * @see List - */ - private List createValues(final String[] vals) { - final List values = new ArrayList(); - for (final String val : vals) { - if (StringUtils.isNotEmpty(val)) { - values.add(AttributeUtil.unescape(val)); - } - } - return values; - } - - /** - * Converts the attribute tuple (attrName:attrType...) to the new format. - * - * @param tuples The attribute tuples to convert. - * - * @return The attribute tuples in the new format. - */ - private String[] convertFormat(final String[] tuples) { - final String[] newFormatTuples = - new String[AttributeConstants.NUMBER_TUPLES.intValue()]; - if (tuples != null) { - System.arraycopy(tuples, 0, newFormatTuples, 0, tuples.length); - - for (int i = tuples.length; i < newFormatTuples.length; i++) { - if (i == AttributeConstants.ATTR_VALUE_INDEX.intValue()) { - newFormatTuples[i] = "[]"; - } else { - newFormatTuples[i] = ""; - } - } - } - return newFormatTuples; - } - - /** - * Returns a IPersonalAttributeList of the complex attributes in this map. - * - * @return an IPersonalAttributeList of the complex attributes contained in this map. - */ - public IPersonalAttributeList getComplexAttributes() { - LOG.info("get complex attributes"); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(!attr.getComplexValue().isEmpty()) { - attrList.put(attr.getName(), attr); - LOG.info("adding complex attribute:"+attr.getName()); - } - } - return attrList; - } - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - public IPersonalAttributeList getSimpleValueAttributes() { - LOG.info("get simple attributes"); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(attr.getComplexValue().isEmpty()) { - attrList.put(attr.getName(), attr); - LOG.info("adding simple attribute:"+attr.getName()); - } - } - return attrList; - } - - - - /** - * Returns a IPersonalAttributeList of the mandatory attributes in this map. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map. - */ - public IPersonalAttributeList getMandatoryAttributes() { - return getAttributesByParam(true); - } - - - /** - * Returns a IPersonalAttributeList of the attributes in this map by parameter value. - * - * @param compareValue The boolean to get mandatory (true) or optional (false) attributes. - * - * @return an IPersonalAttributeList of the mandatory attributes contained in this map if compareValue is true or optional otherwise. - */ - private IPersonalAttributeList getAttributesByParam(final boolean compareValue) { - LOG.info("get attributes by param :"+compareValue); - IPersonalAttributeList attrList = new PersonalAttributeList(); - for(PersonalAttribute attr: this) { - if(attr.isRequired() == compareValue) { - attrList.put(attr.getName(), attr); - LOG.info("adding attribute:"+attr.getName()); - } - } - return attrList; - } - - - /** - * Returns a IPersonalAttributeList of the optional attributes in this map. - * - * @return an IPersonalAttributeList of the optional attributes contained in this map. - */ - public IPersonalAttributeList getOptionalAttributes() { - return getAttributesByParam(false); - } - - /** - * {@inheritDoc} - */ - public boolean hasMissingValues() { - for(PersonalAttribute attr: this) { - if(attr.isEmptyValue() && attr.isEmptyComplexValue()) { - return true; - } - } - return false; - } +public final class PersonalAttributeList extends ConcurrentHashMap implements IPersonalAttributeList, Serializable { + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(PersonalAttributeList.class.getName()); + + /** + * Serial id. + */ + private static final long serialVersionUID = 7375127363889975062L; + + /** + * Hash with the latest fetched attribute name alias. + */ + private final Map latestAttrAlias = new HashMap(); + + /** + * Hash with mapping number of alias or the attribute name. + */ + private final Map attrAliasNumber = new HashMap(); + + /** + * Default constructor. + */ + public PersonalAttributeList() { + // The best practices recommend to call the super constructor. + super(); + } + + /** + * Constructor with initial capacity for the PersonalAttributeList size. + * + * @param capacity + * The initial capacity for the PersonalAttributeList. + */ + public PersonalAttributeList(final int capacity) { + super(capacity); + } + + /** + * {@inheritDoc} + */ + public Iterator iterator() { + return this.values().iterator(); + } + + /** + * {@inheritDoc} + */ + public PersonalAttribute get(final Object key) { + String attrName = (String) key; + + if (this.latestAttrAlias.containsKey(key)) { + attrName = attrName + this.latestAttrAlias.get(key); + } else { + if (this.attrAliasNumber.containsKey(key)) { + this.latestAttrAlias.put(attrName, this.attrAliasNumber.get(key)); + } + } + return super.get(attrName); + } + + /** + * {@inheritDoc} + */ + public void add(final PersonalAttribute value) { + if (value != null) { + this.put(value.getName(), value); + } + } + + /** + * {@inheritDoc} + */ + public PersonalAttribute put(final String key, final PersonalAttribute val) { + if (StringUtils.isNotEmpty(key) && val != null) { + // Validate if attribute name already exists! + String attrAlias = key; + if (this.containsKey(attrAlias)) { + // TODO isAgeOver should not be hardcoded, a better way of handling multipe isAgeOver requests should be implemented. + if (!val.isEmptyValue() && StringUtils.isNumeric(val.getValue().get(0)) && "isAgeOver".equals(val.getName())) { + final String attrValue = val.getValue().get(0); + attrAlias = key + attrValue; + this.attrAliasNumber.put(key, Integer.valueOf(attrValue)); + } else { + final PersonalAttribute attr = super.get(key); + if (!attr.isEmptyValue() && StringUtils.isNumeric(attr.getValue().get(0))) { + attrAlias = key + attr.getValue().get(0); + super.put(key, (PersonalAttribute) attr); + this.attrAliasNumber.put(key, null); + } + } + } + return super.put(attrAlias, val); + } else { + return null; + } + } + + /** + * {@inheritDoc} + */ + public void populate(final String attrList) { + final StringTokenizer strToken = new StringTokenizer(attrList, PEPSValues.ATTRIBUTE_SEP.toString()); + + while (strToken.hasMoreTokens()) { + final PersonalAttribute persAttr = new PersonalAttribute(); + String[] tuples = strToken.nextToken().split(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(), AttributeConstants.NUMBER_TUPLES.intValue()); + + // Convert to the new format if needed! + tuples = convertFormat(tuples); + + if (AttributeUtil.hasValidTuples(tuples)) { + final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue(); + final String tmpAttrValue = tuples[attrValueIndex].substring(1, tuples[attrValueIndex].length() - 1); + final String[] vals = tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString()); + + persAttr.setName(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()]); + persAttr.setIsRequired(Boolean.valueOf(tuples[AttributeConstants.ATTR_TYPE_INDEX.intValue()])); + + // check if it is a complex value + if (isComplexValue(vals)) { + persAttr.setComplexValue(createComplexValue(vals)); + } else { + persAttr.setValue(createValues(vals)); + } + + if (tuples.length == AttributeConstants.NUMBER_TUPLES.intValue()) { + persAttr.setStatus(tuples[AttributeConstants.ATTR_STATUS_INDEX.intValue()]); + } + this.put(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()], persAttr); + + } else { + LOG.warn("Invalid personal attribute list tuples"); + } + + } + } + + /** + * Returns a copy of this IPersonalAttributeList instance. + * + * @return The copy of this IPersonalAttributeList. + */ + public Object clone() { + try { + return (PersonalAttributeList) super.clone(); + } catch (CloneNotSupportedException e) { + return null; + } + } + + /** + * Creates a string in the following format. + * + * attrName:attrType:[attrValue1,attrValue2=attrComplexValue]:attrStatus; + * + * @return {@inheritDoc} + */ + @Override + public String toString() { + final Iterator> itAttrs = this.entrySet().iterator(); + final StringBuilder strBuilder = new StringBuilder(); + + while (itAttrs.hasNext()) { + final Entry attrEntry = itAttrs.next(); + final PersonalAttribute attr = attrEntry.getValue(); + // strBuilder.append(attr.toString()); + strBuilder.insert(0, attr.toString()); + } + + return strBuilder.toString(); + } + + /** + * Validates and creates the attribute's complex values. + * + * @param values + * The complex values. + * + * @return The {@link Map} with the complex values. + * + * @see Map + */ + private Map createComplexValue(final String[] values) { + final Map complexValue = new HashMap(); + for (final String val : values) { + final String[] tVal = val.split("="); + if (StringUtils.isNotEmpty(val) && tVal.length == 2) { + complexValue.put(tVal[0], AttributeUtil.unescape(tVal[1])); + } + } + return complexValue; + } + + /** + * Checks if value is complex or not + * + * @param values + * The values to check + * @return True if succesful + */ + private boolean isComplexValue(final String[] values) { + boolean isComplex = false; + if (values.length > 0) { + final String[] tVal = values[0].split("="); + if (StringUtils.isNotEmpty(values[0]) && tVal.length == 2) { + isComplex = true; + } + } + return isComplex; + } + + /** + * Validates and creates the attribute values. + * + * @param vals + * The attribute values. + * + * @return The {@link List} with the attribute values. + * + * @see List + */ + private List createValues(final String[] vals) { + final List values = new ArrayList(); + for (final String val : vals) { + if (StringUtils.isNotEmpty(val)) { + values.add(AttributeUtil.unescape(val)); + } + } + return values; + } + + /** + * Converts the attribute tuple (attrName:attrType...) to the new format. + * + * @param tuples + * The attribute tuples to convert. + * + * @return The attribute tuples in the new format. + */ + private String[] convertFormat(final String[] tuples) { + final String[] newFormatTuples = new String[AttributeConstants.NUMBER_TUPLES.intValue()]; + if (tuples != null) { + System.arraycopy(tuples, 0, newFormatTuples, 0, tuples.length); + + for (int i = tuples.length; i < newFormatTuples.length; i++) { + if (i == AttributeConstants.ATTR_VALUE_INDEX.intValue()) { + newFormatTuples[i] = "[]"; + } else { + newFormatTuples[i] = ""; + } + } + } + return newFormatTuples; + } + + /** + * Returns a IPersonalAttributeList of the complex attributes in this map. + * + * @return an IPersonalAttributeList of the complex attributes contained in this map. + */ + public IPersonalAttributeList getComplexAttributes() { + LOG.info("get complex attributes"); + IPersonalAttributeList attrList = new PersonalAttributeList(); + for (PersonalAttribute attr : this) { + if (!attr.getComplexValue().isEmpty()) { + attrList.put(attr.getName(), attr); + LOG.info("adding complex attribute:" + attr.getName()); + } + } + return attrList; + } + + /** + * Returns a IPersonalAttributeList of the mandatory attributes in this map. + * + * @return an IPersonalAttributeList of the mandatory attributes contained in this map. + */ + public IPersonalAttributeList getSimpleValueAttributes() { + LOG.info("get simple attributes"); + IPersonalAttributeList attrList = new PersonalAttributeList(); + for (PersonalAttribute attr : this) { + if (attr.getComplexValue().isEmpty()) { + attrList.put(attr.getName(), attr); + LOG.info("adding simple attribute:" + attr.getName()); + } + } + return attrList; + } + + /** + * Returns a IPersonalAttributeList of the mandatory attributes in this map. + * + * @return an IPersonalAttributeList of the mandatory attributes contained in this map. + */ + public IPersonalAttributeList getMandatoryAttributes() { + return getAttributesByParam(true); + } + + /** + * Returns a IPersonalAttributeList of the attributes in this map by parameter value. + * + * @param compareValue + * The boolean to get mandatory (true) or optional (false) attributes. + * + * @return an IPersonalAttributeList of the mandatory attributes contained in this map if compareValue is true or optional otherwise. + */ + private IPersonalAttributeList getAttributesByParam(final boolean compareValue) { + LOG.info("get attributes by param :" + compareValue); + IPersonalAttributeList attrList = new PersonalAttributeList(); + for (PersonalAttribute attr : this) { + if (attr.isRequired() == compareValue) { + attrList.put(attr.getName(), attr); + LOG.info("adding attribute:" + attr.getName()); + } + } + return attrList; + } + + /** + * Returns a IPersonalAttributeList of the optional attributes in this map. + * + * @return an IPersonalAttributeList of the optional attributes contained in this map. + */ + public IPersonalAttributeList getOptionalAttributes() { + return getAttributesByParam(false); + } + + /** + * {@inheritDoc} + */ + public boolean hasMissingValues() { + for (PersonalAttribute attr : this) { + if (attr.isEmptyValue() && attr.isEmptyComplexValue()) { + return true; + } + } + return false; + } } \ No newline at end of file diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java index 65936f1a8..566817747 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java @@ -5,443 +5,461 @@ import java.io.Serializable; import org.apache.log4j.Logger; public class STORKAttrQueryRequest implements Serializable, Cloneable { - + /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 4778480781609392750L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAttrQueryRequest.class - .getName()); - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The assertion consumer service url. */ - private String serviceURL; - - /** The distinguished name. */ - private String distinguishedName; - - /** The e id sector share. */ - private boolean eIDSectorShare; - - /** The e id cross sector share. */ - private boolean eIDCrossSectorShare; - - /** The e id cross border share. */ - private boolean eIDCrossBorderShare; - - /** The personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The service provider sector. */ - private String spSector; - - /** The service provider institution. */ - private String spInstitution; - - /** The service provider application. */ - private String spApplication; - - /** The service provider country. */ - private String spCountry; - - /** The country. */ - private String country; - - /** The citizen country code. */ - private String citizenCountry; - - /** The Service Provider ID. */ - private String sPID; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the SP ID. - * - * @return sPID The SP ID. - */ - public String getSPID() { - return sPID; - } - - /** - * Sets the SP ID. - * - * @param sPId The new sp samlId. - */ - public void setSPID(final String sPId) { - this.sPID = sPId; - } - - /** - * Gets the citizen country code. - * - * @return The citizen country code value. - */ - public String getCitizenCountryCode() { - return citizenCountry; - } - - /** - * Sets the citizen country code. - * - * @param countryCode the new citizen country code value. - */ - public void setCitizenCountryCode(final String countryCode) { - this.citizenCountry = countryCode; - } - - /** - * Gets the sp country. - * - * @return The sp country value. - */ - public String getSpCountry() { - return spCountry; - } - - /** - * Sets the sp country. - * - * @param sPCountry the new sp country value. - */ - public void setSpCountry(final String sPCountry) { - this.spCountry = sPCountry; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the serviceURL value. - * - * @return The serviceURL value. - */ - public String getAssertionConsumerServiceURL() { - return serviceURL; - } - - /** - * Setter for the serviceURL value. - * - * @param newServiceURL the assertion consumer service URL. - */ - public void setAssertionConsumerServiceURL(final String newServiceURL) { - this.serviceURL = newServiceURL; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - - /** - * Getter for the attributeList value. - * - * @return The attributeList value. - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the attributeList value. - * - * @param attrList the personal attribute list value. - * - * @see IPersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** - * Gets the service provider sector. - * - * @return The service provider sector value. - */ - public String getSpSector() { - return spSector; - } - - /** - * Sets the service provider sector. - * - * @param samlSPSector the new service provider sector value. - */ - public void setSpSector(final String samlSPSector) { - this.spSector = samlSPSector; - } - - /** - * Gets the service provider institution. - * - * @return The service provider institution value. - */ - public String getSpInstitution() { - return spInstitution; - } - - /** - * Sets the service provider institution. - * - * @param samlSPInst the new service provider institution value. - */ - public void setSpInstitution(final String samlSPInst) { - this.spInstitution = samlSPInst; - } - - /** - * Gets the service provider application. - * - * @return The service provider application value. - */ - public String getSpApplication() { - return spApplication; - } - - /** - * Sets the service provider application. - * - * @param samlSPApp the new service provider application value. - */ - public void setSpApplication(final String samlSPApp) { - this.spApplication = samlSPApp; - } - - /** - * Checks if is eId sector share. - * - * @return true, if is eId sector share. - */ - public boolean isEIDSectorShare() { - return eIDSectorShare; - } - - /** - * Sets the eId sector share. - * - * @param eIdSectorShare the new eId sector share value. - */ - public void setEIDSectorShare(final boolean eIdSectorShare) { - this.eIDSectorShare = eIdSectorShare; - } - - /** - * Checks if is eId cross sector share. - * - * @return true, if is eId cross sector share. - */ - public boolean isEIDCrossSectorShare() { - return eIDCrossSectorShare; - } - - /** - * Sets the eId cross sector share. - * - * @param eIdCrossSectorShare the new eId cross sector share value. - */ - public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { - this.eIDCrossSectorShare = eIdCrossSectorShare; - } - - /** - * Checks if is eId cross border share. - * - * @return true, if is eId cross border share. - */ - public boolean isEIDCrossBorderShare() { - return eIDCrossBorderShare; - } - - /** - * Sets the eId cross border share. - * - * @param eIdCrossBorderShare the new eId cross border share value. - */ - public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { - this.eIDCrossBorderShare = eIdCrossBorderShare; - } - - /** - * Returns a copy of this STORKAttrQueryRequest instance. - * - * @return The copy of this STORKAttrQueryRequest. - * @throws CloneNotSupportedException on clone exception - */ - @Override - public Object clone() throws CloneNotSupportedException{ - STORKAttrQueryRequest storkAttrQueryReq = null; - storkAttrQueryReq = (STORKAttrQueryRequest) super.clone(); - storkAttrQueryReq.setPersonalAttributeList(getPersonalAttributeList()); - storkAttrQueryReq.setTokenSaml(getTokenSaml()); - return storkAttrQueryReq; - } + private static final long serialVersionUID = 4778480781609392750L; + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(STORKAttrQueryRequest.class.getName()); + + /** The samlId. */ + private String samlId; + + /** The destination. */ + private String destination; + + /** The assertion consumer service url. */ + private String serviceURL; + + /** The distinguished name. */ + private String distinguishedName; + + /** The e id sector share. */ + private boolean eIDSectorShare; + + /** The e id cross sector share. */ + private boolean eIDCrossSectorShare; + + /** The e id cross border share. */ + private boolean eIDCrossBorderShare; + + /** The personal attribute list. */ + private IPersonalAttributeList attributeList = new PersonalAttributeList(); + + /** The qaa. */ + private int qaa; + + /** The token saml. */ + private byte[] tokenSaml = new byte[0]; + + /** The issuer. */ + private String issuer; + + /** The service provider sector. */ + private String spSector; + + /** The service provider institution. */ + private String spInstitution; + + /** The service provider application. */ + private String spApplication; + + /** The service provider country. */ + private String spCountry; + + /** The country. */ + private String country; + + /** The citizen country code. */ + private String citizenCountry; + + /** The Service Provider ID. */ + private String sPID; + + /** The Alias used at the keystore for saving this certificate. */ + private String alias; + + /** + * Gets the SP's Certificate Alias. + * + * @return alias The SP's Certificate Alias. + */ + public String getAlias() { + return alias; + } + + /** + * Sets the SP's Certificate Alias. + * + * @param nAlias + * The SP's Certificate Alias. + */ + public void setAlias(final String nAlias) { + this.alias = nAlias; + } + + /** + * Gets the SP ID. + * + * @return sPID The SP ID. + */ + public String getSPID() { + return sPID; + } + + /** + * Sets the SP ID. + * + * @param sPId + * The new sp samlId. + */ + public void setSPID(final String sPId) { + this.sPID = sPId; + } + + /** + * Gets the citizen country code. + * + * @return The citizen country code value. + */ + public String getCitizenCountryCode() { + return citizenCountry; + } + + /** + * Sets the citizen country code. + * + * @param countryCode + * the new citizen country code value. + */ + public void setCitizenCountryCode(final String countryCode) { + this.citizenCountry = countryCode; + } + + /** + * Gets the sp country. + * + * @return The sp country value. + */ + public String getSpCountry() { + return spCountry; + } + + /** + * Sets the sp country. + * + * @param sPCountry + * the new sp country value. + */ + public void setSpCountry(final String sPCountry) { + this.spCountry = sPCountry; + } + + /** + * Gets the issuer. + * + * @return The issuer value. + */ + public String getIssuer() { + return issuer; + } + + /** + * Sets the issuer. + * + * @param samlIssuer + * the new issuer value. + */ + public void setIssuer(final String samlIssuer) { + this.issuer = samlIssuer; + } + + /** + * Gets the SAML Token. + * + * @return The SAML Token value. + */ + public byte[] getTokenSaml() { + return tokenSaml.clone(); + } + + /** + * Sets the SAML Token. + * + * @param samlToken + * The new SAML Token value. + */ + public void setTokenSaml(final byte[] samlToken) { + if (samlToken != null) { + this.tokenSaml = samlToken.clone(); + } + } + + /** + * Gets the country. + * + * @return The country value. + */ + public String getCountry() { + return country; + } + + /** + * Sets the country. + * + * @param nCountry + * the new country value. + */ + public void setCountry(final String nCountry) { + this.country = nCountry; + } + + /** + * Getter for the qaa value. + * + * @return The qaa value value. + */ + public int getQaa() { + return qaa; + } + + /** + * Setter for the qaa value. + * + * @param qaaLevel + * The new qaa value. + */ + public void setQaa(final int qaaLevel) { + this.qaa = qaaLevel; + } + + /** + * Getter for the serviceURL value. + * + * @return The serviceURL value. + */ + public String getAssertionConsumerServiceURL() { + return serviceURL; + } + + /** + * Setter for the serviceURL value. + * + * @param newServiceURL + * the assertion consumer service URL. + */ + public void setAssertionConsumerServiceURL(final String newServiceURL) { + this.serviceURL = newServiceURL; + } + + /** + * Getter for the destination value. + * + * @return The destination value. + */ + public String getDestination() { + return destination; + } + + /** + * Setter for the destination value. + * + * @param detination + * the new destination value. + */ + public void setDestination(final String detination) { + this.destination = detination; + } + + /** + * Getter for the samlId value. + * + * @return The samlId value. + */ + public String getSamlId() { + return samlId; + } + + /** + * Setter for the samlId value. + * + * @param newSamlId + * the new samlId value. + */ + public void setSamlId(final String newSamlId) { + this.samlId = newSamlId; + } + + /** + * Getter for the attributeList value. + * + * @return The attributeList value. + * + * @see IPersonalAttributeList + */ + public IPersonalAttributeList getPersonalAttributeList() { + IPersonalAttributeList personnalAttributeList = null; + try { + personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); + } catch (CloneNotSupportedException e1) { + LOG.trace("[PersonalAttribute] Nothing to do."); + } + return personnalAttributeList; + } + + /** + * Setter for the attributeList value. + * + * @param attrList + * the personal attribute list value. + * + * @see IPersonalAttributeList + */ + public void setPersonalAttributeList(final IPersonalAttributeList attrList) { + if (attrList != null) { + this.attributeList = attrList; + } + } + + /** + * Getter for the distinguishedName value. + * + * @return The distinguishedName value. + */ + public String getDistinguishedName() { + return distinguishedName; + } + + /** + * Setter for the distinguishedName value. + * + * @param certDN + * the distinguished name value. + */ + public void setDistinguishedName(final String certDN) { + this.distinguishedName = certDN; + } + + /** + * Gets the service provider sector. + * + * @return The service provider sector value. + */ + public String getSpSector() { + return spSector; + } + + /** + * Sets the service provider sector. + * + * @param samlSPSector + * the new service provider sector value. + */ + public void setSpSector(final String samlSPSector) { + this.spSector = samlSPSector; + } + + /** + * Gets the service provider institution. + * + * @return The service provider institution value. + */ + public String getSpInstitution() { + return spInstitution; + } + + /** + * Sets the service provider institution. + * + * @param samlSPInst + * the new service provider institution value. + */ + public void setSpInstitution(final String samlSPInst) { + this.spInstitution = samlSPInst; + } + + /** + * Gets the service provider application. + * + * @return The service provider application value. + */ + public String getSpApplication() { + return spApplication; + } + + /** + * Sets the service provider application. + * + * @param samlSPApp + * the new service provider application value. + */ + public void setSpApplication(final String samlSPApp) { + this.spApplication = samlSPApp; + } + + /** + * Checks if is eId sector share. + * + * @return true, if is eId sector share. + */ + public boolean isEIDSectorShare() { + return eIDSectorShare; + } + + /** + * Sets the eId sector share. + * + * @param eIdSectorShare + * the new eId sector share value. + */ + public void setEIDSectorShare(final boolean eIdSectorShare) { + this.eIDSectorShare = eIdSectorShare; + } + + /** + * Checks if is eId cross sector share. + * + * @return true, if is eId cross sector share. + */ + public boolean isEIDCrossSectorShare() { + return eIDCrossSectorShare; + } + + /** + * Sets the eId cross sector share. + * + * @param eIdCrossSectorShare + * the new eId cross sector share value. + */ + public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { + this.eIDCrossSectorShare = eIdCrossSectorShare; + } + + /** + * Checks if is eId cross border share. + * + * @return true, if is eId cross border share. + */ + public boolean isEIDCrossBorderShare() { + return eIDCrossBorderShare; + } + + /** + * Sets the eId cross border share. + * + * @param eIdCrossBorderShare + * the new eId cross border share value. + */ + public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { + this.eIDCrossBorderShare = eIdCrossBorderShare; + } + + /** + * Returns a copy of this STORKAttrQueryRequest instance. + * + * @return The copy of this STORKAttrQueryRequest. + * @throws CloneNotSupportedException + * on clone exception + */ + @Override + public Object clone() throws CloneNotSupportedException { + STORKAttrQueryRequest storkAttrQueryReq = null; + storkAttrQueryReq = (STORKAttrQueryRequest) super.clone(); + storkAttrQueryReq.setPersonalAttributeList(getPersonalAttributeList()); + storkAttrQueryReq.setTokenSaml(getTokenSaml()); + return storkAttrQueryReq; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java index 276b26a03..cd54fb8b7 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java @@ -21,372 +21,385 @@ import org.joda.time.DateTime; import org.opensaml.saml2.core.Assertion; public class STORKAttrQueryResponse implements Serializable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 7653893041391541235L; - - /** Response Id. */ - private String samlId; - - /** Request failed? */ - private boolean fail; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Audience restriction. */ - private String audienceRest; - - /** Error message. */ - private String message; - - /** Id of the request that originated this response. */ - private String inResponseTo; - - /** Expiration date. */ - private DateTime notOnOrAfter; - - /** Creation date. */ - private DateTime notBefore; - - /** The SAML token. */ - private byte[] tokenSaml = new byte[0]; - - /** Country. */ - private String country; - - /** The complete assertion **/ - private Assertion assertion; - - /** List of all assertions in response **/ - private List assertions; - - /** The complete list from all assertions **/ - private IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); - - /** All personal attribute lists **/ - private List attributeLists; - - /** Citizen's personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAttrQueryResponse.class.getName()); - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Getter for audienceRest. - * - * @return The audienceRest value. - */ - public String getAudienceRestriction() { - return audienceRest; - } - - /** - * Setter for audienceRest. - * - * @param audRest the new audienceRest value. - */ - public void setAudienceRestriction(final String audRest) { - this.audienceRest = audRest; - } - - /** - * Getter for the samlToken. - * - * @return The samlToken value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Setter for samlToken. - * - * @param samlToken the new tokenSaml value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Getter for the country name. - * - * @return The country name value. - */ - public String getCountry() { - return country; - } - - /** - * Setter for the country name. - * - * @param cCountry the new country name value. - */ - public void setCountry(final String cCountry) { - this.country = cCountry; - } - - /** - * Getter for pal value. - * - * @return The pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the inResponseTo value. - * - * @return The inResponseTo value. - */ - public String getInResponseTo() { - return inResponseTo; - } - - /** - * Setter for the inResponseTo value. - * - * @param samlInResponseTo the new inResponseTo value. - */ - public void setInResponseTo(final String samlInResponseTo) { - this.inResponseTo = samlInResponseTo; - } - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the message value. - * - * @return The message value. - */ - public String getMessage() { - return message; - } - - /** - * Setter for the message value. - * - * @param msg the new message value. - */ - public void setMessage(final String msg) { - this.message = msg; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param nSamlId the new samlId value. - */ - public void setSamlId(final String nSamlId) { - this.samlId = nSamlId; - } - - /** - * Getter for the notOnOrAfter value. - * - * @return The notOnOrAfter value. - * - * @see DateTime - */ - public DateTime getNotOnOrAfter() { - return this.notOnOrAfter; - } - - /** - * Setter for the notOnOrAfter value. - * - * @param nOnOrAfter the new notOnOrAfter value. - * - * @see DateTime - */ - public void setNotOnOrAfter(final DateTime nOnOrAfter) { - this.notOnOrAfter = nOnOrAfter; - } - - /** - * Getter for the notBefore value. - * - * @return The notBefore value. - * - * @see DateTime - */ - public DateTime getNotBefore() { - return notBefore; - } - - /** - * Setter for the notBefore value. - * - * @param nBefore the new notBefore value. - * - * @see DateTime - */ - public void setNotBefore(final DateTime nBefore) { - this.notBefore = nBefore; - } - - /** Get the assertion from the response **/ - public Assertion getAssertion() { - return assertion; - } - - /** Set the assertion in the response **/ - public void setAssertion(final Assertion nAssertion) { - this.assertion = nAssertion; - } - - public void setAssertions(List newAssert) { - this.assertions = newAssert; - } - - public List getAssertions() { - return assertions; - } - - /** - * Getter for the toal pal value. - * - * @return The total pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getTotalPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the total Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.totalAttributeList = attrList; - } - } - - /** - * Getter for personal attribute lists - * - * @return The lists - * - * @see PersonalAttributeList - */ - public List getPersonalAttributeLists() { - return attributeLists; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeLists(final List attrLists) { - if (attrLists != null) { - this.attributeLists = attrLists; - } - } - -} + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = 7653893041391541235L; + + /** Response Id. */ + private String samlId; + + /** Request failed? */ + private boolean fail; + + /** Status code. */ + private String statusCode; + + /** Secondary status code. */ + private String subStatusCode; + + /** Audience restriction. */ + private String audienceRest; + + /** Error message. */ + private String message; + + /** Id of the request that originated this response. */ + private String inResponseTo; + + /** Expiration date. */ + private DateTime notOnOrAfter; + + /** Creation date. */ + private DateTime notBefore; + + /** The SAML token. */ + private byte[] tokenSaml = new byte[0]; + + /** Country. */ + private String country; + + /** The complete assertion **/ + private Assertion assertion; + + /** List of all assertions in response **/ + private List assertions; + + /** The complete list from all assertions **/ + private IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); + + /** All personal attribute lists **/ + private List attributeLists; + + /** Citizen's personal attribute list. */ + private IPersonalAttributeList attributeList = new PersonalAttributeList(); + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(STORKAttrQueryResponse.class.getName()); + + /** + * Getter for the subStatusCode. + * + * @return The subStatusCode value. + */ + public String getSubStatusCode() { + return subStatusCode; + } + + /** + * Setter for the subStatusCode. + * + * @param samlSubStatusCode + * the new subStatusCode value. + */ + public void setSubStatusCode(final String samlSubStatusCode) { + this.subStatusCode = samlSubStatusCode; + } + + /** + * Getter for audienceRest. + * + * @return The audienceRest value. + */ + public String getAudienceRestriction() { + return audienceRest; + } + + /** + * Setter for audienceRest. + * + * @param audRest + * the new audienceRest value. + */ + public void setAudienceRestriction(final String audRest) { + this.audienceRest = audRest; + } + + /** + * Getter for the samlToken. + * + * @return The samlToken value. + */ + public byte[] getTokenSaml() { + return tokenSaml.clone(); + } + + /** + * Setter for samlToken. + * + * @param samlToken + * the new tokenSaml value. + */ + public void setTokenSaml(final byte[] samlToken) { + if (samlToken != null) { + this.tokenSaml = samlToken.clone(); + } + } + + /** + * Getter for the country name. + * + * @return The country name value. + */ + public String getCountry() { + return country; + } + + /** + * Setter for the country name. + * + * @param cCountry + * the new country name value. + */ + public void setCountry(final String cCountry) { + this.country = cCountry; + } + + /** + * Getter for pal value. + * + * @return The pal value. + * + * @see PersonalAttributeList + */ + public IPersonalAttributeList getPersonalAttributeList() { + IPersonalAttributeList personnalAttributeList = null; + try { + personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); + } catch (CloneNotSupportedException e1) { + LOG.trace("[PersonalAttribute] Nothing to do."); + } + return personnalAttributeList; + } + + /** + * Setter for the Personal Attribute List value. + * + * @param attrList + * the new value. + * + * @see PersonalAttributeList + */ + public void setPersonalAttributeList(final IPersonalAttributeList attrList) { + if (attrList != null) { + this.attributeList = attrList; + } + } + + /** + * Getter for the inResponseTo value. + * + * @return The inResponseTo value. + */ + public String getInResponseTo() { + return inResponseTo; + } + + /** + * Setter for the inResponseTo value. + * + * @param samlInResponseTo + * the new inResponseTo value. + */ + public void setInResponseTo(final String samlInResponseTo) { + this.inResponseTo = samlInResponseTo; + } + + /** + * Getter for the fail value. + * + * @return The fail value. + */ + public boolean isFail() { + return fail; + } + + /** + * Setter for the fail value. + * + * @param failVal + * the new fail value. + */ + public void setFail(final boolean failVal) { + this.fail = failVal; + } + + /** + * Getter for the message value. + * + * @return The message value. + */ + public String getMessage() { + return message; + } + + /** + * Setter for the message value. + * + * @param msg + * the new message value. + */ + public void setMessage(final String msg) { + this.message = msg; + } + + /** + * Getter for the statusCode value. + * + * @return The statusCode value. + */ + public String getStatusCode() { + return statusCode; + } + + /** + * Setter for the statusCode value. + * + * @param status + * the new statusCode value. + */ + public void setStatusCode(final String status) { + this.statusCode = status; + } + + /** + * Getter for the samlId value. + * + * @return The samlId value. + */ + public String getSamlId() { + return samlId; + } + + /** + * Setter for the samlId value. + * + * @param nSamlId + * the new samlId value. + */ + public void setSamlId(final String nSamlId) { + this.samlId = nSamlId; + } + + /** + * Getter for the notOnOrAfter value. + * + * @return The notOnOrAfter value. + * + * @see DateTime + */ + public DateTime getNotOnOrAfter() { + return this.notOnOrAfter; + } + + /** + * Setter for the notOnOrAfter value. + * + * @param nOnOrAfter + * the new notOnOrAfter value. + * + * @see DateTime + */ + public void setNotOnOrAfter(final DateTime nOnOrAfter) { + this.notOnOrAfter = nOnOrAfter; + } + + /** + * Getter for the notBefore value. + * + * @return The notBefore value. + * + * @see DateTime + */ + public DateTime getNotBefore() { + return notBefore; + } + + /** + * Setter for the notBefore value. + * + * @param nBefore + * the new notBefore value. + * + * @see DateTime + */ + public void setNotBefore(final DateTime nBefore) { + this.notBefore = nBefore; + } + + /** Get the assertion from the response **/ + public Assertion getAssertion() { + return assertion; + } + + /** Set the assertion in the response **/ + public void setAssertion(final Assertion nAssertion) { + this.assertion = nAssertion; + } + + public void setAssertions(List newAssert) { + this.assertions = newAssert; + } + + public List getAssertions() { + return assertions; + } + + /** + * Getter for the toal pal value. + * + * @return The total pal value. + * + * @see PersonalAttributeList + */ + public IPersonalAttributeList getTotalPersonalAttributeList() { + IPersonalAttributeList personnalAttributeList = null; + try { + personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); + } catch (CloneNotSupportedException e1) { + LOG.trace("[PersonalAttribute] Nothing to do."); + } + return personnalAttributeList; + } + + /** + * Setter for the total Personal Attribute List value. + * + * @param attrList + * the new value. + * + * @see PersonalAttributeList + */ + public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { + if (attrList != null) { + this.totalAttributeList = attrList; + } + } + + /** + * Getter for personal attribute lists + * + * @return The lists + * + * @see PersonalAttributeList + */ + public List getPersonalAttributeLists() { + return attributeLists; + } + + /** + * Setter for the Personal Attribute List value. + * + * @param attrList + * the new value. + * + * @see PersonalAttributeList + */ + public void setPersonalAttributeLists(final List attrLists) { + if (attrLists != null) { + this.attributeLists = attrLists; + } + } + +} diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java index ea7c0e475..6f39ebeeb 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java @@ -18,478 +18,495 @@ import java.io.Serializable; import org.apache.log4j.Logger; /** - * This class is a bean used to store the information relative to the - * STORKAuthnRequest (SAML Token Request). + * This class is a bean used to store the information relative to the STORKAuthnRequest (SAML Token Request). * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.21 $, $Date: 2011-02-17 22:44:34 $ */ public final class STORKAuthnRequest implements Serializable, Cloneable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = 4778480781609392750L; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAuthnRequest.class - .getName()); - - /** The samlId. */ - private String samlId; - - /** The assertion consumer service url. */ - private String serviceURL; - - /** The destination. */ - private String destination; - - /** The provider name. */ - private String providerName; - - /** The distinguished name. */ - private String distinguishedName; - - /** The e id sector share. */ - private boolean eIDSectorShare; - - /** The e id cross sector share. */ - private boolean eIDCrossSectorShare; - - /** The e id cross border share. */ - private boolean eIDCrossBorderShare; - - /** The personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The service provider sector. */ - private String spSector; - - /** The service provider institution. */ - private String spInstitution; - - /** The service provider application. */ - private String spApplication; - - /** The service provider country. */ - private String spCountry; - - /** The country. */ - private String country; - - /** The citizen country code. */ - private String citizenCountry; - - /** The Service Provider ID. */ - private String sPID; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the SP ID. - * - * @return sPID The SP ID. - */ - public String getSPID() { - return sPID; - } - - /** - * Sets the SP ID. - * - * @param sPId The new sp samlId. - */ - public void setSPID(final String sPId) { - this.sPID = sPId; - } - - /** - * Gets the citizen country code. - * - * @return The citizen country code value. - */ - public String getCitizenCountryCode() { - return citizenCountry; - } - - /** - * Sets the citizen country code. - * - * @param countryCode the new citizen country code value. - */ - public void setCitizenCountryCode(final String countryCode) { - this.citizenCountry = countryCode; - } - - /** - * Gets the sp country. - * - * @return The sp country value. - */ - public String getSpCountry() { - return spCountry; - } - - /** - * Sets the sp country. - * - * @param sPCountry the new sp country value. - */ - public void setSpCountry(final String sPCountry) { - this.spCountry = sPCountry; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the serviceURL value. - * - * @return The serviceURL value. - */ - public String getAssertionConsumerServiceURL() { - return serviceURL; - } - - /** - * Setter for the serviceURL value. - * - * @param newServiceURL the assertion consumer service URL. - */ - public void setAssertionConsumerServiceURL(final String newServiceURL) { - this.serviceURL = newServiceURL; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the providerName value. - * - * @return The provider name value. - */ - public String getProviderName() { - return providerName; - } - - /** - * Setter for the providerName value. - * - * @param samlProvider the provider name value. - */ - public void setProviderName(final String samlProvider) { - this.providerName = samlProvider; - } - - /** - * Getter for the attributeList value. - * - * @return The attributeList value. - * - * @see IPersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the attributeList value. - * - * @param attrList the personal attribute list value. - * - * @see IPersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** - * Gets the service provider sector. - * - * @return The service provider sector value. - */ - public String getSpSector() { - return spSector; - } - - /** - * Sets the service provider sector. - * - * @param samlSPSector the new service provider sector value. - */ - public void setSpSector(final String samlSPSector) { - this.spSector = samlSPSector; - } - - /** - * Gets the service provider institution. - * - * @return The service provider institution value. - */ - public String getSpInstitution() { - return spInstitution; - } - - /** - * Sets the service provider institution. - * - * @param samlSPInst the new service provider institution value. - */ - public void setSpInstitution(final String samlSPInst) { - this.spInstitution = samlSPInst; - } - - /** - * Gets the service provider application. - * - * @return The service provider application value. - */ - public String getSpApplication() { - return spApplication; - } - - /** - * Sets the service provider application. - * - * @param samlSPApp the new service provider application value. - */ - public void setSpApplication(final String samlSPApp) { - this.spApplication = samlSPApp; - } - - /** - * Checks if is eId sector share. - * - * @return true, if is eId sector share. - */ - public boolean isEIDSectorShare() { - return eIDSectorShare; - } - - /** - * Sets the eId sector share. - * - * @param eIdSectorShare the new eId sector share value. - */ - public void setEIDSectorShare(final boolean eIdSectorShare) { - this.eIDSectorShare = eIdSectorShare; - } - - /** - * Checks if is eId cross sector share. - * - * @return true, if is eId cross sector share. - */ - public boolean isEIDCrossSectorShare() { - return eIDCrossSectorShare; - } - - /** - * Sets the eId cross sector share. - * - * @param eIdCrossSectorShare the new eId cross sector share value. - */ - public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { - this.eIDCrossSectorShare = eIdCrossSectorShare; - } - - /** - * Checks if is eId cross border share. - * - * @return true, if is eId cross border share. - */ - public boolean isEIDCrossBorderShare() { - return eIDCrossBorderShare; - } - - /** - * Sets the eId cross border share. - * - * @param eIdCrossBorderShare the new eId cross border share value. - */ - public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { - this.eIDCrossBorderShare = eIdCrossBorderShare; - } - - /** - * Returns a copy of this STORKAuthnRequest instance. - * - * @return The copy of this STORKAuthnRequest. - * @throws CloneNotSupportedException on clone exception - */ - @Override - public Object clone() throws CloneNotSupportedException{ - STORKAuthnRequest storkAuthnReq = null; - try { - storkAuthnReq = (STORKAuthnRequest) super.clone(); - storkAuthnReq.setPersonalAttributeList(getPersonalAttributeList()); - storkAuthnReq.setTokenSaml(getTokenSaml()); - } catch (final CloneNotSupportedException e) { - // assert false; - LOG.trace("[PersonalAttribute] Nothing to do."); - } - - return storkAuthnReq; - } - + + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = 4778480781609392750L; + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(STORKAuthnRequest.class.getName()); + + /** The samlId. */ + private String samlId; + + /** The assertion consumer service url. */ + private String serviceURL; + + /** The destination. */ + private String destination; + + /** The provider name. */ + private String providerName; + + /** The distinguished name. */ + private String distinguishedName; + + /** The e id sector share. */ + private boolean eIDSectorShare; + + /** The e id cross sector share. */ + private boolean eIDCrossSectorShare; + + /** The e id cross border share. */ + private boolean eIDCrossBorderShare; + + /** The personal attribute list. */ + private IPersonalAttributeList attributeList = new PersonalAttributeList(); + + /** The qaa. */ + private int qaa; + + /** The token saml. */ + private byte[] tokenSaml = new byte[0]; + + /** The issuer. */ + private String issuer; + + /** The service provider sector. */ + private String spSector; + + /** The service provider institution. */ + private String spInstitution; + + /** The service provider application. */ + private String spApplication; + + /** The service provider country. */ + private String spCountry; + + /** The country. */ + private String country; + + /** The citizen country code. */ + private String citizenCountry; + + /** The Service Provider ID. */ + private String sPID; + + /** The Alias used at the keystore for saving this certificate. */ + private String alias; + + /** + * Gets the SP's Certificate Alias. + * + * @return alias The SP's Certificate Alias. + */ + public String getAlias() { + return alias; + } + + /** + * Sets the SP's Certificate Alias. + * + * @param nAlias + * The SP's Certificate Alias. + */ + public void setAlias(final String nAlias) { + this.alias = nAlias; + } + + /** + * Gets the SP ID. + * + * @return sPID The SP ID. + */ + public String getSPID() { + return sPID; + } + + /** + * Sets the SP ID. + * + * @param sPId + * The new sp samlId. + */ + public void setSPID(final String sPId) { + this.sPID = sPId; + } + + /** + * Gets the citizen country code. + * + * @return The citizen country code value. + */ + public String getCitizenCountryCode() { + return citizenCountry; + } + + /** + * Sets the citizen country code. + * + * @param countryCode + * the new citizen country code value. + */ + public void setCitizenCountryCode(final String countryCode) { + this.citizenCountry = countryCode; + } + + /** + * Gets the sp country. + * + * @return The sp country value. + */ + public String getSpCountry() { + return spCountry; + } + + /** + * Sets the sp country. + * + * @param sPCountry + * the new sp country value. + */ + public void setSpCountry(final String sPCountry) { + this.spCountry = sPCountry; + } + + /** + * Gets the issuer. + * + * @return The issuer value. + */ + public String getIssuer() { + return issuer; + } + + /** + * Sets the issuer. + * + * @param samlIssuer + * the new issuer value. + */ + public void setIssuer(final String samlIssuer) { + this.issuer = samlIssuer; + } + + /** + * Gets the SAML Token. + * + * @return The SAML Token value. + */ + public byte[] getTokenSaml() { + return tokenSaml.clone(); + } + + /** + * Sets the SAML Token. + * + * @param samlToken + * The new SAML Token value. + */ + public void setTokenSaml(final byte[] samlToken) { + if (samlToken != null) { + this.tokenSaml = samlToken.clone(); + } + } + + /** + * Gets the country. + * + * @return The country value. + */ + public String getCountry() { + return country; + } + + /** + * Sets the country. + * + * @param nCountry + * the new country value. + */ + public void setCountry(final String nCountry) { + this.country = nCountry; + } + + /** + * Getter for the qaa value. + * + * @return The qaa value value. + */ + public int getQaa() { + return qaa; + } + + /** + * Setter for the qaa value. + * + * @param qaaLevel + * The new qaa value. + */ + public void setQaa(final int qaaLevel) { + this.qaa = qaaLevel; + } + + /** + * Getter for the serviceURL value. + * + * @return The serviceURL value. + */ + public String getAssertionConsumerServiceURL() { + return serviceURL; + } + + /** + * Setter for the serviceURL value. + * + * @param newServiceURL + * the assertion consumer service URL. + */ + public void setAssertionConsumerServiceURL(final String newServiceURL) { + this.serviceURL = newServiceURL; + } + + /** + * Getter for the destination value. + * + * @return The destination value. + */ + public String getDestination() { + return destination; + } + + /** + * Setter for the destination value. + * + * @param detination + * the new destination value. + */ + public void setDestination(final String detination) { + this.destination = detination; + } + + /** + * Getter for the samlId value. + * + * @return The samlId value. + */ + public String getSamlId() { + return samlId; + } + + /** + * Setter for the samlId value. + * + * @param newSamlId + * the new samlId value. + */ + public void setSamlId(final String newSamlId) { + this.samlId = newSamlId; + } + + /** + * Getter for the providerName value. + * + * @return The provider name value. + */ + public String getProviderName() { + return providerName; + } + + /** + * Setter for the providerName value. + * + * @param samlProvider + * the provider name value. + */ + public void setProviderName(final String samlProvider) { + this.providerName = samlProvider; + } + + /** + * Getter for the attributeList value. + * + * @return The attributeList value. + * + * @see IPersonalAttributeList + */ + public IPersonalAttributeList getPersonalAttributeList() { + IPersonalAttributeList personnalAttributeList = null; + try { + personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); + } catch (CloneNotSupportedException e1) { + LOG.trace("[PersonalAttribute] Nothing to do."); + } + return personnalAttributeList; + } + + /** + * Setter for the attributeList value. + * + * @param attrList + * the personal attribute list value. + * + * @see IPersonalAttributeList + */ + public void setPersonalAttributeList(final IPersonalAttributeList attrList) { + if (attrList != null) { + this.attributeList = attrList; + } + } + + /** + * Getter for the distinguishedName value. + * + * @return The distinguishedName value. + */ + public String getDistinguishedName() { + return distinguishedName; + } + + /** + * Setter for the distinguishedName value. + * + * @param certDN + * the distinguished name value. + */ + public void setDistinguishedName(final String certDN) { + this.distinguishedName = certDN; + } + + /** + * Gets the service provider sector. + * + * @return The service provider sector value. + */ + public String getSpSector() { + return spSector; + } + + /** + * Sets the service provider sector. + * + * @param samlSPSector + * the new service provider sector value. + */ + public void setSpSector(final String samlSPSector) { + this.spSector = samlSPSector; + } + + /** + * Gets the service provider institution. + * + * @return The service provider institution value. + */ + public String getSpInstitution() { + return spInstitution; + } + + /** + * Sets the service provider institution. + * + * @param samlSPInst + * the new service provider institution value. + */ + public void setSpInstitution(final String samlSPInst) { + this.spInstitution = samlSPInst; + } + + /** + * Gets the service provider application. + * + * @return The service provider application value. + */ + public String getSpApplication() { + return spApplication; + } + + /** + * Sets the service provider application. + * + * @param samlSPApp + * the new service provider application value. + */ + public void setSpApplication(final String samlSPApp) { + this.spApplication = samlSPApp; + } + + /** + * Checks if is eId sector share. + * + * @return true, if is eId sector share. + */ + public boolean isEIDSectorShare() { + return eIDSectorShare; + } + + /** + * Sets the eId sector share. + * + * @param eIdSectorShare + * the new eId sector share value. + */ + public void setEIDSectorShare(final boolean eIdSectorShare) { + this.eIDSectorShare = eIdSectorShare; + } + + /** + * Checks if is eId cross sector share. + * + * @return true, if is eId cross sector share. + */ + public boolean isEIDCrossSectorShare() { + return eIDCrossSectorShare; + } + + /** + * Sets the eId cross sector share. + * + * @param eIdCrossSectorShare + * the new eId cross sector share value. + */ + public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) { + this.eIDCrossSectorShare = eIdCrossSectorShare; + } + + /** + * Checks if is eId cross border share. + * + * @return true, if is eId cross border share. + */ + public boolean isEIDCrossBorderShare() { + return eIDCrossBorderShare; + } + + /** + * Sets the eId cross border share. + * + * @param eIdCrossBorderShare + * the new eId cross border share value. + */ + public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) { + this.eIDCrossBorderShare = eIdCrossBorderShare; + } + + /** + * Returns a copy of this STORKAuthnRequest instance. + * + * @return The copy of this STORKAuthnRequest. + * @throws CloneNotSupportedException + * on clone exception + */ + @Override + public Object clone() throws CloneNotSupportedException { + STORKAuthnRequest storkAuthnReq = null; + try { + storkAuthnReq = (STORKAuthnRequest) super.clone(); + storkAuthnReq.setPersonalAttributeList(getPersonalAttributeList()); + storkAuthnReq.setTokenSaml(getTokenSaml()); + } catch (final CloneNotSupportedException e) { + // assert false; + LOG.trace("[PersonalAttribute] Nothing to do."); + } + + return storkAuthnReq; + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java index 62a5343ec..4b415bbcf 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java @@ -21,367 +21,378 @@ import org.joda.time.DateTime; import org.opensaml.saml2.core.Assertion; /** - * This class is a bean used to store the information relative to the - * STORKAuthnResponse. + * This class is a bean used to store the information relative to the STORKAuthnResponse. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ */ public final class STORKAuthnResponse implements Serializable { - - /** The Constant serialVersionUID. */ - private static final long serialVersionUID = -9100982727074068660L; - - /** Response Id. */ - private String samlId; - - /** Authentication failed? */ - private boolean fail; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Audience restriction. */ - private String audienceRest; - - /** Error message. */ - private String message; - - /** Id of the request that originated this response. */ - private String inResponseTo; - - /** Expiration date. */ - private DateTime notOnOrAfter; - - /** Creation date. */ - private DateTime notBefore; - - /** The SAML token. */ - private byte[] tokenSaml = new byte[0]; - - /** Country. */ - private String country; - - /** Citizen's personal attribute list. */ - private IPersonalAttributeList attributeList = new PersonalAttributeList(); - - /** List of all assertions in response **/ - private List assertions; - - /** The complete list from all assertions **/ - private IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); - - /** All personal attribute lists **/ - private List attributeLists; - - /** - * Logger object. - */ - private static final Logger LOG = Logger.getLogger(STORKAuthnResponse.class.getName()); - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Getter for audienceRest. - * - * @return The audienceRest value. - */ - public String getAudienceRestriction() { - return audienceRest; - } - - /** - * Setter for audienceRest. - * - * @param audRest the new audienceRest value. - */ - public void setAudienceRestriction(final String audRest) { - this.audienceRest = audRest; - } - - /** - * Getter for the samlToken. - * - * @return The samlToken value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Setter for samlToken. - * - * @param samlToken the new tokenSaml value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Getter for the country name. - * - * @return The country name value. - */ - public String getCountry() { - return country; - } - - /** - * Setter for the country name. - * - * @param cCountry the new country name value. - */ - public void setCountry(final String cCountry) { - this.country = cCountry; - } - - /** - * Getter for pal value. - * - * @return The pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.attributeList = attrList; - } - } - - /** - * Getter for the inResponseTo value. - * - * @return The inResponseTo value. - */ - public String getInResponseTo() { - return inResponseTo; - } - - /** - * Setter for the inResponseTo value. - * - * @param samlInResponseTo the new inResponseTo value. - */ - public void setInResponseTo(final String samlInResponseTo) { - this.inResponseTo = samlInResponseTo; - } - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the message value. - * - * @return The message value. - */ - public String getMessage() { - return message; - } - - /** - * Setter for the message value. - * - * @param msg the new message value. - */ - public void setMessage(final String msg) { - this.message = msg; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param nSamlId the new samlId value. - */ - public void setSamlId(final String nSamlId) { - this.samlId = nSamlId; - } - - /** - * Getter for the notOnOrAfter value. - * - * @return The notOnOrAfter value. - * - * @see DateTime - */ - public DateTime getNotOnOrAfter() { - return this.notOnOrAfter; - } - - /** - * Setter for the notOnOrAfter value. - * - * @param nOnOrAfter the new notOnOrAfter value. - * - * @see DateTime - */ - public void setNotOnOrAfter(final DateTime nOnOrAfter) { - this.notOnOrAfter = nOnOrAfter; - } - - /** - * Getter for the notBefore value. - * - * @return The notBefore value. - * - * @see DateTime - */ - public DateTime getNotBefore() { - return notBefore; - } - - /** - * Setter for the notBefore value. - * - * @param nBefore the new notBefore value. - * - * @see DateTime - */ - public void setNotBefore(final DateTime nBefore) { - this.notBefore = nBefore; - } - - public void setAssertions(List newAssert) { - this.assertions = newAssert; - } - - public List getAssertions() { - return assertions; - } - - /** - * Getter for the toal pal value. - * - * @return The total pal value. - * - * @see PersonalAttributeList - */ - public IPersonalAttributeList getTotalPersonalAttributeList() { - IPersonalAttributeList personnalAttributeList = null; - try { - personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); - } catch (CloneNotSupportedException e1) { - LOG.trace("[PersonalAttribute] Nothing to do."); - } - return personnalAttributeList; - } - - /** - * Setter for the total Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { - if (attrList != null) { - this.totalAttributeList = attrList; - } - } - - /** - * Getter for personal attribute lists - * - * @return The lists - * - * @see PersonalAttributeList - */ - public List getPersonalAttributeLists() { - return attributeLists; - } - - /** - * Setter for the Personal Attribute List value. - * - * @param attrList the new value. - * - * @see PersonalAttributeList - */ - public void setPersonalAttributeLists(final List attrLists) { - if (attrLists != null) { - this.attributeLists = attrLists; - } - } - + + /** The Constant serialVersionUID. */ + private static final long serialVersionUID = -9100982727074068660L; + + /** Response Id. */ + private String samlId; + + /** Authentication failed? */ + private boolean fail; + + /** Status code. */ + private String statusCode; + + /** Secondary status code. */ + private String subStatusCode; + + /** Audience restriction. */ + private String audienceRest; + + /** Error message. */ + private String message; + + /** Id of the request that originated this response. */ + private String inResponseTo; + + /** Expiration date. */ + private DateTime notOnOrAfter; + + /** Creation date. */ + private DateTime notBefore; + + /** The SAML token. */ + private byte[] tokenSaml = new byte[0]; + + /** Country. */ + private String country; + + /** Citizen's personal attribute list. */ + private IPersonalAttributeList attributeList = new PersonalAttributeList(); + + /** List of all assertions in response **/ + private List assertions; + + /** The complete list from all assertions **/ + private IPersonalAttributeList totalAttributeList = new PersonalAttributeList(); + + /** All personal attribute lists **/ + private List attributeLists; + + /** + * Logger object. + */ + private static final Logger LOG = Logger.getLogger(STORKAuthnResponse.class.getName()); + + /** + * Getter for the subStatusCode. + * + * @return The subStatusCode value. + */ + public String getSubStatusCode() { + return subStatusCode; + } + + /** + * Setter for the subStatusCode. + * + * @param samlSubStatusCode + * the new subStatusCode value. + */ + public void setSubStatusCode(final String samlSubStatusCode) { + this.subStatusCode = samlSubStatusCode; + } + + /** + * Getter for audienceRest. + * + * @return The audienceRest value. + */ + public String getAudienceRestriction() { + return audienceRest; + } + + /** + * Setter for audienceRest. + * + * @param audRest + * the new audienceRest value. + */ + public void setAudienceRestriction(final String audRest) { + this.audienceRest = audRest; + } + + /** + * Getter for the samlToken. + * + * @return The samlToken value. + */ + public byte[] getTokenSaml() { + return tokenSaml.clone(); + } + + /** + * Setter for samlToken. + * + * @param samlToken + * the new tokenSaml value. + */ + public void setTokenSaml(final byte[] samlToken) { + if (samlToken != null) { + this.tokenSaml = samlToken.clone(); + } + } + + /** + * Getter for the country name. + * + * @return The country name value. + */ + public String getCountry() { + return country; + } + + /** + * Setter for the country name. + * + * @param cCountry + * the new country name value. + */ + public void setCountry(final String cCountry) { + this.country = cCountry; + } + + /** + * Getter for pal value. + * + * @return The pal value. + * + * @see PersonalAttributeList + */ + public IPersonalAttributeList getPersonalAttributeList() { + IPersonalAttributeList personnalAttributeList = null; + try { + personnalAttributeList = (IPersonalAttributeList) attributeList.clone(); + } catch (CloneNotSupportedException e1) { + LOG.trace("[PersonalAttribute] Nothing to do."); + } + return personnalAttributeList; + } + + /** + * Setter for the Personal Attribute List value. + * + * @param attrList + * the new value. + * + * @see PersonalAttributeList + */ + public void setPersonalAttributeList(final IPersonalAttributeList attrList) { + if (attrList != null) { + this.attributeList = attrList; + } + } + + /** + * Getter for the inResponseTo value. + * + * @return The inResponseTo value. + */ + public String getInResponseTo() { + return inResponseTo; + } + + /** + * Setter for the inResponseTo value. + * + * @param samlInResponseTo + * the new inResponseTo value. + */ + public void setInResponseTo(final String samlInResponseTo) { + this.inResponseTo = samlInResponseTo; + } + + /** + * Getter for the fail value. + * + * @return The fail value. + */ + public boolean isFail() { + return fail; + } + + /** + * Setter for the fail value. + * + * @param failVal + * the new fail value. + */ + public void setFail(final boolean failVal) { + this.fail = failVal; + } + + /** + * Getter for the message value. + * + * @return The message value. + */ + public String getMessage() { + return message; + } + + /** + * Setter for the message value. + * + * @param msg + * the new message value. + */ + public void setMessage(final String msg) { + this.message = msg; + } + + /** + * Getter for the statusCode value. + * + * @return The statusCode value. + */ + public String getStatusCode() { + return statusCode; + } + + /** + * Setter for the statusCode value. + * + * @param status + * the new statusCode value. + */ + public void setStatusCode(final String status) { + this.statusCode = status; + } + + /** + * Getter for the samlId value. + * + * @return The samlId value. + */ + public String getSamlId() { + return samlId; + } + + /** + * Setter for the samlId value. + * + * @param nSamlId + * the new samlId value. + */ + public void setSamlId(final String nSamlId) { + this.samlId = nSamlId; + } + + /** + * Getter for the notOnOrAfter value. + * + * @return The notOnOrAfter value. + * + * @see DateTime + */ + public DateTime getNotOnOrAfter() { + return this.notOnOrAfter; + } + + /** + * Setter for the notOnOrAfter value. + * + * @param nOnOrAfter + * the new notOnOrAfter value. + * + * @see DateTime + */ + public void setNotOnOrAfter(final DateTime nOnOrAfter) { + this.notOnOrAfter = nOnOrAfter; + } + + /** + * Getter for the notBefore value. + * + * @return The notBefore value. + * + * @see DateTime + */ + public DateTime getNotBefore() { + return notBefore; + } + + /** + * Setter for the notBefore value. + * + * @param nBefore + * the new notBefore value. + * + * @see DateTime + */ + public void setNotBefore(final DateTime nBefore) { + this.notBefore = nBefore; + } + + public void setAssertions(List newAssert) { + this.assertions = newAssert; + } + + public List getAssertions() { + return assertions; + } + + /** + * Getter for the toal pal value. + * + * @return The total pal value. + * + * @see PersonalAttributeList + */ + public IPersonalAttributeList getTotalPersonalAttributeList() { + IPersonalAttributeList personnalAttributeList = null; + try { + personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone(); + } catch (CloneNotSupportedException e1) { + LOG.trace("[PersonalAttribute] Nothing to do."); + } + return personnalAttributeList; + } + + /** + * Setter for the total Personal Attribute List value. + * + * @param attrList + * the new value. + * + * @see PersonalAttributeList + */ + public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) { + if (attrList != null) { + this.totalAttributeList = attrList; + } + } + + /** + * Getter for personal attribute lists + * + * @return The lists + * + * @see PersonalAttributeList + */ + public List getPersonalAttributeLists() { + return attributeLists; + } + + /** + * Setter for the Personal Attribute List value. + * + * @param attrList + * the new value. + * + * @see PersonalAttributeList + */ + public void setPersonalAttributeLists(final List attrLists) { + if (attrLists != null) { + this.attributeLists = attrLists; + } + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java index 44811aee2..acb70d365 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java @@ -4,194 +4,202 @@ import java.io.Serializable; public class STORKLogoutRequest implements Serializable, Cloneable { private static final long serialVersionUID = 4778480781609392750L; - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The distinguished name. */ - private String distinguishedName; - - /** The qaa. */ - private int qaa; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The country. */ - private String country; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** The ID of principal as known to SP **/ - private String spProvidedId; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the qaa value. - * - * @return The qaa value value. - */ - public int getQaa() { - return qaa; - } - - /** - * Setter for the qaa value. - * - * @param qaaLevel The new qaa value. - */ - public void setQaa(final int qaaLevel) { - this.qaa = qaaLevel; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - /** Getter for spProvidedId **/ - public String getSpProvidedId() { - return spProvidedId; - } - - public void setSpProvidedId(final String nSpProvidedId) { - this.spProvidedId = nSpProvidedId; - } - - @Override - public Object clone() throws CloneNotSupportedException{ - STORKLogoutRequest storkLogoutRequest = null; - storkLogoutRequest = (STORKLogoutRequest) super.clone(); - storkLogoutRequest.setTokenSaml(getTokenSaml()); - return storkLogoutRequest; - } + + /** The samlId. */ + private String samlId; + + /** The destination. */ + private String destination; + + /** The distinguished name. */ + private String distinguishedName; + + /** The qaa. */ + private int qaa; + + /** The token saml. */ + private byte[] tokenSaml = new byte[0]; + + /** The issuer. */ + private String issuer; + + /** The country. */ + private String country; + + /** The Alias used at the keystore for saving this certificate. */ + private String alias; + + /** The ID of principal as known to SP **/ + private String spProvidedId; + + /** + * Gets the SP's Certificate Alias. + * + * @return alias The SP's Certificate Alias. + */ + public String getAlias() { + return alias; + } + + /** + * Sets the SP's Certificate Alias. + * + * @param nAlias + * The SP's Certificate Alias. + */ + public void setAlias(final String nAlias) { + this.alias = nAlias; + } + + /** + * Gets the issuer. + * + * @return The issuer value. + */ + public String getIssuer() { + return issuer; + } + + /** + * Sets the issuer. + * + * @param samlIssuer + * the new issuer value. + */ + public void setIssuer(final String samlIssuer) { + this.issuer = samlIssuer; + } + + /** + * Gets the SAML Token. + * + * @return The SAML Token value. + */ + public byte[] getTokenSaml() { + return tokenSaml.clone(); + } + + /** + * Sets the SAML Token. + * + * @param samlToken + * The new SAML Token value. + */ + public void setTokenSaml(final byte[] samlToken) { + if (samlToken != null) { + this.tokenSaml = samlToken.clone(); + } + } + + /** + * Gets the country. + * + * @return The country value. + */ + public String getCountry() { + return country; + } + + /** + * Sets the country. + * + * @param nCountry + * the new country value. + */ + public void setCountry(final String nCountry) { + this.country = nCountry; + } + + /** + * Getter for the qaa value. + * + * @return The qaa value value. + */ + public int getQaa() { + return qaa; + } + + /** + * Setter for the qaa value. + * + * @param qaaLevel + * The new qaa value. + */ + public void setQaa(final int qaaLevel) { + this.qaa = qaaLevel; + } + + /** + * Getter for the destination value. + * + * @return The destination value. + */ + public String getDestination() { + return destination; + } + + /** + * Setter for the destination value. + * + * @param detination + * the new destination value. + */ + public void setDestination(final String detination) { + this.destination = detination; + } + + /** + * Getter for the samlId value. + * + * @return The samlId value. + */ + public String getSamlId() { + return samlId; + } + + /** + * Setter for the samlId value. + * + * @param newSamlId + * the new samlId value. + */ + public void setSamlId(final String newSamlId) { + this.samlId = newSamlId; + } + + /** + * Getter for the distinguishedName value. + * + * @return The distinguishedName value. + */ + public String getDistinguishedName() { + return distinguishedName; + } + + /** + * Setter for the distinguishedName value. + * + * @param certDN + * the distinguished name value. + */ + public void setDistinguishedName(final String certDN) { + this.distinguishedName = certDN; + } + + /** Getter for spProvidedId **/ + public String getSpProvidedId() { + return spProvidedId; + } + + public void setSpProvidedId(final String nSpProvidedId) { + this.spProvidedId = nSpProvidedId; + } + + @Override + public Object clone() throws CloneNotSupportedException { + STORKLogoutRequest storkLogoutRequest = null; + storkLogoutRequest = (STORKLogoutRequest) super.clone(); + storkLogoutRequest.setTokenSaml(getTokenSaml()); + return storkLogoutRequest; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java index 21b53a652..fe90056bf 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java @@ -4,247 +4,257 @@ import java.io.Serializable; public class STORKLogoutResponse implements Serializable, Cloneable { private static final long serialVersionUID = 4778480781609392750L; - - /** The samlId. */ - private String samlId; - - /** The destination. */ - private String destination; - - /** The distinguished name. */ - private String distinguishedName; - - /** The token saml. */ - private byte[] tokenSaml = new byte[0]; - - /** The issuer. */ - private String issuer; - - /** The country. */ - private String country; - - /** The Alias used at the keystore for saving this certificate. */ - private String alias; - - /** Status code. */ - private String statusCode; - - /** Secondary status code. */ - private String subStatusCode; - - /** Status message. */ - private String statusMessage; - - /** Logout failed? */ - private boolean fail; - - /** - * Gets the SP's Certificate Alias. - * - * @return alias The SP's Certificate Alias. - */ - public String getAlias() { - return alias; - } - - /** - * Sets the SP's Certificate Alias. - * - * @param nAlias The SP's Certificate Alias. - */ - public void setAlias(final String nAlias) { - this.alias = nAlias; - } - - /** - * Gets the issuer. - * - * @return The issuer value. - */ - public String getIssuer() { - return issuer; - } - - /** - * Sets the issuer. - * - * @param samlIssuer the new issuer value. - */ - public void setIssuer(final String samlIssuer) { - this.issuer = samlIssuer; - } - - /** - * Gets the SAML Token. - * - * @return The SAML Token value. - */ - public byte[] getTokenSaml() { - return tokenSaml.clone(); - } - - /** - * Sets the SAML Token. - * - * @param samlToken The new SAML Token value. - */ - public void setTokenSaml(final byte[] samlToken) { - if (samlToken != null) { - this.tokenSaml = samlToken.clone(); - } - } - - /** - * Gets the country. - * - * @return The country value. - */ - public String getCountry() { - return country; - } - - /** - * Sets the country. - * - * @param nCountry the new country value. - */ - public void setCountry(final String nCountry) { - this.country = nCountry; - } - - /** - * Getter for the destination value. - * - * @return The destination value. - */ - public String getDestination() { - return destination; - } - - /** - * Setter for the destination value. - * - * @param detination the new destination value. - */ - public void setDestination(final String detination) { - this.destination = detination; - } - - /** - * Getter for the samlId value. - * - * @return The samlId value. - */ - public String getSamlId() { - return samlId; - } - - /** - * Setter for the samlId value. - * - * @param newSamlId the new samlId value. - */ - public void setSamlId(final String newSamlId) { - this.samlId = newSamlId; - } - - /** - * Getter for the distinguishedName value. - * - * @return The distinguishedName value. - */ - public String getDistinguishedName() { - return distinguishedName; - } - - /** - * Setter for the distinguishedName value. - * - * @param certDN the distinguished name value. - */ - public void setDistinguishedName(final String certDN) { - this.distinguishedName = certDN; - } - - - /** - * Getter for the fail value. - * - * @return The fail value. - */ - public boolean isFail() { - return fail; - } - - /** - * Setter for the fail value. - * - * @param failVal the new fail value. - */ - public void setFail(final boolean failVal) { - this.fail = failVal; - } - - /** - * Getter for the statusCode value. - * - * @return The statusCode value. - */ - public String getStatusCode() { - return statusCode; - } - - /** - * Getter for the subStatusCode. - * - * @return The subStatusCode value. - */ - public String getSubStatusCode() { - return subStatusCode; - } - - /** - * Setter for the subStatusCode. - * - * @param samlSubStatusCode the new subStatusCode value. - */ - public void setSubStatusCode(final String samlSubStatusCode) { - this.subStatusCode = samlSubStatusCode; - } - - /** - * Setter for the statusMessage value. - * - * @param status the new statusMessage value. - */ - public void setStatusMessage(final String status) { - this.statusMessage = status; - } - - /** - * Getter for the statusMessage value. - * - * @return The statusMessage value. - */ - public String getStatusMessage() { - return statusMessage; - } - - /** - * Setter for the statusCode value. - * - * @param status the new statusCode value. - */ - public void setStatusCode(final String status) { - this.statusCode = status; - } - - @Override - public Object clone() throws CloneNotSupportedException{ - STORKLogoutResponse storkLogoutResponse = null; - storkLogoutResponse = (STORKLogoutResponse) super.clone(); - storkLogoutResponse.setTokenSaml(getTokenSaml()); - return storkLogoutResponse; - } + + /** The samlId. */ + private String samlId; + + /** The destination. */ + private String destination; + + /** The distinguished name. */ + private String distinguishedName; + + /** The token saml. */ + private byte[] tokenSaml = new byte[0]; + + /** The issuer. */ + private String issuer; + + /** The country. */ + private String country; + + /** The Alias used at the keystore for saving this certificate. */ + private String alias; + + /** Status code. */ + private String statusCode; + + /** Secondary status code. */ + private String subStatusCode; + + /** Status message. */ + private String statusMessage; + + /** Logout failed? */ + private boolean fail; + + /** + * Gets the SP's Certificate Alias. + * + * @return alias The SP's Certificate Alias. + */ + public String getAlias() { + return alias; + } + + /** + * Sets the SP's Certificate Alias. + * + * @param nAlias + * The SP's Certificate Alias. + */ + public void setAlias(final String nAlias) { + this.alias = nAlias; + } + + /** + * Gets the issuer. + * + * @return The issuer value. + */ + public String getIssuer() { + return issuer; + } + + /** + * Sets the issuer. + * + * @param samlIssuer + * the new issuer value. + */ + public void setIssuer(final String samlIssuer) { + this.issuer = samlIssuer; + } + + /** + * Gets the SAML Token. + * + * @return The SAML Token value. + */ + public byte[] getTokenSaml() { + return tokenSaml.clone(); + } + + /** + * Sets the SAML Token. + * + * @param samlToken + * The new SAML Token value. + */ + public void setTokenSaml(final byte[] samlToken) { + if (samlToken != null) { + this.tokenSaml = samlToken.clone(); + } + } + + /** + * Gets the country. + * + * @return The country value. + */ + public String getCountry() { + return country; + } + + /** + * Sets the country. + * + * @param nCountry + * the new country value. + */ + public void setCountry(final String nCountry) { + this.country = nCountry; + } + + /** + * Getter for the destination value. + * + * @return The destination value. + */ + public String getDestination() { + return destination; + } + + /** + * Setter for the destination value. + * + * @param detination + * the new destination value. + */ + public void setDestination(final String detination) { + this.destination = detination; + } + + /** + * Getter for the samlId value. + * + * @return The samlId value. + */ + public String getSamlId() { + return samlId; + } + + /** + * Setter for the samlId value. + * + * @param newSamlId + * the new samlId value. + */ + public void setSamlId(final String newSamlId) { + this.samlId = newSamlId; + } + + /** + * Getter for the distinguishedName value. + * + * @return The distinguishedName value. + */ + public String getDistinguishedName() { + return distinguishedName; + } + + /** + * Setter for the distinguishedName value. + * + * @param certDN + * the distinguished name value. + */ + public void setDistinguishedName(final String certDN) { + this.distinguishedName = certDN; + } + + /** + * Getter for the fail value. + * + * @return The fail value. + */ + public boolean isFail() { + return fail; + } + + /** + * Setter for the fail value. + * + * @param failVal + * the new fail value. + */ + public void setFail(final boolean failVal) { + this.fail = failVal; + } + + /** + * Getter for the statusCode value. + * + * @return The statusCode value. + */ + public String getStatusCode() { + return statusCode; + } + + /** + * Getter for the subStatusCode. + * + * @return The subStatusCode value. + */ + public String getSubStatusCode() { + return subStatusCode; + } + + /** + * Setter for the subStatusCode. + * + * @param samlSubStatusCode + * the new subStatusCode value. + */ + public void setSubStatusCode(final String samlSubStatusCode) { + this.subStatusCode = samlSubStatusCode; + } + + /** + * Setter for the statusMessage value. + * + * @param status + * the new statusMessage value. + */ + public void setStatusMessage(final String status) { + this.statusMessage = status; + } + + /** + * Getter for the statusMessage value. + * + * @return The statusMessage value. + */ + public String getStatusMessage() { + return statusMessage; + } + + /** + * Setter for the statusCode value. + * + * @param status + * the new statusCode value. + */ + public void setStatusCode(final String status) { + this.statusCode = status; + } + + @Override + public Object clone() throws CloneNotSupportedException { + STORKLogoutResponse storkLogoutResponse = null; + storkLogoutResponse = (STORKLogoutResponse) super.clone(); + storkLogoutResponse.setTokenSaml(getTokenSaml()); + return storkLogoutResponse; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java index a9c4a156b..98781828e 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java @@ -16,53 +16,52 @@ package eu.stork.peps.auth.commons; /** * This enum class contains the SAML Token Status Code. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ */ public enum STORKStatusCode { - - /** URI for Requester status code. */ - REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"), - - /** URI for Responder status code. */ - RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"), - - /** URI for Success status code. */ - SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"), - - /** Attribute is Available. */ - STATUS_AVAILABLE("Available"), - - /** Attribute is NotAvailable. */ - STATUS_NOT_AVAILABLE("NotAvailable"), - - /** Attribute is Withheld. */ - STATUS_WITHHELD("Withheld"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - private STORKStatusCode(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } + + /** URI for Requester status code. */ + REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"), + + /** URI for Responder status code. */ + RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"), + + /** URI for Success status code. */ + SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"), + + /** Attribute is Available. */ + STATUS_AVAILABLE("Available"), + + /** Attribute is NotAvailable. */ + STATUS_NOT_AVAILABLE("NotAvailable"), + + /** Attribute is Withheld. */ + STATUS_WITHHELD("Withheld"); + + /** + * Represents the constant's value. + */ + private String value; + + /** + * Solo Constructor. + * + * @param val + * The Constant value. + */ + private STORKStatusCode(final String val) { + + this.value = val; + } + + /** + * Return the Constant Value. + * + * @return The constant value. + */ + public String toString() { + + return value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java index 0a711c9b7..0d5d72a0e 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java @@ -16,56 +16,52 @@ package eu.stork.peps.auth.commons; /** * This enum class contains the SAML Token Sub Status Code. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.7 $, $Date: 2010-11-17 05:15:28 $ */ public enum STORKSubStatusCode { - - /** URI for AuthnFailed status code. */ - AUTHN_FAILED_URI("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"), - - /** URI for InvalidAttrNameOrValue status code. */ - INVALID_ATTR_NAME_VALUE_URI( - "urn:oasis:names:tc:SAML:2.0:status:InvalidAttrNameOrValue"), - - /** URI for InvalidNameIDPolicy status code. */ - INVALID_NAMEID_POLICY_URI( - "urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"), - - /** URI for VersionMismatch status code. */ - VERSION_MISMATCH_URI("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"), - - /** URI for RequestDenied status code. */ - REQUEST_DENIED_URI("urn:oasis:names:tc:SAML:2.0:status:RequestDenied"), - - /** URI for QaaNotSupported status code. */ - QAA_NOT_SUPPORTED( - "http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported"); - - /** - * Represents the constant's value. - */ - private String value; - - /** - * Solo Constructor. - * - * @param val The Constant value. - */ - private STORKSubStatusCode(final String val) { - - this.value = val; - } - - /** - * Return the Constant Value. - * - * @return The constant value. - */ - public String toString() { - - return value; - } + + /** URI for AuthnFailed status code. */ + AUTHN_FAILED_URI("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"), + + /** URI for InvalidAttrNameOrValue status code. */ + INVALID_ATTR_NAME_VALUE_URI("urn:oasis:names:tc:SAML:2.0:status:InvalidAttrNameOrValue"), + + /** URI for InvalidNameIDPolicy status code. */ + INVALID_NAMEID_POLICY_URI("urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"), + + /** URI for VersionMismatch status code. */ + VERSION_MISMATCH_URI("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"), + + /** URI for RequestDenied status code. */ + REQUEST_DENIED_URI("urn:oasis:names:tc:SAML:2.0:status:RequestDenied"), + + /** URI for QaaNotSupported status code. */ + QAA_NOT_SUPPORTED("http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported"); + + /** + * Represents the constant's value. + */ + private String value; + + /** + * Solo Constructor. + * + * @param val + * The Constant value. + */ + private STORKSubStatusCode(final String val) { + + this.value = val; + } + + /** + * Return the Constant Value. + * + * @return The constant value. + */ + public String toString() { + + return value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java index e9a96d7c2..97b43cf67 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java @@ -18,156 +18,160 @@ import java.io.Serializable; /** * Abstract class to represent the various PEPS exceptions. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ */ -public abstract class AbstractPEPSException extends RuntimeException implements - Serializable { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = -1884417567740138022L; - - /** - * Error code. - */ - private String errorCode; - - /** - * Error message. - */ - private String errorMessage; - - /** - * SAML token. - */ - private String samlTokenFail; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param code The error code value. - * @param message The error message value. - */ - public AbstractPEPSException(final String code, final String message) { - - super(message); - this.errorCode = code; - this.errorMessage = message; - } - - /** - * Exception Constructor with the errorMessage as parameters and the Throwable - * cause. - * - * @param message The error message value. - * @param cause The throwable object. - */ - public AbstractPEPSException(final String message, final Throwable cause) { - - super(message, cause); - this.errorMessage = message; - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param code The error code value. - * @param message The error message value. - * @param cause The throwable object. - */ - public AbstractPEPSException(final String code, final String message, - final Throwable cause) { - - super(message, cause); - this.errorCode = code; - this.errorMessage = message; - } - - /** - * Exception Constructor with three Strings representing the errorCode, - * errorMessage and encoded samlToken as parameters. - * - * @param code The error code value. - * @param message The error message value. - * @param samlToken The error SAML Token. - */ - public AbstractPEPSException(final String code, final String message, - final String samlToken) { - - super(message); - this.errorCode = code; - this.errorMessage = message; - this.samlTokenFail = samlToken; - } - - /** - * Constructor with SAML Token as argument. Error message and error code are - * embedded in the SAML. - * - * @param samlToken The error SAML Token. - */ - public AbstractPEPSException(final String samlToken) { - super(); - this.samlTokenFail = samlToken; - } - - /** - * Getter for errorCode. - * - * @return The errorCode value. - */ - public final String getErrorCode() { - return errorCode; - } - - /** - * Setter for errorCode. - * - * @param code The error code value. - */ - public final void setErrorCode(final String code) { - this.errorCode = code; - } - - /** - * Getter for errorMessage. - * - * @return The error Message value. - */ - public final String getErrorMessage() { - return errorMessage; - } - - /** - * Setter for errorMessage. - * - * @param message The error message value. - */ - public final void setErrorMessage(final String message) { - this.errorMessage = message; - } - - /** - * Getter for SAMLTokenFail. - * - * @return The error SAML Token. - */ - public final String getSamlTokenFail() { - return samlTokenFail; - } - - /** - * Setter for SAMLTokenFail. - * - * @param samlToken The error SAML token. - */ - public final void setSamlTokenFail(final String samlToken) { - this.samlTokenFail = samlToken; - } +public abstract class AbstractPEPSException extends RuntimeException implements Serializable { + + /** + * Unique identifier. + */ + private static final long serialVersionUID = -1884417567740138022L; + + /** + * Error code. + */ + private String errorCode; + + /** + * Error message. + */ + private String errorMessage; + + /** + * SAML token. + */ + private String samlTokenFail; + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param code + * The error code value. + * @param message + * The error message value. + */ + public AbstractPEPSException(final String code, final String message) { + + super(message); + this.errorCode = code; + this.errorMessage = message; + } + + /** + * Exception Constructor with the errorMessage as parameters and the Throwable cause. + * + * @param message + * The error message value. + * @param cause + * The throwable object. + */ + public AbstractPEPSException(final String message, final Throwable cause) { + + super(message, cause); + this.errorMessage = message; + } + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters and the Throwable cause. + * + * @param code + * The error code value. + * @param message + * The error message value. + * @param cause + * The throwable object. + */ + public AbstractPEPSException(final String code, final String message, final Throwable cause) { + + super(message, cause); + this.errorCode = code; + this.errorMessage = message; + } + + /** + * Exception Constructor with three Strings representing the errorCode, errorMessage and encoded samlToken as parameters. + * + * @param code + * The error code value. + * @param message + * The error message value. + * @param samlToken + * The error SAML Token. + */ + public AbstractPEPSException(final String code, final String message, final String samlToken) { + + super(message); + this.errorCode = code; + this.errorMessage = message; + this.samlTokenFail = samlToken; + } + + /** + * Constructor with SAML Token as argument. Error message and error code are embedded in the SAML. + * + * @param samlToken + * The error SAML Token. + */ + public AbstractPEPSException(final String samlToken) { + super(); + this.samlTokenFail = samlToken; + } + + /** + * Getter for errorCode. + * + * @return The errorCode value. + */ + public final String getErrorCode() { + return errorCode; + } + + /** + * Setter for errorCode. + * + * @param code + * The error code value. + */ + public final void setErrorCode(final String code) { + this.errorCode = code; + } + + /** + * Getter for errorMessage. + * + * @return The error Message value. + */ + public final String getErrorMessage() { + return errorMessage; + } + + /** + * Setter for errorMessage. + * + * @param message + * The error message value. + */ + public final void setErrorMessage(final String message) { + this.errorMessage = message; + } + + /** + * Getter for SAMLTokenFail. + * + * @return The error SAML Token. + */ + public final String getSamlTokenFail() { + return samlTokenFail; + } + + /** + * Setter for SAMLTokenFail. + * + * @param samlToken + * The error SAML token. + */ + public final void setSamlTokenFail(final String samlToken) { + this.samlTokenFail = samlToken; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java index 69cb20fdd..3479a33b8 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java @@ -14,130 +14,133 @@ package eu.stork.peps.auth.commons.exceptions; /** - * This exception is thrown by the C-PEPS service and holds the relative - * information to present to the citizen. + * This exception is thrown by the C-PEPS service and holds the relative information to present to the citizen. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $ */ public final class CPEPSException extends RuntimeException { - - /** - * Serial id. - */ - private static final long serialVersionUID = -4012295047127999362L; - - /** - * Error code. - */ - private String errorCode; - - /** - * Error message. - */ - private String errorMessage; - - /** - * SAML token. - */ - private String samlTokenFail; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param samlToken The SAML Token. - * @param code The error code value. - * @param message The error message value. - */ - public CPEPSException(final String samlToken, final String code, - final String message) { - - super(message); - this.setErrorCode(code); - this.setErrorMessage(message); - this.setSamlTokenFail(samlToken); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param samlToken The SAML Token. - * @param code The error code value. - * @param message The error message value. - * @param cause The original exception; - */ - public CPEPSException(final String samlToken, final String code, - final String message, final Throwable cause) { - - super(message, cause); - this.setErrorCode(code); - this.setErrorMessage(message); - this.setSamlTokenFail(samlToken); - } - - /** - * {@inheritDoc} - */ - public String getMessage() { - return this.getErrorMessage() + " (" + this.getErrorCode() + ")"; - } - - /** - * Getter for the error code. - * - * @return The errorCode value. - */ - public String getErrorCode() { - return errorCode; - } - - /** - * Setter for the error code. - * - * @param code The error code. - */ - public void setErrorCode(final String code) { - this.errorCode = code; - } - - /** - * Getter for the error message. - * - * @return The errorMessage value. - */ - public String getErrorMessage() { - return errorMessage; - } - - /** - * Setter for the error message. - * - * @param message The error message. - */ - public void setErrorMessage(final String message) { - this.errorMessage = message; - } - - /** - * Getter for the samlTokenFail. - * - * @return The samlTokenFail value. - */ - public String getSamlTokenFail() { - return samlTokenFail; - } - - /** - * Setter for the samlTokenFail. - * - * @param samlToken The error Saml Token. - */ - public void setSamlTokenFail(final String samlToken) { - this.samlTokenFail = samlToken; - } - + + /** + * Serial id. + */ + private static final long serialVersionUID = -4012295047127999362L; + + /** + * Error code. + */ + private String errorCode; + + /** + * Error message. + */ + private String errorMessage; + + /** + * SAML token. + */ + private String samlTokenFail; + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param samlToken + * The SAML Token. + * @param code + * The error code value. + * @param message + * The error message value. + */ + public CPEPSException(final String samlToken, final String code, final String message) { + + super(message); + this.setErrorCode(code); + this.setErrorMessage(message); + this.setSamlTokenFail(samlToken); + } + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param samlToken + * The SAML Token. + * @param code + * The error code value. + * @param message + * The error message value. + * @param cause + * The original exception; + */ + public CPEPSException(final String samlToken, final String code, final String message, final Throwable cause) { + + super(message, cause); + this.setErrorCode(code); + this.setErrorMessage(message); + this.setSamlTokenFail(samlToken); + } + + /** + * {@inheritDoc} + */ + public String getMessage() { + return this.getErrorMessage() + " (" + this.getErrorCode() + ")"; + } + + /** + * Getter for the error code. + * + * @return The errorCode value. + */ + public String getErrorCode() { + return errorCode; + } + + /** + * Setter for the error code. + * + * @param code + * The error code. + */ + public void setErrorCode(final String code) { + this.errorCode = code; + } + + /** + * Getter for the error message. + * + * @return The errorMessage value. + */ + public String getErrorMessage() { + return errorMessage; + } + + /** + * Setter for the error message. + * + * @param message + * The error message. + */ + public void setErrorMessage(final String message) { + this.errorMessage = message; + } + + /** + * Getter for the samlTokenFail. + * + * @return The samlTokenFail value. + */ + public String getSamlTokenFail() { + return samlTokenFail; + } + + /** + * Setter for the samlTokenFail. + * + * @param samlToken + * The error Saml Token. + */ + public void setSamlTokenFail(final String samlToken) { + this.samlTokenFail = samlToken; + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java index 67514d4fe..f1bccb277 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java @@ -16,59 +16,59 @@ package eu.stork.peps.auth.commons.exceptions; /** * Internal Error Exception class. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $ * * @see AbstractPEPSException */ public final class InternalErrorPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 1193001455410319795L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param cause The throwable object. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage, final Throwable cause) { - - super(errorCode, errorMessage, cause); - } - - /** - * Exception Constructor with three strings representing the errorCode, - * errorMessage and encoded samlToken as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param samlTokenFail The error SAML Token. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage, final String samlTokenFail) { - - super(errorCode, errorMessage, samlTokenFail); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - */ - public InternalErrorPEPSException(final String errorCode, - final String errorMessage) { - - super(errorCode, errorMessage); - } - + + /** + * Unique identifier. + */ + private static final long serialVersionUID = 1193001455410319795L; + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters and the Throwable cause. + * + * @param errorCode + * The error code value. + * @param errorMessage + * The error message value. + * @param cause + * The throwable object. + */ + public InternalErrorPEPSException(final String errorCode, final String errorMessage, final Throwable cause) { + + super(errorCode, errorMessage, cause); + } + + /** + * Exception Constructor with three strings representing the errorCode, errorMessage and encoded samlToken as parameters. + * + * @param errorCode + * The error code value. + * @param errorMessage + * The error message value. + * @param samlTokenFail + * The error SAML Token. + */ + public InternalErrorPEPSException(final String errorCode, final String errorMessage, final String samlTokenFail) { + + super(errorCode, errorMessage, samlTokenFail); + } + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param errorCode + * The error code value. + * @param errorMessage + * The error message value. + */ + public InternalErrorPEPSException(final String errorCode, final String errorMessage) { + + super(errorCode, errorMessage); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java index 12c83b589..0aca67d5b 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java @@ -16,39 +16,38 @@ package eu.stork.peps.auth.commons.exceptions; /** * Invalid Parameter Exception class. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.11 $, $Date: 2010-11-17 05:15:28 $ * * @see InvalidParameterPEPSException */ public class InvalidParameterPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 2046282148740524875L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error code message value. - */ - public InvalidParameterPEPSException(final String errorCode, - final String errorMessage) { - super(errorCode, errorMessage); - } - - /** - * Exception Constructor with one String representing the encoded samlToken. - * - * @param samlTokenFail The error SAML Token. - */ - public InvalidParameterPEPSException(final String samlTokenFail) { - super(samlTokenFail); - } - + + /** + * Unique identifier. + */ + private static final long serialVersionUID = 2046282148740524875L; + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param errorCode + * The error code value. + * @param errorMessage + * The error code message value. + */ + public InvalidParameterPEPSException(final String errorCode, final String errorMessage) { + super(errorCode, errorMessage); + } + + /** + * Exception Constructor with one String representing the encoded samlToken. + * + * @param samlTokenFail + * The error SAML Token. + */ + public InvalidParameterPEPSException(final String samlTokenFail) { + super(samlTokenFail); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java index 800525eee..a4389da79 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java @@ -16,31 +16,29 @@ package eu.stork.peps.auth.commons.exceptions; /** * Invalid session Exception class. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.14 $, $Date: 2010-11-17 05:15:28 $ * * @see InvalidParameterPEPSException */ public class InvalidSessionPEPSException extends InvalidParameterPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 7147090160978319016L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - */ - public InvalidSessionPEPSException(final String errorCode, - final String errorMessage) { - - super(errorCode, errorMessage); - } - + + /** + * Unique identifier. + */ + private static final long serialVersionUID = 7147090160978319016L; + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param errorCode + * The error code value. + * @param errorMessage + * The error message value. + */ + public InvalidSessionPEPSException(final String errorCode, final String errorMessage) { + + super(errorCode, errorMessage); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java index fc27371d2..03e7fb72f 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java @@ -16,52 +16,53 @@ package eu.stork.peps.auth.commons.exceptions; /** * Security PEPS Exception class. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.18 $, $Date: 2010-11-17 05:15:28 $ * * @see AbstractPEPSException */ public final class SecurityPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 5605743302478554967L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMsg The error message value. - */ - public SecurityPEPSException(final String errorCode, final String errorMsg) { - super(errorCode, errorMsg); - } - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters and the Throwable cause. - * - * @param errorCode The error code value. - * @param errorMessage The error message value. - * @param cause The throwable object. - */ - public SecurityPEPSException(final String errorCode, - final String errorMessage, final Throwable cause) { - - super(errorCode, errorMessage, cause); - } - - /** - * Exception Constructor with one String representing the encoded samlToken. - * - * @param samlTokenFail The error SAML Token. - */ - public SecurityPEPSException(final String samlTokenFail) { - super(samlTokenFail); - } - + + /** + * Unique identifier. + */ + private static final long serialVersionUID = 5605743302478554967L; + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param errorCode + * The error code value. + * @param errorMsg + * The error message value. + */ + public SecurityPEPSException(final String errorCode, final String errorMsg) { + super(errorCode, errorMsg); + } + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters and the Throwable cause. + * + * @param errorCode + * The error code value. + * @param errorMessage + * The error message value. + * @param cause + * The throwable object. + */ + public SecurityPEPSException(final String errorCode, final String errorMessage, final Throwable cause) { + + super(errorCode, errorMessage, cause); + } + + /** + * Exception Constructor with one String representing the encoded samlToken. + * + * @param samlTokenFail + * The error SAML Token. + */ + public SecurityPEPSException(final String samlTokenFail) { + super(samlTokenFail); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java index a2da61a02..55f4f5a01 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java @@ -16,38 +16,36 @@ package eu.stork.peps.auth.commons.exceptions; /** * Security PEPS Exception class. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com, - * paulo.ribeiro@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $ * * @see AbstractPEPSException */ public final class StorkPEPSException extends AbstractPEPSException { - - /** - * Unique identifier. - */ - private static final long serialVersionUID = 8048033129798427574L; - - /** - * Exception Constructor with two Strings representing the errorCode and - * errorMessage as parameters. - * - * @param errorCode The error code value. - * @param errorMsg The error message value. - */ - public StorkPEPSException(final String errorCode, final String errorMsg) { - super(errorCode, errorMsg); - } - - /** - * {@inheritDoc} - */ - public String getMessage() { - - return "Security Error (" + this.getErrorCode() + ") processing request : " - + this.getErrorMessage(); - } - + + /** + * Unique identifier. + */ + private static final long serialVersionUID = 8048033129798427574L; + + /** + * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters. + * + * @param errorCode + * The error code value. + * @param errorMsg + * The error message value. + */ + public StorkPEPSException(final String errorCode, final String errorMsg) { + super(errorCode, errorMsg); + } + + /** + * {@inheritDoc} + */ + public String getMessage() { + + return "Security Error (" + this.getErrorCode() + ") processing request : " + this.getErrorMessage(); + } + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java index 19d45aaa2..d733342d7 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java @@ -7,3 +7,4 @@ * @since 1.0 */ package eu.stork.peps.auth.commons; + diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java index 5c24cc5a8..d9166458f 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java @@ -23,193 +23,213 @@ import eu.stork.peps.auth.commons.STORKAuthnResponse; /** * Interface for Specific Authentication methods. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com */ public interface IAUService { - - /** - * Prepares the citizen to be redirected to the IdP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The Requested attributes. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] prepareCitizenAuthentication(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Prepares the citizen to be redirected to the PV. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The Requested attributes. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] preparePVRequest(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Authenticates a citizen. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The requested attributes. - * - * @return The updated Personal Attribute List. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList authenticateCitizen( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Validates a power. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The requested attributes. - * - * @return The updated Personal Attribute List (power validated). - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList powerValidation( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Prepares the Citizen browser to be redirected to the AP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * @param requestAttributes The requested attributes. - * - * @return true in case of no error. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - boolean prepareAPRedirect(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session); - - /** - * Returns the attributes values from the AP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param requestAttributes The request attributes. - * - * @return The updated Personal Attribute List. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList getAttributesFromAttributeProviders( - IPersonalAttributeList personalList, Map parameters, - Map requestAttributes); - - /** - * Get the attributes from the AP with verification. - * - * @param personalList The Personal Attribute List. - * @param parameters The HTTP Parameters. - * @param requestAttributes The requested Attributes. - * @param session The session object. - * @param auProcessId The SAML identifier. - * - * @return true if the attributes were correctly verified. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - boolean getAttributesWithVerification(IPersonalAttributeList personalList, - Map parameters, Map requestAttributes, - IStorkSession session, String auProcessId); - - /** - * Validates a SAML Response. - * - * @param samlToken The SAML Token. - * @param session The session object. - * - * @return the STORKAuthnResponse associated with the validated response. - * - * @see IStorkSession - */ - STORKAuthnResponse processAuthenticationResponse(byte[] samlToken, - IStorkSession session); - - /** - * Generates a SAML Response in case of error. - * - * @param inResponseTo The SAML's identifier to response. - * @param issuer The issuer value. - * @param assertionURL The assertion URL. - * @param code The error code. - * @param subcode The sub error code. - * @param message The error message. - * @param ipUserAddress The user IP address. - * - * @return byte[] containing the SAML Response. - */ - byte[] generateErrorAuthenticationResponse(String inResponseTo, - String issuer, String assertionURL, String code, String subcode, - String message, String ipUserAddress); - - /** - * Compares two given personal attribute lists. - * - * @param original The original Personal Attribute List. - * @param modified The modified Personal Attribute List. - * @return true if the original list contains the modified one. False - * otherwise. - * - * @see IPersonalAttributeList - */ - boolean comparePersonalAttributeLists(IPersonalAttributeList original, - IPersonalAttributeList modified); - - /** - * Prepares the citizen to be redirected to the AtP. - * - * @param personalList The Personal Attribute List. - * @param parameters The parameters. - * @param session The session object. - * - * @return byte[] containing a SAML Request. - * - * @see IPersonalAttributeList - * @see IStorkSession - */ - byte[] prepareAttributeRequest(IPersonalAttributeList personalList, - Map parameters, IStorkSession session); - /** - * Validates a SAML Response. - * - * @param samlToken The SAML Token. - * @param session The session object. - * - * @return the STORKAttrQueryResponse associated with the validated response. - * - * @see IStorkSession - */ - STORKAttrQueryResponse processAttributeResponse(byte[] samlToken, - IStorkSession session); + /** + * Prepares the citizen to be redirected to the IdP. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The parameters. + * @param session + * The session object. + * @param requestAttributes + * The Requested attributes. + * + * @return byte[] containing a SAML Request. + * + * @see IPersonalAttributeList + * @see IStorkSession + */ + byte[] prepareCitizenAuthentication(IPersonalAttributeList personalList, Map parameters, Map requestAttributes, IStorkSession session); + + /** + * Prepares the citizen to be redirected to the PV. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The parameters. + * @param session + * The session object. + * @param requestAttributes + * The Requested attributes. + * + * @return byte[] containing a SAML Request. + * + * @see IPersonalAttributeList + * @see IStorkSession + */ + byte[] preparePVRequest(IPersonalAttributeList personalList, Map parameters, Map requestAttributes, IStorkSession session); + + /** + * Authenticates a citizen. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The parameters. + * @param requestAttributes + * The requested attributes. + * + * @return The updated Personal Attribute List. + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList authenticateCitizen(IPersonalAttributeList personalList, Map parameters, Map requestAttributes); + + /** + * Validates a power. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The parameters. + * @param requestAttributes + * The requested attributes. + * + * @return The updated Personal Attribute List (power validated). + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList powerValidation(IPersonalAttributeList personalList, Map parameters, Map requestAttributes); + + /** + * Prepares the Citizen browser to be redirected to the AP. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The parameters. + * @param session + * The session object. + * @param requestAttributes + * The requested attributes. + * + * @return true in case of no error. + * + * @see IPersonalAttributeList + * @see IStorkSession + */ + boolean prepareAPRedirect(IPersonalAttributeList personalList, Map parameters, Map requestAttributes, IStorkSession session); + + /** + * Returns the attributes values from the AP. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The parameters. + * @param requestAttributes + * The request attributes. + * + * @return The updated Personal Attribute List. + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList getAttributesFromAttributeProviders(IPersonalAttributeList personalList, Map parameters, Map requestAttributes); + + /** + * Get the attributes from the AP with verification. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The HTTP Parameters. + * @param requestAttributes + * The requested Attributes. + * @param session + * The session object. + * @param auProcessId + * The SAML identifier. + * + * @return true if the attributes were correctly verified. + * + * @see IPersonalAttributeList + * @see IStorkSession + */ + boolean getAttributesWithVerification(IPersonalAttributeList personalList, Map parameters, Map requestAttributes, IStorkSession session, String auProcessId); + + /** + * Validates a SAML Response. + * + * @param samlToken + * The SAML Token. + * @param session + * The session object. + * + * @return the STORKAuthnResponse associated with the validated response. + * + * @see IStorkSession + */ + STORKAuthnResponse processAuthenticationResponse(byte[] samlToken, IStorkSession session); + + /** + * Generates a SAML Response in case of error. + * + * @param inResponseTo + * The SAML's identifier to response. + * @param issuer + * The issuer value. + * @param assertionURL + * The assertion URL. + * @param code + * The error code. + * @param subcode + * The sub error code. + * @param message + * The error message. + * @param ipUserAddress + * The user IP address. + * + * @return byte[] containing the SAML Response. + */ + byte[] generateErrorAuthenticationResponse(String inResponseTo, String issuer, String assertionURL, String code, String subcode, String message, String ipUserAddress); + + /** + * Compares two given personal attribute lists. + * + * @param original + * The original Personal Attribute List. + * @param modified + * The modified Personal Attribute List. + * @return true if the original list contains the modified one. False otherwise. + * + * @see IPersonalAttributeList + */ + boolean comparePersonalAttributeLists(IPersonalAttributeList original, IPersonalAttributeList modified); + + /** + * Prepares the citizen to be redirected to the AtP. + * + * @param personalList + * The Personal Attribute List. + * @param parameters + * The parameters. + * @param session + * The session object. + * + * @return byte[] containing a SAML Request. + * + * @see IPersonalAttributeList + * @see IStorkSession + */ + byte[] prepareAttributeRequest(IPersonalAttributeList personalList, Map parameters, IStorkSession session); + + /** + * Validates a SAML Response. + * + * @param samlToken + * The SAML Token. + * @param session + * The session object. + * + * @return the STORKAttrQueryResponse associated with the validated response. + * + * @see IStorkSession + */ + STORKAttrQueryResponse processAttributeResponse(byte[] samlToken, IStorkSession session); } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java index 31a8d78ff..ccfcebf43 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java @@ -18,20 +18,20 @@ import java.util.List; /** * Interface that defines the methods to work with the validation of attributes. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com */ public interface ICheckAttributeValue { - - /** - * Checks if the list of values contains the expected value. - * - * @param values The List of values. - * @param expectedValue The value to check if it exists on the list. - * - * @return boolean true, if the value is present in the list. False, - * otherwise. - */ - boolean checkValue(List values, String expectedValue); - + + /** + * Checks if the list of values contains the expected value. + * + * @param values + * The List of values. + * @param expectedValue + * The value to check if it exists on the list. + * + * @return boolean true, if the value is present in the list. False, otherwise. + */ + boolean checkValue(List values, String expectedValue); + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java index 78eb53004..a661e731b 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java @@ -19,22 +19,21 @@ import eu.stork.peps.auth.commons.PersonalAttribute; /** * Interface that defines the methods to work with derivation of attributes. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com */ public interface IDeriveAttribute { - - /** - * Derives the attribute value. Set the Personal Attribute value to null if - * the value in session or the value of age are invalid (non-numeric or null). - * - * @param personalAttrList The Personal Attribute List. - * @param session The session object. - * - * @see PersonalAttribute The personal Attribute - * @see IStorkSession The session object. - */ - void deriveAttributeToData(PersonalAttribute personalAttrList, - IStorkSession session); - + + /** + * Derives the attribute value. Set the Personal Attribute value to null if the value in session or the value of age are invalid (non-numeric or null). + * + * @param personalAttrList + * The Personal Attribute List. + * @param session + * The session object. + * + * @see PersonalAttribute The personal Attribute + * @see IStorkSession The session object. + */ + void deriveAttributeToData(PersonalAttribute personalAttrList, IStorkSession session); + } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java index ca2114e32..eaae06481 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java @@ -19,17 +19,17 @@ import eu.stork.peps.auth.commons.PersonalAttribute; * Interface for attribute's value normalisation. * * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com */ public interface INormaliseValue { - - /** - * Translates the attribute's value from local format to STORK format. - * - * @param personalAttribute The Personal Attribute to normalise the value. - * - * @see PersonalAttribute - */ - void normaliseAttributeValueToStork(PersonalAttribute personalAttribute); + + /** + * Translates the attribute's value from local format to STORK format. + * + * @param personalAttribute + * The Personal Attribute to normalise the value. + * + * @see PersonalAttribute + */ + void normaliseAttributeValueToStork(PersonalAttribute personalAttribute); } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java index 8a33897d8..4769bba19 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java @@ -20,81 +20,82 @@ import eu.stork.peps.auth.commons.STORKAuthnRequest; /** * Interface for attributes normalization. * - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, - * luis.felix@multicert.com, hugo.magalhaes@multicert.com + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com */ public interface ITranslatorService { - - /** - * Translates the attributes from local format to STORK format. - * - * @param personalList The Personal Attribute List. - * - * @return The Personal Attribute List with normalised attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeNamesToStork( - IPersonalAttributeList personalList); - - /** - * Translates the attributes values from local format to STORK format. - * - * @param personalList The Personal Attribute List. - * - * @return The PersonalAttributeList with normalised values. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeValuesToStork( - IPersonalAttributeList personalList); - - /** - * Translates the attributes from STORK format to local format. - * - * @param personalList The Personal Attribute List. - * - * @return The PersonalAttributeList with normalised attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList normaliseAttributeNamesFromStork( - IPersonalAttributeList personalList); - - /** - * Derive Attribute Names To Stork format. - * - * @param personalList The Personal Attribute List, - * - * @return The PersonalAttributeList with derived attributes. - * - * @see IPersonalAttributeList - */ - IPersonalAttributeList deriveAttributeFromStork( - IPersonalAttributeList personalList); - - /** - * Derive Attribute Names from Stork format. - * - * @param session The session object. - * @param modifiedList The Personal Attribute List. - * - * @return The PersonalAttributeList with derived attributes. - * - * @see IStorkSession - * @see IPersonalAttributeList - */ - IPersonalAttributeList deriveAttributeToStork(IStorkSession session, - IPersonalAttributeList modifiedList); - - /** - * Validate the values of the attributes. - * - * @param pal The attribute list - * - * @return True, if all the attributes have values. False, otherwise. - * - * @see STORKAuthnRequest - */ - boolean checkAttributeValues(IPersonalAttributeList pa); + + /** + * Translates the attributes from local format to STORK format. + * + * @param personalList + * The Personal Attribute List. + * + * @return The Personal Attribute List with normalised attributes. + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList normaliseAttributeNamesToStork(IPersonalAttributeList personalList); + + /** + * Translates the attributes values from local format to STORK format. + * + * @param personalList + * The Personal Attribute List. + * + * @return The PersonalAttributeList with normalised values. + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList normaliseAttributeValuesToStork(IPersonalAttributeList personalList); + + /** + * Translates the attributes from STORK format to local format. + * + * @param personalList + * The Personal Attribute List. + * + * @return The PersonalAttributeList with normalised attributes. + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList normaliseAttributeNamesFromStork(IPersonalAttributeList personalList); + + /** + * Derive Attribute Names To Stork format. + * + * @param personalList + * The Personal Attribute List, + * + * @return The PersonalAttributeList with derived attributes. + * + * @see IPersonalAttributeList + */ + IPersonalAttributeList deriveAttributeFromStork(IPersonalAttributeList personalList); + + /** + * Derive Attribute Names from Stork format. + * + * @param session + * The session object. + * @param modifiedList + * The Personal Attribute List. + * + * @return The PersonalAttributeList with derived attributes. + * + * @see IStorkSession + * @see IPersonalAttributeList + */ + IPersonalAttributeList deriveAttributeToStork(IStorkSession session, IPersonalAttributeList modifiedList); + + /** + * Validate the values of the attributes. + * + * @param pal + * The attribute list + * + * @return True, if all the attributes have values. False, otherwise. + * + * @see STORKAuthnRequest + */ + boolean checkAttributeValues(IPersonalAttributeList pa); } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java index 21a15820b..87268f991 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Additional information * - *

    Java class for AdditionalInformationType complex type. + *

    + * Java class for AdditionalInformationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AdditionalInformationType">
    @@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AdditionalInformationType", propOrder = {
    -    "specificInformation",
    -    "otherSources"
    -})
    +@XmlType(name = "AdditionalInformationType", propOrder = { "specificInformation", "otherSources" })
     public class AdditionalInformationType {
     
    -    @XmlElement(name = "SpecificInformation")
    -    protected RichTextTagType specificInformation;
    -    @XmlElement(name = "OtherSources")
    -    protected RichTextTagType otherSources;
    +	@XmlElement(name = "SpecificInformation")
    +	protected RichTextTagType specificInformation;
    +	@XmlElement(name = "OtherSources")
    +	protected RichTextTagType otherSources;
     
    -    /**
    -     * Gets the value of the specificInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getSpecificInformation() {
    -        return specificInformation;
    -    }
    +	/**
    +	 * Gets the value of the specificInformation property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getSpecificInformation() {
    +		return specificInformation;
    +	}
     
    -    /**
    -     * Sets the value of the specificInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setSpecificInformation(RichTextTagType value) {
    -        this.specificInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the specificInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setSpecificInformation(RichTextTagType value) {
    +		this.specificInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the otherSources property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getOtherSources() {
    -        return otherSources;
    -    }
    +	/**
    +	 * Gets the value of the otherSources property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getOtherSources() {
    +		return otherSources;
    +	}
     
    -    /**
    -     * Sets the value of the otherSources property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setOtherSources(RichTextTagType value) {
    -        this.otherSources = value;
    -    }
    +	/**
    +	 * Sets the value of the otherSources property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setOtherSources(RichTextTagType value) {
    +		this.otherSources = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java
    index 044801564..044fd0a04 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -17,13 +16,14 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
      * Address
      * 
    - * 

    Java class for AddressType complex type. + *

    + * Java class for AddressType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AddressType">
    @@ -52,230 +52,203 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AddressType", propOrder = {
    -    "line",
    -    "city",
    -    "stateOrRegion",
    -    "postalCode",
    -    "country"
    -})
    +@XmlType(name = "AddressType", propOrder = { "line", "city", "stateOrRegion", "postalCode", "country" })
     public class AddressType {
     
    -    @XmlElement(name = "Line", required = true)
    -    protected List line;
    -    @XmlElement(name = "City", required = true)
    -    protected String city;
    -    @XmlElement(name = "StateOrRegion", required = true)
    -    protected String stateOrRegion;
    -    @XmlElement(name = "PostalCode", required = true)
    -    protected String postalCode;
    -    @XmlElement(name = "Country", required = true)
    -    protected AddressType.Country country;
    -
    -    /**
    -     * Gets the value of the line property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the line property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getLine().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getLine() { - if (line == null) { - line = new ArrayList(); - } - return this.line; - } - - /** - * Gets the value of the city property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCity() { - return city; - } - - /** - * Sets the value of the city property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCity(String value) { - this.city = value; - } - - /** - * Gets the value of the stateOrRegion property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStateOrRegion() { - return stateOrRegion; - } - - /** - * Sets the value of the stateOrRegion property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStateOrRegion(String value) { - this.stateOrRegion = value; - } - - /** - * Gets the value of the postalCode property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPostalCode() { - return postalCode; - } - - /** - * Sets the value of the postalCode property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPostalCode(String value) { - this.postalCode = value; - } - - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link AddressType.Country } - * - */ - public AddressType.Country getCountry() { - return country; - } - - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link AddressType.Country } - * - */ - public void setCountry(AddressType.Country value) { - this.country = value; - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Country { - - @XmlValue - protected String value; - @XmlAttribute(name = "country", required = true) - protected CountryType country; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link CountryType } - * - */ - public CountryType getCountry() { - return country; - } - - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link CountryType } - * - */ - public void setCountry(CountryType value) { - this.country = value; - } - - } + @XmlElement(name = "Line", required = true) + protected List line; + @XmlElement(name = "City", required = true) + protected String city; + @XmlElement(name = "StateOrRegion", required = true) + protected String stateOrRegion; + @XmlElement(name = "PostalCode", required = true) + protected String postalCode; + @XmlElement(name = "Country", required = true) + protected AddressType.Country country; + + /** + * Gets the value of the line property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the line property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getLine().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getLine() { + if (line == null) { + line = new ArrayList(); + } + return this.line; + } + + /** + * Gets the value of the city property. + * + * @return possible object is {@link String } + * + */ + public String getCity() { + return city; + } + + /** + * Sets the value of the city property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setCity(String value) { + this.city = value; + } + + /** + * Gets the value of the stateOrRegion property. + * + * @return possible object is {@link String } + * + */ + public String getStateOrRegion() { + return stateOrRegion; + } + + /** + * Sets the value of the stateOrRegion property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setStateOrRegion(String value) { + this.stateOrRegion = value; + } + + /** + * Gets the value of the postalCode property. + * + * @return possible object is {@link String } + * + */ + public String getPostalCode() { + return postalCode; + } + + /** + * Sets the value of the postalCode property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setPostalCode(String value) { + this.postalCode = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link AddressType.Country } + * + */ + public AddressType.Country getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link AddressType.Country } + * + */ + public void setCountry(AddressType.Country value) { + this.country = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Country { + + @XmlValue + protected String value; + @XmlAttribute(name = "country", required = true) + protected CountryType country; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link CountryType } + * + */ + public CountryType getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link CountryType } + * + */ + public void setCountry(CountryType value) { + this.country = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java index d30d97334..17212282b 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Data file * - *

    Java class for AttachedFileDataType complex type. + *

    + * Java class for AttachedFileDataType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedFileDataType">
    @@ -38,88 +38,75 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedFileDataType", propOrder = {
    -    "description",
    -    "mime",
    -    "data"
    -})
    +@XmlType(name = "AttachedFileDataType", propOrder = { "description", "mime", "data" })
     public class AttachedFileDataType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected MimeType mime;
    -    @XmlElement(name = "Data", required = true)
    -    protected byte[] data;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected MimeType mime;
    +	@XmlElement(name = "Data", required = true)
    +	protected byte[] data;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public MimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link MimeType }
    +	 * 
    +	 */
    +	public MimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public void setMime(MimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MimeType }
    +	 * 
    +	 */
    +	public void setMime(MimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the data property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getData() {
    -        return data;
    -    }
    +	/**
    +	 * Gets the value of the data property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getData() {
    +		return data;
    +	}
     
    -    /**
    -     * Sets the value of the data property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setData(byte[] value) {
    -        this.data = value;
    -    }
    +	/**
    +	 * Sets the value of the data property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setData(byte[] value) {
    +		this.data = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java
    index 3e49c0053..5cae1a677 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * URL reference to the file
      * 
    - * 

    Java class for AttachedFileURLType complex type. + *

    + * Java class for AttachedFileURLType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedFileURLType">
    @@ -38,90 +38,77 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedFileURLType", propOrder = {
    -    "description",
    -    "mime",
    -    "url"
    -})
    +@XmlType(name = "AttachedFileURLType", propOrder = { "description", "mime", "url" })
     public class AttachedFileURLType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected MimeType mime;
    -    @XmlElement(name = "URL", required = true)
    -    protected String url;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected MimeType mime;
    +	@XmlElement(name = "URL", required = true)
    +	protected String url;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public MimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link MimeType }
    +	 * 
    +	 */
    +	public MimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public void setMime(MimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MimeType }
    +	 * 
    +	 */
    +	public void setMime(MimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the url property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getURL() {
    -        return url;
    -    }
    +	/**
    +	 * Gets the value of the url property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getURL() {
    +		return url;
    +	}
     
    -    /**
    -     * Sets the value of the url property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setURL(String value) {
    -        this.url = value;
    -    }
    +	/**
    +	 * Sets the value of the url property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setURL(String value) {
    +		this.url = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java
    index 4e66627a4..24b2df121 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Image data file
      * 
    - * 

    Java class for AttachedImageDataType complex type. + *

    + * Java class for AttachedImageDataType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedImageDataType">
    @@ -38,88 +38,75 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedImageDataType", propOrder = {
    -    "description",
    -    "mime",
    -    "data"
    -})
    +@XmlType(name = "AttachedImageDataType", propOrder = { "description", "mime", "data" })
     public class AttachedImageDataType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected ImageMimeType mime;
    -    @XmlElement(name = "Data", required = true)
    -    protected byte[] data;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected ImageMimeType mime;
    +	@XmlElement(name = "Data", required = true)
    +	protected byte[] data;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public ImageMimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public ImageMimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public void setMime(ImageMimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public void setMime(ImageMimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the data property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getData() {
    -        return data;
    -    }
    +	/**
    +	 * Gets the value of the data property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getData() {
    +		return data;
    +	}
     
    -    /**
    -     * Sets the value of the data property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setData(byte[] value) {
    -        this.data = value;
    -    }
    +	/**
    +	 * Sets the value of the data property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setData(byte[] value) {
    +		this.data = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java
    index 76dffaa4a..2a13c9332 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * URL reference to the image file
      * 
    - * 

    Java class for AttachedImageURLType complex type. + *

    + * Java class for AttachedImageURLType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedImageURLType">
    @@ -38,90 +38,77 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedImageURLType", propOrder = {
    -    "description",
    -    "mime",
    -    "url"
    -})
    +@XmlType(name = "AttachedImageURLType", propOrder = { "description", "mime", "url" })
     public class AttachedImageURLType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected ImageMimeType mime;
    -    @XmlElement(name = "URL", required = true)
    -    protected String url;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected ImageMimeType mime;
    +	@XmlElement(name = "URL", required = true)
    +	protected String url;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public ImageMimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public ImageMimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public void setMime(ImageMimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public void setMime(ImageMimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the url property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getURL() {
    -        return url;
    -    }
    +	/**
    +	 * Gets the value of the url property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getURL() {
    +		return url;
    +	}
     
    -    /**
    -     * Sets the value of the url property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setURL(String value) {
    -        this.url = value;
    -    }
    +	/**
    +	 * Sets the value of the url property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setURL(String value) {
    +		this.url = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java
    index ba693c9a0..9f9cca5d7 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -18,13 +17,14 @@ import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
     import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
     
    -
     /**
      * Attachment resource
      * 
    - * 

    Java class for AttachedType complex type. + *

    + * Java class for AttachedType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedType">
    @@ -45,146 +45,126 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedType", propOrder = {
    -    "fileData",
    -    "fileURI",
    -    "imageData",
    -    "imageURI"
    -})
    +@XmlType(name = "AttachedType", propOrder = { "fileData", "fileURI", "imageData", "imageURI" })
     public class AttachedType {
     
    -    @XmlElement(name = "FileData")
    -    protected AttachedFileDataType fileData;
    -    @XmlElement(name = "FileURI")
    -    protected AttachedFileURLType fileURI;
    -    @XmlElement(name = "ImageData")
    -    protected AttachedImageDataType imageData;
    -    @XmlElement(name = "ImageURI")
    -    protected AttachedImageURLType imageURI;
    -    @XmlAttribute(name = "attachedID", required = true)
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String attachedID;
    -
    -    /**
    -     * Gets the value of the fileData property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedFileDataType }
    -     *     
    -     */
    -    public AttachedFileDataType getFileData() {
    -        return fileData;
    -    }
    -
    -    /**
    -     * Sets the value of the fileData property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedFileDataType }
    -     *     
    -     */
    -    public void setFileData(AttachedFileDataType value) {
    -        this.fileData = value;
    -    }
    -
    -    /**
    -     * Gets the value of the fileURI property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedFileURLType }
    -     *     
    -     */
    -    public AttachedFileURLType getFileURI() {
    -        return fileURI;
    -    }
    -
    -    /**
    -     * Sets the value of the fileURI property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedFileURLType }
    -     *     
    -     */
    -    public void setFileURI(AttachedFileURLType value) {
    -        this.fileURI = value;
    -    }
    -
    -    /**
    -     * Gets the value of the imageData property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedImageDataType }
    -     *     
    -     */
    -    public AttachedImageDataType getImageData() {
    -        return imageData;
    -    }
    -
    -    /**
    -     * Sets the value of the imageData property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedImageDataType }
    -     *     
    -     */
    -    public void setImageData(AttachedImageDataType value) {
    -        this.imageData = value;
    -    }
    -
    -    /**
    -     * Gets the value of the imageURI property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedImageURLType }
    -     *     
    -     */
    -    public AttachedImageURLType getImageURI() {
    -        return imageURI;
    -    }
    -
    -    /**
    -     * Sets the value of the imageURI property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedImageURLType }
    -     *     
    -     */
    -    public void setImageURI(AttachedImageURLType value) {
    -        this.imageURI = value;
    -    }
    -
    -    /**
    -     * Gets the value of the attachedID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAttachedID() {
    -        return attachedID;
    -    }
    -
    -    /**
    -     * Sets the value of the attachedID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAttachedID(String value) {
    -        this.attachedID = value;
    -    }
    +	@XmlElement(name = "FileData")
    +	protected AttachedFileDataType fileData;
    +	@XmlElement(name = "FileURI")
    +	protected AttachedFileURLType fileURI;
    +	@XmlElement(name = "ImageData")
    +	protected AttachedImageDataType imageData;
    +	@XmlElement(name = "ImageURI")
    +	protected AttachedImageURLType imageURI;
    +	@XmlAttribute(name = "attachedID", required = true)
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String attachedID;
    +
    +	/**
    +	 * Gets the value of the fileData property.
    +	 * 
    +	 * @return possible object is {@link AttachedFileDataType }
    +	 * 
    +	 */
    +	public AttachedFileDataType getFileData() {
    +		return fileData;
    +	}
    +
    +	/**
    +	 * Sets the value of the fileData property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedFileDataType }
    +	 * 
    +	 */
    +	public void setFileData(AttachedFileDataType value) {
    +		this.fileData = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the fileURI property.
    +	 * 
    +	 * @return possible object is {@link AttachedFileURLType }
    +	 * 
    +	 */
    +	public AttachedFileURLType getFileURI() {
    +		return fileURI;
    +	}
    +
    +	/**
    +	 * Sets the value of the fileURI property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedFileURLType }
    +	 * 
    +	 */
    +	public void setFileURI(AttachedFileURLType value) {
    +		this.fileURI = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the imageData property.
    +	 * 
    +	 * @return possible object is {@link AttachedImageDataType }
    +	 * 
    +	 */
    +	public AttachedImageDataType getImageData() {
    +		return imageData;
    +	}
    +
    +	/**
    +	 * Sets the value of the imageData property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedImageDataType }
    +	 * 
    +	 */
    +	public void setImageData(AttachedImageDataType value) {
    +		this.imageData = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the imageURI property.
    +	 * 
    +	 * @return possible object is {@link AttachedImageURLType }
    +	 * 
    +	 */
    +	public AttachedImageURLType getImageURI() {
    +		return imageURI;
    +	}
    +
    +	/**
    +	 * Sets the value of the imageURI property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedImageURLType }
    +	 * 
    +	 */
    +	public void setImageURI(AttachedImageURLType value) {
    +		this.imageURI = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the attachedID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAttachedID() {
    +		return attachedID;
    +	}
    +
    +	/**
    +	 * Sets the value of the attachedID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAttachedID(String value) {
    +		this.attachedID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java
    index a646bd390..751482eba 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Attachments resources
      * 
    - * 

    Java class for AttachmentsType complex type. + *

    + * Java class for AttachmentsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachmentsType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachmentsType", propOrder = {
    -    "attached"
    -})
    +@XmlType(name = "AttachmentsType", propOrder = { "attached" })
     public class AttachmentsType {
     
    -    @XmlElement(name = "Attached", required = true)
    -    protected List attached;
    +	@XmlElement(name = "Attached", required = true)
    +	protected List attached;
     
    -    /**
    -     * Gets the value of the attached property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the attached property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getAttached().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link AttachedType } - * - * - */ - public List getAttached() { - if (attached == null) { - attached = new ArrayList(); - } - return this.attached; - } + /** + * Gets the value of the attached property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the attached property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getAttached().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link AttachedType } + * + * + */ + public List getAttached() { + if (attached == null) { + attached = new ArrayList(); + } + return this.attached; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java index 2d053514b..e2d0d51f7 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; - /** * Certification of the Supplement * - *

    Java class for CertificationOfTheSupplementType complex type. + *

    + * Java class for CertificationOfTheSupplementType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CertificationOfTheSupplementType">
    @@ -39,90 +39,77 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CertificationOfTheSupplementType", propOrder = {
    -    "certificationDate",
    -    "officialsCertifying",
    -    "officialStamp"
    -})
    +@XmlType(name = "CertificationOfTheSupplementType", propOrder = { "certificationDate", "officialsCertifying", "officialStamp" })
     public class CertificationOfTheSupplementType {
     
    -    @XmlElement(name = "CertificationDate", required = true)
    -    protected XMLGregorianCalendar certificationDate;
    -    @XmlElement(name = "OfficialsCertifying", required = true)
    -    protected OfficialsCertifyingType officialsCertifying;
    -    @XmlElement(name = "OfficialStamp")
    -    protected OfficialStampType officialStamp;
    +	@XmlElement(name = "CertificationDate", required = true)
    +	protected XMLGregorianCalendar certificationDate;
    +	@XmlElement(name = "OfficialsCertifying", required = true)
    +	protected OfficialsCertifyingType officialsCertifying;
    +	@XmlElement(name = "OfficialStamp")
    +	protected OfficialStampType officialStamp;
     
    -    /**
    -     * Gets the value of the certificationDate property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getCertificationDate() {
    -        return certificationDate;
    -    }
    +	/**
    +	 * Gets the value of the certificationDate property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getCertificationDate() {
    +		return certificationDate;
    +	}
     
    -    /**
    -     * Sets the value of the certificationDate property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setCertificationDate(XMLGregorianCalendar value) {
    -        this.certificationDate = value;
    -    }
    +	/**
    +	 * Sets the value of the certificationDate property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setCertificationDate(XMLGregorianCalendar value) {
    +		this.certificationDate = value;
    +	}
     
    -    /**
    -     * Gets the value of the officialsCertifying property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link OfficialsCertifyingType }
    -     *     
    -     */
    -    public OfficialsCertifyingType getOfficialsCertifying() {
    -        return officialsCertifying;
    -    }
    +	/**
    +	 * Gets the value of the officialsCertifying property.
    +	 * 
    +	 * @return possible object is {@link OfficialsCertifyingType }
    +	 * 
    +	 */
    +	public OfficialsCertifyingType getOfficialsCertifying() {
    +		return officialsCertifying;
    +	}
     
    -    /**
    -     * Sets the value of the officialsCertifying property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link OfficialsCertifyingType }
    -     *     
    -     */
    -    public void setOfficialsCertifying(OfficialsCertifyingType value) {
    -        this.officialsCertifying = value;
    -    }
    +	/**
    +	 * Sets the value of the officialsCertifying property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link OfficialsCertifyingType }
    +	 * 
    +	 */
    +	public void setOfficialsCertifying(OfficialsCertifyingType value) {
    +		this.officialsCertifying = value;
    +	}
     
    -    /**
    -     * Gets the value of the officialStamp property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link OfficialStampType }
    -     *     
    -     */
    -    public OfficialStampType getOfficialStamp() {
    -        return officialStamp;
    -    }
    +	/**
    +	 * Gets the value of the officialStamp property.
    +	 * 
    +	 * @return possible object is {@link OfficialStampType }
    +	 * 
    +	 */
    +	public OfficialStampType getOfficialStamp() {
    +		return officialStamp;
    +	}
     
    -    /**
    -     * Sets the value of the officialStamp property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link OfficialStampType }
    -     *     
    -     */
    -    public void setOfficialStamp(OfficialStampType value) {
    -        this.officialStamp = value;
    -    }
    +	/**
    +	 * Sets the value of the officialStamp property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link OfficialStampType }
    +	 * 
    +	 */
    +	public void setOfficialStamp(OfficialStampType value) {
    +		this.officialStamp = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
    index 2ad8c81ec..63df83402 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Contact information
      * 
    - * 

    Java class for ContactInformationType complex type. + *

    + * Java class for ContactInformationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ContactInformationType">
    @@ -41,132 +41,118 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ContactInformationType", propOrder = {
    -    "address",
    -    "phoneNumber",
    -    "email",
    -    "webSite"
    -})
    +@XmlType(name = "ContactInformationType", propOrder = { "address", "phoneNumber", "email", "webSite" })
     public class ContactInformationType {
     
    -    @XmlElement(name = "Address", required = true)
    -    protected AddressType address;
    -    @XmlElement(name = "PhoneNumber")
    -    protected List phoneNumber;
    -    @XmlElement(name = "Email")
    -    protected List email;
    -    @XmlElement(name = "WebSite")
    -    protected List webSite;
    +	@XmlElement(name = "Address", required = true)
    +	protected AddressType address;
    +	@XmlElement(name = "PhoneNumber")
    +	protected List phoneNumber;
    +	@XmlElement(name = "Email")
    +	protected List email;
    +	@XmlElement(name = "WebSite")
    +	protected List webSite;
     
    -    /**
    -     * Gets the value of the address property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AddressType }
    -     *     
    -     */
    -    public AddressType getAddress() {
    -        return address;
    -    }
    +	/**
    +	 * Gets the value of the address property.
    +	 * 
    +	 * @return possible object is {@link AddressType }
    +	 * 
    +	 */
    +	public AddressType getAddress() {
    +		return address;
    +	}
     
    -    /**
    -     * Sets the value of the address property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AddressType }
    -     *     
    -     */
    -    public void setAddress(AddressType value) {
    -        this.address = value;
    -    }
    +	/**
    +	 * Sets the value of the address property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AddressType }
    +	 * 
    +	 */
    +	public void setAddress(AddressType value) {
    +		this.address = value;
    +	}
     
    -    /**
    -     * Gets the value of the phoneNumber property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the phoneNumber property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getPhoneNumber().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getPhoneNumber() { - if (phoneNumber == null) { - phoneNumber = new ArrayList(); - } - return this.phoneNumber; - } + /** + * Gets the value of the phoneNumber property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the phoneNumber property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getPhoneNumber().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getPhoneNumber() { + if (phoneNumber == null) { + phoneNumber = new ArrayList(); + } + return this.phoneNumber; + } - /** - * Gets the value of the email property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the email property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getEmail().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getEmail() { - if (email == null) { - email = new ArrayList(); - } - return this.email; - } + /** + * Gets the value of the email property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the email property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getEmail().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getEmail() { + if (email == null) { + email = new ArrayList(); + } + return this.email; + } - /** - * Gets the value of the webSite property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the webSite property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getWebSite().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getWebSite() { - if (webSite == null) { - webSite = new ArrayList(); - } - return this.webSite; - } + /** + * Gets the value of the webSite property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the webSite property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getWebSite().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getWebSite() { + if (webSite == null) { + webSite = new ArrayList(); + } + return this.webSite; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java index 5ace3fcb6..5988f5ef7 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java @@ -5,18 +5,19 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CountryType. + *

    + * Java class for CountryType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="CountryType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -226,1195 +227,1194 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum CountryType {
     
    -
    -    /**
    -     * Andorra
    -     * 
    -     */
    -    AD,
    -
    -    /**
    -     * United Arab Emirates
    -     * 
    -     */
    -    AE,
    -
    -    /**
    -     * Afghanistan
    -     * 
    -     */
    -    AF,
    -
    -    /**
    -     * Antigua and Barbuda
    -     * 
    -     */
    -    AG,
    -
    -    /**
    -     * Albania
    -     * 
    -     */
    -    AL,
    -
    -    /**
    -     * Armenia
    -     * 
    -     */
    -    AM,
    -
    -    /**
    -     * Angola
    -     * 
    -     */
    -    AO,
    -
    -    /**
    -     * Argentina
    -     * 
    -     */
    -    AR,
    -
    -    /**
    -     * Austria
    -     * 
    -     */
    -    AT,
    -
    -    /**
    -     * Australia
    -     * 
    -     */
    -    AU,
    -
    -    /**
    -     * Azerbaijan
    -     * 
    -     */
    -    AZ,
    -
    -    /**
    -     * Bosnia and Herzegovina
    -     * 
    -     */
    -    BA,
    -
    -    /**
    -     * Barbados
    -     * 
    -     */
    -    BB,
    -
    -    /**
    -     * Bangladesh
    -     * 
    -     */
    -    BD,
    -
    -    /**
    -     * Belgium
    -     * 
    -     */
    -    BE,
    -
    -    /**
    -     * Burkina Faso
    -     * 
    -     */
    -    BF,
    -
    -    /**
    -     * Bulgaria
    -     * 
    -     */
    -    BG,
    -
    -    /**
    -     * Bahrain
    -     * 
    -     */
    -    BH,
    -
    -    /**
    -     * Burundi
    -     * 
    -     */
    -    BI,
    -
    -    /**
    -     * Benin
    -     * 
    -     */
    -    BJ,
    -
    -    /**
    -     * Brunei Darussalam
    -     * 
    -     */
    -    BN,
    -
    -    /**
    -     * Bolivia
    -     * 
    -     */
    -    BO,
    -
    -    /**
    -     * Brazil
    -     * 
    -     */
    -    BR,
    -
    -    /**
    -     * Bahamas
    -     * 
    -     */
    -    BS,
    -
    -    /**
    -     * Bhutan
    -     * 
    -     */
    -    BT,
    -
    -    /**
    -     * Botswana
    -     * 
    -     */
    -    BW,
    -
    -    /**
    -     * Belarus
    -     * 
    -     */
    -    BY,
    -
    -    /**
    -     * Belize
    -     * 
    -     */
    -    BZ,
    -
    -    /**
    -     * Canada
    -     * 
    -     */
    -    CA,
    -
    -    /**
    -     * Congo, Democratic Republic of the
    -     * 
    -     */
    -    CD,
    -
    -    /**
    -     * Central African Republic
    -     * 
    -     */
    -    CF,
    -
    -    /**
    -     * Congo, Republic of the
    -     * 
    -     */
    -    CG,
    -
    -    /**
    -     * Switzerland
    -     * 
    -     */
    -    CH,
    -
    -    /**
    -     * Cote d/Ivoire
    -     * 
    -     */
    -    CI,
    -
    -    /**
    -     * Chile
    -     * 
    -     */
    -    CL,
    -
    -    /**
    -     * Cameroon
    -     * 
    -     */
    -    CM,
    -
    -    /**
    -     * China
    -     * 
    -     */
    -    CN,
    -
    -    /**
    -     * Colombia
    -     * 
    -     */
    -    CO,
    -
    -    /**
    -     * Costa Rica
    -     * 
    -     */
    -    CR,
    -
    -    /**
    -     * Cuba
    -     * 
    -     */
    -    CU,
    -
    -    /**
    -     * Cape Verde
    -     * 
    -     */
    -    CV,
    -
    -    /**
    -     * Cyprus
    -     * 
    -     */
    -    CY,
    -
    -    /**
    -     * Czech Republic
    -     * 
    -     */
    -    CZ,
    -
    -    /**
    -     * Germany
    -     * 
    -     */
    -    DE,
    -
    -    /**
    -     * Djibouti
    -     * 
    -     */
    -    DJ,
    -
    -    /**
    -     * Denmark
    -     * 
    -     */
    -    DK,
    -
    -    /**
    -     * Dominica
    -     * 
    -     */
    -    DM,
    -
    -    /**
    -     * Dominican Republic
    -     * 
    -     */
    -    DO,
    -
    -    /**
    -     * Algeria
    -     * 
    -     */
    -    DZ,
    -
    -    /**
    -     * Ecuador
    -     * 
    -     */
    -    EC,
    -
    -    /**
    -     * Estonia
    -     * 
    -     */
    -    EE,
    -
    -    /**
    -     * Egypt
    -     * 
    -     */
    -    EG,
    -
    -    /**
    -     * Eritrea
    -     * 
    -     */
    -    ER,
    -
    -    /**
    -     * Spain
    -     * 
    -     */
    -    ES,
    -
    -    /**
    -     * Ethiopia
    -     * 
    -     */
    -    ET,
    -
    -    /**
    -     * Finland
    -     * 
    -     */
    -    FI,
    -
    -    /**
    -     * Fiji
    -     * 
    -     */
    -    FJ,
    -
    -    /**
    -     * Federated States of Micronesia
    -     * 
    -     */
    -    FM,
    -
    -    /**
    -     * France
    -     * 
    -     */
    -    FR,
    -
    -    /**
    -     * Gabon
    -     * 
    -     */
    -    GA,
    -
    -    /**
    -     * United Kingdom
    -     * 
    -     */
    -    GB,
    -
    -    /**
    -     * Grenada
    -     * 
    -     */
    -    GD,
    -
    -    /**
    -     * Georgia
    -     * 
    -     */
    -    GE,
    -
    -    /**
    -     * Ghana
    -     * 
    -     */
    -    GH,
    -
    -    /**
    -     * Greenland
    -     * 
    -     */
    -    GL,
    -
    -    /**
    -     * Gambia
    -     * 
    -     */
    -    GM,
    -
    -    /**
    -     * Guinea
    -     * 
    -     */
    -    GN,
    -
    -    /**
    -     * Equatorial Guinea
    -     * 
    -     */
    -    GQ,
    -
    -    /**
    -     * Greece
    -     * 
    -     */
    -    GR,
    -
    -    /**
    -     * Guatemala
    -     * 
    -     */
    -    GT,
    -
    -    /**
    -     * Guinea-Bissau
    -     * 
    -     */
    -    GW,
    -
    -    /**
    -     * Guyana
    -     * 
    -     */
    -    GY,
    -
    -    /**
    -     * Honduras
    -     * 
    -     */
    -    HN,
    -
    -    /**
    -     * Croatia
    -     * 
    -     */
    -    HR,
    -
    -    /**
    -     * Haiti
    -     * 
    -     */
    -    HT,
    -
    -    /**
    -     * Hungary
    -     * 
    -     */
    -    HU,
    -
    -    /**
    -     * Indonesia
    -     * 
    -     */
    -    ID,
    -
    -    /**
    -     * Ireland
    -     * 
    -     */
    -    IE,
    -
    -    /**
    -     * Israel
    -     * 
    -     */
    -    IL,
    -
    -    /**
    -     * India
    -     * 
    -     */
    -    IN,
    -
    -    /**
    -     * Iraq
    -     * 
    -     */
    -    IQ,
    -
    -    /**
    -     * Iran
    -     * 
    -     */
    -    IR,
    -
    -    /**
    -     * Iceland
    -     * 
    -     */
    -    IS,
    -
    -    /**
    -     * Italy
    -     * 
    -     */
    -    IT,
    -
    -    /**
    -     * Jamaica
    -     * 
    -     */
    -    JM,
    -
    -    /**
    -     * Jordan
    -     * 
    -     */
    -    JO,
    -
    -    /**
    -     * Japan
    -     * 
    -     */
    -    JP,
    -
    -    /**
    -     * Kenya
    -     * 
    -     */
    -    KE,
    -
    -    /**
    -     * Kyrgyzstan
    -     * 
    -     */
    -    KG,
    -
    -    /**
    -     * Cambodia
    -     * 
    -     */
    -    KH,
    -
    -    /**
    -     * Kiribati
    -     * 
    -     */
    -    KI,
    -
    -    /**
    -     * Comoros
    -     * 
    -     */
    -    KM,
    -
    -    /**
    -     * Saint Kitts and Nevis
    -     * 
    -     */
    -    KN,
    -
    -    /**
    -     * Korea, Democratic People/s Republic
    -     * 
    -     */
    -    KP,
    -
    -    /**
    -     * Korea, Republic of
    -     * 
    -     */
    -    KR,
    -
    -    /**
    -     * Kuwait
    -     * 
    -     */
    -    KW,
    -
    -    /**
    -     * Kazakstan
    -     * 
    -     */
    -    KZ,
    -
    -    /**
    -     * Lao People/s Democratic Republic
    -     * 
    -     */
    -    LA,
    -
    -    /**
    -     * Lebanon
    -     * 
    -     */
    -    LB,
    -
    -    /**
    -     * Saint Lucia
    -     * 
    -     */
    -    LC,
    -
    -    /**
    -     * Liechtenstein
    -     * 
    -     */
    -    LI,
    -
    -    /**
    -     * Sri Lanka
    -     * 
    -     */
    -    LK,
    -
    -    /**
    -     * Liberia
    -     * 
    -     */
    -    LR,
    -
    -    /**
    -     * Lesotho
    -     * 
    -     */
    -    LS,
    -
    -    /**
    -     * Lithuania
    -     * 
    -     */
    -    LT,
    -
    -    /**
    -     * Luxembourg
    -     * 
    -     */
    -    LU,
    -
    -    /**
    -     * Latvia
    -     * 
    -     */
    -    LV,
    -
    -    /**
    -     * Libyan Arab Jamahiriya
    -     * 
    -     */
    -    LY,
    -
    -    /**
    -     * Morocco
    -     * 
    -     */
    -    MA,
    -
    -    /**
    -     * Monaco
    -     * 
    -     */
    -    MC,
    -
    -    /**
    -     * Moldova, Republic of
    -     * 
    -     */
    -    MD,
    -
    -    /**
    -     * Montenegro
    -     * 
    -     */
    -    ME,
    -
    -    /**
    -     * Madagascar
    -     * 
    -     */
    -    MG,
    -
    -    /**
    -     * Marshall Islands
    -     * 
    -     */
    -    MH,
    -
    -    /**
    -     * Macedonia, the former Yugoslav Republic of
    -     * 
    -     */
    -    MK,
    -
    -    /**
    -     * Mali
    -     * 
    -     */
    -    ML,
    -
    -    /**
    -     * Myanmar
    -     * 
    -     */
    -    MM,
    -
    -    /**
    -     * Mongolia
    -     * 
    -     */
    -    MN,
    -
    -    /**
    -     * Mauritania
    -     * 
    -     */
    -    MR,
    -
    -    /**
    -     * Malta
    -     * 
    -     */
    -    MT,
    -
    -    /**
    -     * Mauritius
    -     * 
    -     */
    -    MU,
    -
    -    /**
    -     * Maldives
    -     * 
    -     */
    -    MV,
    -
    -    /**
    -     * Malawi
    -     * 
    -     */
    -    MW,
    -
    -    /**
    -     * Mexico
    -     * 
    -     */
    -    MX,
    -
    -    /**
    -     * Malaysia
    -     * 
    -     */
    -    MY,
    -
    -    /**
    -     * Mozambique
    -     * 
    -     */
    -    MZ,
    -
    -    /**
    -     * Namibia
    -     * 
    -     */
    -    NA,
    -
    -    /**
    -     * Niger
    -     * 
    -     */
    -    NE,
    -
    -    /**
    -     * Nigeria
    -     * 
    -     */
    -    NG,
    -
    -    /**
    -     * Nicaragua
    -     * 
    -     */
    -    NI,
    -
    -    /**
    -     * Netherlands
    -     * 
    -     */
    -    NL,
    -
    -    /**
    -     * Norway
    -     * 
    -     */
    -    NO,
    -
    -    /**
    -     * Nepal
    -     * 
    -     */
    -    NP,
    -
    -    /**
    -     * Nauru
    -     * 
    -     */
    -    NR,
    -
    -    /**
    -     * Niue
    -     * 
    -     */
    -    NU,
    -
    -    /**
    -     * New Zealand
    -     * 
    -     */
    -    NZ,
    -
    -    /**
    -     * Oman
    -     * 
    -     */
    -    OM,
    -
    -    /**
    -     * Panama
    -     * 
    -     */
    -    PA,
    -
    -    /**
    -     * Peru
    -     * 
    -     */
    -    PE,
    -
    -    /**
    -     * Papua New Guinea
    -     * 
    -     */
    -    PG,
    -
    -    /**
    -     * Philippines
    -     * 
    -     */
    -    PH,
    -
    -    /**
    -     * Pakistan
    -     * 
    -     */
    -    PK,
    -
    -    /**
    -     * Poland
    -     * 
    -     */
    -    PL,
    -
    -    /**
    -     * Puerto Rico
    -     * 
    -     */
    -    PR,
    -
    -    /**
    -     * Palestinian Territory, Occupied
    -     * 
    -     */
    -    PS,
    -
    -    /**
    -     * Portugal
    -     * 
    -     */
    -    PT,
    -
    -    /**
    -     * Palau
    -     * 
    -     */
    -    PW,
    -
    -    /**
    -     * Paraguay
    -     * 
    -     */
    -    PY,
    -
    -    /**
    -     * Qatar
    -     * 
    -     */
    -    QA,
    -
    -    /**
    -     * Romania
    -     * 
    -     */
    -    RO,
    -
    -    /**
    -     * Serbia
    -     * 
    -     */
    -    RS,
    -
    -    /**
    -     * Russian Federation
    -     * 
    -     */
    -    RU,
    -
    -    /**
    -     * Rwanda
    -     * 
    -     */
    -    RW,
    -
    -    /**
    -     * Saudi Arabia
    -     * 
    -     */
    -    SA,
    -
    -    /**
    -     * Solomon Islands
    -     * 
    -     */
    -    SB,
    -
    -    /**
    -     * Seychelles
    -     * 
    -     */
    -    SC,
    -
    -    /**
    -     * Sudan
    -     * 
    -     */
    -    SD,
    -
    -    /**
    -     * Sweden
    -     * 
    -     */
    -    SE,
    -
    -    /**
    -     * Singapore
    -     * 
    -     */
    -    SG,
    -
    -    /**
    -     * Slovenia
    -     * 
    -     */
    -    SI,
    -
    -    /**
    -     * Slovakia
    -     * 
    -     */
    -    SK,
    -
    -    /**
    -     * Sierra Leone
    -     * 
    -     */
    -    SL,
    -
    -    /**
    -     * San Marino
    -     * 
    -     */
    -    SM,
    -
    -    /**
    -     * Senegal
    -     * 
    -     */
    -    SN,
    -
    -    /**
    -     * Somalia
    -     * 
    -     */
    -    SO,
    -
    -    /**
    -     * Suriname
    -     * 
    -     */
    -    SR,
    -
    -    /**
    -     * Sao Tome and Principe
    -     * 
    -     */
    -    ST,
    -
    -    /**
    -     * El Salvador
    -     * 
    -     */
    -    SV,
    -
    -    /**
    -     * Syrian Arab Republic
    -     * 
    -     */
    -    SY,
    -
    -    /**
    -     * Swaziland
    -     * 
    -     */
    -    SZ,
    -
    -    /**
    -     * Chad
    -     * 
    -     */
    -    TD,
    -
    -    /**
    -     * Togo
    -     * 
    -     */
    -    TG,
    -
    -    /**
    -     * Thailand
    -     * 
    -     */
    -    TH,
    -
    -    /**
    -     * Tajikistan
    -     * 
    -     */
    -    TJ,
    -
    -    /**
    -     * Timor-Leste
    -     * 
    -     */
    -    TL,
    -
    -    /**
    -     * Turkmenistan
    -     * 
    -     */
    -    TM,
    -
    -    /**
    -     * Tunisia
    -     * 
    -     */
    -    TN,
    -
    -    /**
    -     * Tonga
    -     * 
    -     */
    -    TO,
    -
    -    /**
    -     * Turkey
    -     * 
    -     */
    -    TR,
    -
    -    /**
    -     * Trindidad and Tobago
    -     * 
    -     */
    -    TT,
    -
    -    /**
    -     * Tuvalu
    -     * 
    -     */
    -    TV,
    -
    -    /**
    -     * Tanzania, United republic of
    -     * 
    -     */
    -    TZ,
    -
    -    /**
    -     * Ukraina
    -     * 
    -     */
    -    UA,
    -
    -    /**
    -     * Uganda
    -     * 
    -     */
    -    UG,
    -
    -    /**
    -     * United States
    -     * 
    -     */
    -    US,
    -
    -    /**
    -     * Uruguay
    -     * 
    -     */
    -    UY,
    -
    -    /**
    -     * Uzbekistan
    -     * 
    -     */
    -    UZ,
    -
    -    /**
    -     * Holy See (Vatican City State)
    -     * 
    -     */
    -    VA,
    -
    -    /**
    -     * Saint Vincent and the Granadines
    -     * 
    -     */
    -    VC,
    -
    -    /**
    -     * Venezuela
    -     * 
    -     */
    -    VE,
    -
    -    /**
    -     * Viet Nam
    -     * 
    -     */
    -    VN,
    -
    -    /**
    -     * Vanuatu
    -     * 
    -     */
    -    VU,
    -
    -    /**
    -     * Samoa
    -     * 
    -     */
    -    WS,
    -
    -    /**
    -     * Yemen
    -     * 
    -     */
    -    YE,
    -
    -    /**
    -     * South Africa
    -     * 
    -     */
    -    ZA,
    -
    -    /**
    -     * Zambia
    -     * 
    -     */
    -    ZM,
    -
    -    /**
    -     * Zimbabwe
    -     * 
    -     */
    -    ZW;
    -
    -    public String value() {
    -        return name();
    -    }
    -
    -    public static CountryType fromValue(String v) {
    -        return valueOf(v);
    -    }
    +	/**
    +	 * Andorra
    +	 * 
    +	 */
    +	AD,
    +
    +	/**
    +	 * United Arab Emirates
    +	 * 
    +	 */
    +	AE,
    +
    +	/**
    +	 * Afghanistan
    +	 * 
    +	 */
    +	AF,
    +
    +	/**
    +	 * Antigua and Barbuda
    +	 * 
    +	 */
    +	AG,
    +
    +	/**
    +	 * Albania
    +	 * 
    +	 */
    +	AL,
    +
    +	/**
    +	 * Armenia
    +	 * 
    +	 */
    +	AM,
    +
    +	/**
    +	 * Angola
    +	 * 
    +	 */
    +	AO,
    +
    +	/**
    +	 * Argentina
    +	 * 
    +	 */
    +	AR,
    +
    +	/**
    +	 * Austria
    +	 * 
    +	 */
    +	AT,
    +
    +	/**
    +	 * Australia
    +	 * 
    +	 */
    +	AU,
    +
    +	/**
    +	 * Azerbaijan
    +	 * 
    +	 */
    +	AZ,
    +
    +	/**
    +	 * Bosnia and Herzegovina
    +	 * 
    +	 */
    +	BA,
    +
    +	/**
    +	 * Barbados
    +	 * 
    +	 */
    +	BB,
    +
    +	/**
    +	 * Bangladesh
    +	 * 
    +	 */
    +	BD,
    +
    +	/**
    +	 * Belgium
    +	 * 
    +	 */
    +	BE,
    +
    +	/**
    +	 * Burkina Faso
    +	 * 
    +	 */
    +	BF,
    +
    +	/**
    +	 * Bulgaria
    +	 * 
    +	 */
    +	BG,
    +
    +	/**
    +	 * Bahrain
    +	 * 
    +	 */
    +	BH,
    +
    +	/**
    +	 * Burundi
    +	 * 
    +	 */
    +	BI,
    +
    +	/**
    +	 * Benin
    +	 * 
    +	 */
    +	BJ,
    +
    +	/**
    +	 * Brunei Darussalam
    +	 * 
    +	 */
    +	BN,
    +
    +	/**
    +	 * Bolivia
    +	 * 
    +	 */
    +	BO,
    +
    +	/**
    +	 * Brazil
    +	 * 
    +	 */
    +	BR,
    +
    +	/**
    +	 * Bahamas
    +	 * 
    +	 */
    +	BS,
    +
    +	/**
    +	 * Bhutan
    +	 * 
    +	 */
    +	BT,
    +
    +	/**
    +	 * Botswana
    +	 * 
    +	 */
    +	BW,
    +
    +	/**
    +	 * Belarus
    +	 * 
    +	 */
    +	BY,
    +
    +	/**
    +	 * Belize
    +	 * 
    +	 */
    +	BZ,
    +
    +	/**
    +	 * Canada
    +	 * 
    +	 */
    +	CA,
    +
    +	/**
    +	 * Congo, Democratic Republic of the
    +	 * 
    +	 */
    +	CD,
    +
    +	/**
    +	 * Central African Republic
    +	 * 
    +	 */
    +	CF,
    +
    +	/**
    +	 * Congo, Republic of the
    +	 * 
    +	 */
    +	CG,
    +
    +	/**
    +	 * Switzerland
    +	 * 
    +	 */
    +	CH,
    +
    +	/**
    +	 * Cote d/Ivoire
    +	 * 
    +	 */
    +	CI,
    +
    +	/**
    +	 * Chile
    +	 * 
    +	 */
    +	CL,
    +
    +	/**
    +	 * Cameroon
    +	 * 
    +	 */
    +	CM,
    +
    +	/**
    +	 * China
    +	 * 
    +	 */
    +	CN,
    +
    +	/**
    +	 * Colombia
    +	 * 
    +	 */
    +	CO,
    +
    +	/**
    +	 * Costa Rica
    +	 * 
    +	 */
    +	CR,
    +
    +	/**
    +	 * Cuba
    +	 * 
    +	 */
    +	CU,
    +
    +	/**
    +	 * Cape Verde
    +	 * 
    +	 */
    +	CV,
    +
    +	/**
    +	 * Cyprus
    +	 * 
    +	 */
    +	CY,
    +
    +	/**
    +	 * Czech Republic
    +	 * 
    +	 */
    +	CZ,
    +
    +	/**
    +	 * Germany
    +	 * 
    +	 */
    +	DE,
    +
    +	/**
    +	 * Djibouti
    +	 * 
    +	 */
    +	DJ,
    +
    +	/**
    +	 * Denmark
    +	 * 
    +	 */
    +	DK,
    +
    +	/**
    +	 * Dominica
    +	 * 
    +	 */
    +	DM,
    +
    +	/**
    +	 * Dominican Republic
    +	 * 
    +	 */
    +	DO,
    +
    +	/**
    +	 * Algeria
    +	 * 
    +	 */
    +	DZ,
    +
    +	/**
    +	 * Ecuador
    +	 * 
    +	 */
    +	EC,
    +
    +	/**
    +	 * Estonia
    +	 * 
    +	 */
    +	EE,
    +
    +	/**
    +	 * Egypt
    +	 * 
    +	 */
    +	EG,
    +
    +	/**
    +	 * Eritrea
    +	 * 
    +	 */
    +	ER,
    +
    +	/**
    +	 * Spain
    +	 * 
    +	 */
    +	ES,
    +
    +	/**
    +	 * Ethiopia
    +	 * 
    +	 */
    +	ET,
    +
    +	/**
    +	 * Finland
    +	 * 
    +	 */
    +	FI,
    +
    +	/**
    +	 * Fiji
    +	 * 
    +	 */
    +	FJ,
    +
    +	/**
    +	 * Federated States of Micronesia
    +	 * 
    +	 */
    +	FM,
    +
    +	/**
    +	 * France
    +	 * 
    +	 */
    +	FR,
    +
    +	/**
    +	 * Gabon
    +	 * 
    +	 */
    +	GA,
    +
    +	/**
    +	 * United Kingdom
    +	 * 
    +	 */
    +	GB,
    +
    +	/**
    +	 * Grenada
    +	 * 
    +	 */
    +	GD,
    +
    +	/**
    +	 * Georgia
    +	 * 
    +	 */
    +	GE,
    +
    +	/**
    +	 * Ghana
    +	 * 
    +	 */
    +	GH,
    +
    +	/**
    +	 * Greenland
    +	 * 
    +	 */
    +	GL,
    +
    +	/**
    +	 * Gambia
    +	 * 
    +	 */
    +	GM,
    +
    +	/**
    +	 * Guinea
    +	 * 
    +	 */
    +	GN,
    +
    +	/**
    +	 * Equatorial Guinea
    +	 * 
    +	 */
    +	GQ,
    +
    +	/**
    +	 * Greece
    +	 * 
    +	 */
    +	GR,
    +
    +	/**
    +	 * Guatemala
    +	 * 
    +	 */
    +	GT,
    +
    +	/**
    +	 * Guinea-Bissau
    +	 * 
    +	 */
    +	GW,
    +
    +	/**
    +	 * Guyana
    +	 * 
    +	 */
    +	GY,
    +
    +	/**
    +	 * Honduras
    +	 * 
    +	 */
    +	HN,
    +
    +	/**
    +	 * Croatia
    +	 * 
    +	 */
    +	HR,
    +
    +	/**
    +	 * Haiti
    +	 * 
    +	 */
    +	HT,
    +
    +	/**
    +	 * Hungary
    +	 * 
    +	 */
    +	HU,
    +
    +	/**
    +	 * Indonesia
    +	 * 
    +	 */
    +	ID,
    +
    +	/**
    +	 * Ireland
    +	 * 
    +	 */
    +	IE,
    +
    +	/**
    +	 * Israel
    +	 * 
    +	 */
    +	IL,
    +
    +	/**
    +	 * India
    +	 * 
    +	 */
    +	IN,
    +
    +	/**
    +	 * Iraq
    +	 * 
    +	 */
    +	IQ,
    +
    +	/**
    +	 * Iran
    +	 * 
    +	 */
    +	IR,
    +
    +	/**
    +	 * Iceland
    +	 * 
    +	 */
    +	IS,
    +
    +	/**
    +	 * Italy
    +	 * 
    +	 */
    +	IT,
    +
    +	/**
    +	 * Jamaica
    +	 * 
    +	 */
    +	JM,
    +
    +	/**
    +	 * Jordan
    +	 * 
    +	 */
    +	JO,
    +
    +	/**
    +	 * Japan
    +	 * 
    +	 */
    +	JP,
    +
    +	/**
    +	 * Kenya
    +	 * 
    +	 */
    +	KE,
    +
    +	/**
    +	 * Kyrgyzstan
    +	 * 
    +	 */
    +	KG,
    +
    +	/**
    +	 * Cambodia
    +	 * 
    +	 */
    +	KH,
    +
    +	/**
    +	 * Kiribati
    +	 * 
    +	 */
    +	KI,
    +
    +	/**
    +	 * Comoros
    +	 * 
    +	 */
    +	KM,
    +
    +	/**
    +	 * Saint Kitts and Nevis
    +	 * 
    +	 */
    +	KN,
    +
    +	/**
    +	 * Korea, Democratic People/s Republic
    +	 * 
    +	 */
    +	KP,
    +
    +	/**
    +	 * Korea, Republic of
    +	 * 
    +	 */
    +	KR,
    +
    +	/**
    +	 * Kuwait
    +	 * 
    +	 */
    +	KW,
    +
    +	/**
    +	 * Kazakstan
    +	 * 
    +	 */
    +	KZ,
    +
    +	/**
    +	 * Lao People/s Democratic Republic
    +	 * 
    +	 */
    +	LA,
    +
    +	/**
    +	 * Lebanon
    +	 * 
    +	 */
    +	LB,
    +
    +	/**
    +	 * Saint Lucia
    +	 * 
    +	 */
    +	LC,
    +
    +	/**
    +	 * Liechtenstein
    +	 * 
    +	 */
    +	LI,
    +
    +	/**
    +	 * Sri Lanka
    +	 * 
    +	 */
    +	LK,
    +
    +	/**
    +	 * Liberia
    +	 * 
    +	 */
    +	LR,
    +
    +	/**
    +	 * Lesotho
    +	 * 
    +	 */
    +	LS,
    +
    +	/**
    +	 * Lithuania
    +	 * 
    +	 */
    +	LT,
    +
    +	/**
    +	 * Luxembourg
    +	 * 
    +	 */
    +	LU,
    +
    +	/**
    +	 * Latvia
    +	 * 
    +	 */
    +	LV,
    +
    +	/**
    +	 * Libyan Arab Jamahiriya
    +	 * 
    +	 */
    +	LY,
    +
    +	/**
    +	 * Morocco
    +	 * 
    +	 */
    +	MA,
    +
    +	/**
    +	 * Monaco
    +	 * 
    +	 */
    +	MC,
    +
    +	/**
    +	 * Moldova, Republic of
    +	 * 
    +	 */
    +	MD,
    +
    +	/**
    +	 * Montenegro
    +	 * 
    +	 */
    +	ME,
    +
    +	/**
    +	 * Madagascar
    +	 * 
    +	 */
    +	MG,
    +
    +	/**
    +	 * Marshall Islands
    +	 * 
    +	 */
    +	MH,
    +
    +	/**
    +	 * Macedonia, the former Yugoslav Republic of
    +	 * 
    +	 */
    +	MK,
    +
    +	/**
    +	 * Mali
    +	 * 
    +	 */
    +	ML,
    +
    +	/**
    +	 * Myanmar
    +	 * 
    +	 */
    +	MM,
    +
    +	/**
    +	 * Mongolia
    +	 * 
    +	 */
    +	MN,
    +
    +	/**
    +	 * Mauritania
    +	 * 
    +	 */
    +	MR,
    +
    +	/**
    +	 * Malta
    +	 * 
    +	 */
    +	MT,
    +
    +	/**
    +	 * Mauritius
    +	 * 
    +	 */
    +	MU,
    +
    +	/**
    +	 * Maldives
    +	 * 
    +	 */
    +	MV,
    +
    +	/**
    +	 * Malawi
    +	 * 
    +	 */
    +	MW,
    +
    +	/**
    +	 * Mexico
    +	 * 
    +	 */
    +	MX,
    +
    +	/**
    +	 * Malaysia
    +	 * 
    +	 */
    +	MY,
    +
    +	/**
    +	 * Mozambique
    +	 * 
    +	 */
    +	MZ,
    +
    +	/**
    +	 * Namibia
    +	 * 
    +	 */
    +	NA,
    +
    +	/**
    +	 * Niger
    +	 * 
    +	 */
    +	NE,
    +
    +	/**
    +	 * Nigeria
    +	 * 
    +	 */
    +	NG,
    +
    +	/**
    +	 * Nicaragua
    +	 * 
    +	 */
    +	NI,
    +
    +	/**
    +	 * Netherlands
    +	 * 
    +	 */
    +	NL,
    +
    +	/**
    +	 * Norway
    +	 * 
    +	 */
    +	NO,
    +
    +	/**
    +	 * Nepal
    +	 * 
    +	 */
    +	NP,
    +
    +	/**
    +	 * Nauru
    +	 * 
    +	 */
    +	NR,
    +
    +	/**
    +	 * Niue
    +	 * 
    +	 */
    +	NU,
    +
    +	/**
    +	 * New Zealand
    +	 * 
    +	 */
    +	NZ,
    +
    +	/**
    +	 * Oman
    +	 * 
    +	 */
    +	OM,
    +
    +	/**
    +	 * Panama
    +	 * 
    +	 */
    +	PA,
    +
    +	/**
    +	 * Peru
    +	 * 
    +	 */
    +	PE,
    +
    +	/**
    +	 * Papua New Guinea
    +	 * 
    +	 */
    +	PG,
    +
    +	/**
    +	 * Philippines
    +	 * 
    +	 */
    +	PH,
    +
    +	/**
    +	 * Pakistan
    +	 * 
    +	 */
    +	PK,
    +
    +	/**
    +	 * Poland
    +	 * 
    +	 */
    +	PL,
    +
    +	/**
    +	 * Puerto Rico
    +	 * 
    +	 */
    +	PR,
    +
    +	/**
    +	 * Palestinian Territory, Occupied
    +	 * 
    +	 */
    +	PS,
    +
    +	/**
    +	 * Portugal
    +	 * 
    +	 */
    +	PT,
    +
    +	/**
    +	 * Palau
    +	 * 
    +	 */
    +	PW,
    +
    +	/**
    +	 * Paraguay
    +	 * 
    +	 */
    +	PY,
    +
    +	/**
    +	 * Qatar
    +	 * 
    +	 */
    +	QA,
    +
    +	/**
    +	 * Romania
    +	 * 
    +	 */
    +	RO,
    +
    +	/**
    +	 * Serbia
    +	 * 
    +	 */
    +	RS,
    +
    +	/**
    +	 * Russian Federation
    +	 * 
    +	 */
    +	RU,
    +
    +	/**
    +	 * Rwanda
    +	 * 
    +	 */
    +	RW,
    +
    +	/**
    +	 * Saudi Arabia
    +	 * 
    +	 */
    +	SA,
    +
    +	/**
    +	 * Solomon Islands
    +	 * 
    +	 */
    +	SB,
    +
    +	/**
    +	 * Seychelles
    +	 * 
    +	 */
    +	SC,
    +
    +	/**
    +	 * Sudan
    +	 * 
    +	 */
    +	SD,
    +
    +	/**
    +	 * Sweden
    +	 * 
    +	 */
    +	SE,
    +
    +	/**
    +	 * Singapore
    +	 * 
    +	 */
    +	SG,
    +
    +	/**
    +	 * Slovenia
    +	 * 
    +	 */
    +	SI,
    +
    +	/**
    +	 * Slovakia
    +	 * 
    +	 */
    +	SK,
    +
    +	/**
    +	 * Sierra Leone
    +	 * 
    +	 */
    +	SL,
    +
    +	/**
    +	 * San Marino
    +	 * 
    +	 */
    +	SM,
    +
    +	/**
    +	 * Senegal
    +	 * 
    +	 */
    +	SN,
    +
    +	/**
    +	 * Somalia
    +	 * 
    +	 */
    +	SO,
    +
    +	/**
    +	 * Suriname
    +	 * 
    +	 */
    +	SR,
    +
    +	/**
    +	 * Sao Tome and Principe
    +	 * 
    +	 */
    +	ST,
    +
    +	/**
    +	 * El Salvador
    +	 * 
    +	 */
    +	SV,
    +
    +	/**
    +	 * Syrian Arab Republic
    +	 * 
    +	 */
    +	SY,
    +
    +	/**
    +	 * Swaziland
    +	 * 
    +	 */
    +	SZ,
    +
    +	/**
    +	 * Chad
    +	 * 
    +	 */
    +	TD,
    +
    +	/**
    +	 * Togo
    +	 * 
    +	 */
    +	TG,
    +
    +	/**
    +	 * Thailand
    +	 * 
    +	 */
    +	TH,
    +
    +	/**
    +	 * Tajikistan
    +	 * 
    +	 */
    +	TJ,
    +
    +	/**
    +	 * Timor-Leste
    +	 * 
    +	 */
    +	TL,
    +
    +	/**
    +	 * Turkmenistan
    +	 * 
    +	 */
    +	TM,
    +
    +	/**
    +	 * Tunisia
    +	 * 
    +	 */
    +	TN,
    +
    +	/**
    +	 * Tonga
    +	 * 
    +	 */
    +	TO,
    +
    +	/**
    +	 * Turkey
    +	 * 
    +	 */
    +	TR,
    +
    +	/**
    +	 * Trindidad and Tobago
    +	 * 
    +	 */
    +	TT,
    +
    +	/**
    +	 * Tuvalu
    +	 * 
    +	 */
    +	TV,
    +
    +	/**
    +	 * Tanzania, United republic of
    +	 * 
    +	 */
    +	TZ,
    +
    +	/**
    +	 * Ukraina
    +	 * 
    +	 */
    +	UA,
    +
    +	/**
    +	 * Uganda
    +	 * 
    +	 */
    +	UG,
    +
    +	/**
    +	 * United States
    +	 * 
    +	 */
    +	US,
    +
    +	/**
    +	 * Uruguay
    +	 * 
    +	 */
    +	UY,
    +
    +	/**
    +	 * Uzbekistan
    +	 * 
    +	 */
    +	UZ,
    +
    +	/**
    +	 * Holy See (Vatican City State)
    +	 * 
    +	 */
    +	VA,
    +
    +	/**
    +	 * Saint Vincent and the Granadines
    +	 * 
    +	 */
    +	VC,
    +
    +	/**
    +	 * Venezuela
    +	 * 
    +	 */
    +	VE,
    +
    +	/**
    +	 * Viet Nam
    +	 * 
    +	 */
    +	VN,
    +
    +	/**
    +	 * Vanuatu
    +	 * 
    +	 */
    +	VU,
    +
    +	/**
    +	 * Samoa
    +	 * 
    +	 */
    +	WS,
    +
    +	/**
    +	 * Yemen
    +	 * 
    +	 */
    +	YE,
    +
    +	/**
    +	 * South Africa
    +	 * 
    +	 */
    +	ZA,
    +
    +	/**
    +	 * Zambia
    +	 * 
    +	 */
    +	ZM,
    +
    +	/**
    +	 * Zimbabwe
    +	 * 
    +	 */
    +	ZW;
    +
    +	public String value() {
    +		return name();
    +	}
    +
    +	public static CountryType fromValue(String v) {
    +		return valueOf(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java
    index 35041350c..1438d6f1e 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Course structure diagram
      * 
    - * 

    Java class for CourseStructureDiagramType complex type. + *

    + * Java class for CourseStructureDiagramType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseStructureDiagramType">
    @@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseStructureDiagramType", propOrder = {
    -    "coursesGroups",
    -    "coursesUnits"
    -})
    +@XmlType(name = "CourseStructureDiagramType", propOrder = { "coursesGroups", "coursesUnits" })
     public class CourseStructureDiagramType {
     
    -    @XmlElement(name = "CoursesGroups", required = true)
    -    protected CoursesGroupsType coursesGroups;
    -    @XmlElement(name = "CoursesUnits")
    -    protected CoursesUnitsType coursesUnits;
    +	@XmlElement(name = "CoursesGroups", required = true)
    +	protected CoursesGroupsType coursesGroups;
    +	@XmlElement(name = "CoursesUnits")
    +	protected CoursesUnitsType coursesUnits;
     
    -    /**
    -     * Gets the value of the coursesGroups property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CoursesGroupsType }
    -     *     
    -     */
    -    public CoursesGroupsType getCoursesGroups() {
    -        return coursesGroups;
    -    }
    +	/**
    +	 * Gets the value of the coursesGroups property.
    +	 * 
    +	 * @return possible object is {@link CoursesGroupsType }
    +	 * 
    +	 */
    +	public CoursesGroupsType getCoursesGroups() {
    +		return coursesGroups;
    +	}
     
    -    /**
    -     * Sets the value of the coursesGroups property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CoursesGroupsType }
    -     *     
    -     */
    -    public void setCoursesGroups(CoursesGroupsType value) {
    -        this.coursesGroups = value;
    -    }
    +	/**
    +	 * Sets the value of the coursesGroups property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CoursesGroupsType }
    +	 * 
    +	 */
    +	public void setCoursesGroups(CoursesGroupsType value) {
    +		this.coursesGroups = value;
    +	}
     
    -    /**
    -     * Gets the value of the coursesUnits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CoursesUnitsType }
    -     *     
    -     */
    -    public CoursesUnitsType getCoursesUnits() {
    -        return coursesUnits;
    -    }
    +	/**
    +	 * Gets the value of the coursesUnits property.
    +	 * 
    +	 * @return possible object is {@link CoursesUnitsType }
    +	 * 
    +	 */
    +	public CoursesUnitsType getCoursesUnits() {
    +		return coursesUnits;
    +	}
     
    -    /**
    -     * Sets the value of the coursesUnits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CoursesUnitsType }
    -     *     
    -     */
    -    public void setCoursesUnits(CoursesUnitsType value) {
    -        this.coursesUnits = value;
    -    }
    +	/**
    +	 * Sets the value of the coursesUnits property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CoursesUnitsType }
    +	 * 
    +	 */
    +	public void setCoursesUnits(CoursesUnitsType value) {
    +		this.coursesUnits = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
    index 4542085b6..69e63c4d3 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
      * Language of instruction
      * 
    - * 

    Java class for CourseUnitLanguageOfInstructionType complex type. + *

    + * Java class for CourseUnitLanguageOfInstructionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitLanguageOfInstructionType">
    @@ -35,64 +35,56 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = {
    -    "value"
    -})
    +@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = { "value" })
     public class CourseUnitLanguageOfInstructionType {
     
    -    @XmlValue
    -    protected String value;
    -    @XmlAttribute(name = "language", required = true)
    -    protected LanguageType language;
    +	@XmlValue
    +	protected String value;
    +	@XmlAttribute(name = "language", required = true)
    +	protected LanguageType language;
     
    -    /**
    -     * Plain text constraint
    -     * 
    -     * Non empty text
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getValue() {
    -        return value;
    -    }
    +	/**
    +	 * Plain text constraint
    +	 * 
    +	 * Non empty text
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getValue() {
    +		return value;
    +	}
     
    -    /**
    -     * Sets the value of the value property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setValue(String value) {
    -        this.value = value;
    -    }
    +	/**
    +	 * Sets the value of the value property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setValue(String value) {
    +		this.value = value;
    +	}
     
    -    /**
    -     * Gets the value of the language property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LanguageType }
    -     *     
    -     */
    -    public LanguageType getLanguage() {
    -        return language;
    -    }
    +	/**
    +	 * Gets the value of the language property.
    +	 * 
    +	 * @return possible object is {@link LanguageType }
    +	 * 
    +	 */
    +	public LanguageType getLanguage() {
    +		return language;
    +	}
     
    -    /**
    -     * Sets the value of the language property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LanguageType }
    -     *     
    -     */
    -    public void setLanguage(LanguageType value) {
    -        this.language = value;
    -    }
    +	/**
    +	 * Sets the value of the language property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link LanguageType }
    +	 * 
    +	 */
    +	public void setLanguage(LanguageType value) {
    +		this.language = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
    index bfc905a75..94db5baa0 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Language of instruction
      * 
    - * 

    Java class for CourseUnitLanguagesOfInstructionType complex type. + *

    + * Java class for CourseUnitLanguagesOfInstructionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitLanguagesOfInstructionType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = {
    -    "language"
    -})
    +@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = { "language" })
     public class CourseUnitLanguagesOfInstructionType {
     
    -    @XmlElement(name = "Language", required = true)
    -    protected List language;
    +	@XmlElement(name = "Language", required = true)
    +	protected List language;
     
    -    /**
    -     * Gets the value of the language property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the language property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getLanguage().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CourseUnitLanguageOfInstructionType } - * - * - */ - public List getLanguage() { - if (language == null) { - language = new ArrayList(); - } - return this.language; - } + /** + * Gets the value of the language property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the language property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getLanguage().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CourseUnitLanguageOfInstructionType } + * + * + */ + public List getLanguage() { + if (language == null) { + language = new ArrayList(); + } + return this.language; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java index 344d49990..1a5562a63 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Student performance * - *

    Java class for CourseUnitStudentPerformanceType complex type. + *

    + * Java class for CourseUnitStudentPerformanceType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitStudentPerformanceType">
    @@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = {
    -    "localGrade",
    -    "ectsGrade"
    -})
    +@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = { "localGrade", "ectsGrade" })
     public class CourseUnitStudentPerformanceType {
     
    -    @XmlElement(name = "LocalGrade", required = true)
    -    protected LocalGradeType localGrade;
    -    @XmlElement(name = "ECTSGrade")
    -    protected ECTSGradingScaleType ectsGrade;
    +	@XmlElement(name = "LocalGrade", required = true)
    +	protected LocalGradeType localGrade;
    +	@XmlElement(name = "ECTSGrade")
    +	protected ECTSGradingScaleType ectsGrade;
     
    -    /**
    -     * Gets the value of the localGrade property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LocalGradeType }
    -     *     
    -     */
    -    public LocalGradeType getLocalGrade() {
    -        return localGrade;
    -    }
    +	/**
    +	 * Gets the value of the localGrade property.
    +	 * 
    +	 * @return possible object is {@link LocalGradeType }
    +	 * 
    +	 */
    +	public LocalGradeType getLocalGrade() {
    +		return localGrade;
    +	}
     
    -    /**
    -     * Sets the value of the localGrade property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LocalGradeType }
    -     *     
    -     */
    -    public void setLocalGrade(LocalGradeType value) {
    -        this.localGrade = value;
    -    }
    +	/**
    +	 * Sets the value of the localGrade property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link LocalGradeType }
    +	 * 
    +	 */
    +	public void setLocalGrade(LocalGradeType value) {
    +		this.localGrade = value;
    +	}
     
    -    /**
    -     * Gets the value of the ectsGrade property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ECTSGradingScaleType }
    -     *     
    -     */
    -    public ECTSGradingScaleType getECTSGrade() {
    -        return ectsGrade;
    -    }
    +	/**
    +	 * Gets the value of the ectsGrade property.
    +	 * 
    +	 * @return possible object is {@link ECTSGradingScaleType }
    +	 * 
    +	 */
    +	public ECTSGradingScaleType getECTSGrade() {
    +		return ectsGrade;
    +	}
     
    -    /**
    -     * Sets the value of the ectsGrade property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ECTSGradingScaleType }
    -     *     
    -     */
    -    public void setECTSGrade(ECTSGradingScaleType value) {
    -        this.ectsGrade = value;
    -    }
    +	/**
    +	 * Sets the value of the ectsGrade property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link ECTSGradingScaleType }
    +	 * 
    +	 */
    +	public void setECTSGrade(ECTSGradingScaleType value) {
    +		this.ectsGrade = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java
    index fe0d62b0b..8c0d96fe2 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.math.BigDecimal;
    @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
      * Course unit
      * 
    - * 

    Java class for CourseUnitType complex type. + *

    + * Java class for CourseUnitType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitType">
    @@ -96,1036 +96,908 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitType", propOrder = {
    -    "code",
    -    "scientificArea",
    -    "title",
    -    "theme",
    -    "type",
    -    "yearOfStudy",
    -    "level",
    -    "ectsCredits",
    -    "localCredits",
    -    "hours",
    -    "languagesOfInstruction",
    -    "modeOfDelivery",
    -    "workPlacements",
    -    "studentPerformance",
    -    "nameOfLecturers",
    -    "learningOutcomes",
    -    "prerequisitesAndCorequisites",
    -    "recomendedOptionalProgrammeComponents",
    -    "courseContents",
    -    "recomendedOrRequiredReading",
    -    "planedLearningActivitiesAndTeachingMethod",
    -    "assesmentMethodsAndCriteria",
    -    "observations"
    -})
    +@XmlType(name = "CourseUnitType", propOrder = { "code", "scientificArea", "title", "theme", "type", "yearOfStudy", "level", "ectsCredits", "localCredits", "hours", "languagesOfInstruction",
    +		"modeOfDelivery", "workPlacements", "studentPerformance", "nameOfLecturers", "learningOutcomes", "prerequisitesAndCorequisites", "recomendedOptionalProgrammeComponents", "courseContents",
    +		"recomendedOrRequiredReading", "planedLearningActivitiesAndTeachingMethod", "assesmentMethodsAndCriteria", "observations" })
     public class CourseUnitType {
     
    -    @XmlElement(name = "Code", required = true)
    -    protected String code;
    -    @XmlElement(name = "ScientificArea")
    -    protected String scientificArea;
    -    @XmlElement(name = "Title", required = true)
    -    protected String title;
    -    @XmlElement(name = "Theme")
    -    protected String theme;
    -    @XmlElement(name = "Type", required = true)
    -    protected CourseUnitType.Type type;
    -    @XmlElement(name = "YearOfStudy")
    -    protected CourseUnitType.YearOfStudy yearOfStudy;
    -    @XmlElement(name = "Level")
    -    protected CourseUnitType.Level level;
    -    @XmlElement(name = "ECTSCredits")
    -    protected BigDecimal ectsCredits;
    -    @XmlElement(name = "LocalCredits")
    -    protected BigDecimal localCredits;
    -    @XmlElement(name = "Hours")
    -    protected BigDecimal hours;
    -    @XmlElement(name = "LanguagesOfInstruction")
    -    protected CourseUnitLanguagesOfInstructionType languagesOfInstruction;
    -    @XmlElement(name = "ModeOfDelivery")
    -    protected CourseUnitType.ModeOfDelivery modeOfDelivery;
    -    @XmlElement(name = "WorkPlacements")
    -    protected CourseUnitWorkPlacementsType workPlacements;
    -    @XmlElement(name = "StudentPerformance")
    -    protected CourseUnitStudentPerformanceType studentPerformance;
    -    @XmlElement(name = "NameOfLecturers")
    -    protected RichTextTagType nameOfLecturers;
    -    @XmlElement(name = "LearningOutcomes")
    -    protected RichTextTagType learningOutcomes;
    -    @XmlElement(name = "PrerequisitesAndCorequisites")
    -    protected RichTextTagType prerequisitesAndCorequisites;
    -    @XmlElement(name = "RecomendedOptionalProgrammeComponents")
    -    protected RichTextTagType recomendedOptionalProgrammeComponents;
    -    @XmlElement(name = "CourseContents")
    -    protected RichTextTagType courseContents;
    -    @XmlElement(name = "RecomendedOrRequiredReading")
    -    protected RichTextTagType recomendedOrRequiredReading;
    -    @XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod")
    -    protected RichTextTagType planedLearningActivitiesAndTeachingMethod;
    -    @XmlElement(name = "AssesmentMethodsAndCriteria")
    -    protected RichTextTagType assesmentMethodsAndCriteria;
    -    @XmlElement(name = "Observations")
    -    protected RichTextTagType observations;
    -    @XmlAttribute(name = "groupID", required = true)
    -    protected String groupID;
    -    @XmlAttribute(name = "institutionAdministeringStudiesID", required = true)
    -    protected String institutionAdministeringStudiesID;
    -    @XmlAttribute(name = "isRequiredByTheProgramme")
    -    protected Boolean isRequiredByTheProgramme;
    -
    -    /**
    -     * Gets the value of the code property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCode() {
    -        return code;
    -    }
    -
    -    /**
    -     * Sets the value of the code property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCode(String value) {
    -        this.code = value;
    -    }
    -
    -    /**
    -     * Gets the value of the scientificArea property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getScientificArea() {
    -        return scientificArea;
    -    }
    -
    -    /**
    -     * Sets the value of the scientificArea property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setScientificArea(String value) {
    -        this.scientificArea = value;
    -    }
    -
    -    /**
    -     * Gets the value of the title property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTitle() {
    -        return title;
    -    }
    -
    -    /**
    -     * Sets the value of the title property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTitle(String value) {
    -        this.title = value;
    -    }
    -
    -    /**
    -     * Gets the value of the theme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTheme() {
    -        return theme;
    -    }
    -
    -    /**
    -     * Sets the value of the theme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTheme(String value) {
    -        this.theme = value;
    -    }
    -
    -    /**
    -     * Gets the value of the type property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.Type }
    -     *     
    -     */
    -    public CourseUnitType.Type getType() {
    -        return type;
    -    }
    -
    -    /**
    -     * Sets the value of the type property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.Type }
    -     *     
    -     */
    -    public void setType(CourseUnitType.Type value) {
    -        this.type = value;
    -    }
    -
    -    /**
    -     * Gets the value of the yearOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.YearOfStudy }
    -     *     
    -     */
    -    public CourseUnitType.YearOfStudy getYearOfStudy() {
    -        return yearOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the yearOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.YearOfStudy }
    -     *     
    -     */
    -    public void setYearOfStudy(CourseUnitType.YearOfStudy value) {
    -        this.yearOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the level property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.Level }
    -     *     
    -     */
    -    public CourseUnitType.Level getLevel() {
    -        return level;
    -    }
    -
    -    /**
    -     * Sets the value of the level property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.Level }
    -     *     
    -     */
    -    public void setLevel(CourseUnitType.Level value) {
    -        this.level = value;
    -    }
    -
    -    /**
    -     * Gets the value of the ectsCredits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getECTSCredits() {
    -        return ectsCredits;
    -    }
    -
    -    /**
    -     * Sets the value of the ectsCredits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setECTSCredits(BigDecimal value) {
    -        this.ectsCredits = value;
    -    }
    -
    -    /**
    -     * Gets the value of the localCredits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getLocalCredits() {
    -        return localCredits;
    -    }
    -
    -    /**
    -     * Sets the value of the localCredits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setLocalCredits(BigDecimal value) {
    -        this.localCredits = value;
    -    }
    -
    -    /**
    -     * Gets the value of the hours property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getHours() {
    -        return hours;
    -    }
    -
    -    /**
    -     * Sets the value of the hours property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setHours(BigDecimal value) {
    -        this.hours = value;
    -    }
    -
    -    /**
    -     * Gets the value of the languagesOfInstruction property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitLanguagesOfInstructionType }
    -     *     
    -     */
    -    public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() {
    -        return languagesOfInstruction;
    -    }
    -
    -    /**
    -     * Sets the value of the languagesOfInstruction property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitLanguagesOfInstructionType }
    -     *     
    -     */
    -    public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) {
    -        this.languagesOfInstruction = value;
    -    }
    -
    -    /**
    -     * Gets the value of the modeOfDelivery property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.ModeOfDelivery }
    -     *     
    -     */
    -    public CourseUnitType.ModeOfDelivery getModeOfDelivery() {
    -        return modeOfDelivery;
    -    }
    -
    -    /**
    -     * Sets the value of the modeOfDelivery property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.ModeOfDelivery }
    -     *     
    -     */
    -    public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) {
    -        this.modeOfDelivery = value;
    -    }
    -
    -    /**
    -     * Gets the value of the workPlacements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitWorkPlacementsType }
    -     *     
    -     */
    -    public CourseUnitWorkPlacementsType getWorkPlacements() {
    -        return workPlacements;
    -    }
    -
    -    /**
    -     * Sets the value of the workPlacements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitWorkPlacementsType }
    -     *     
    -     */
    -    public void setWorkPlacements(CourseUnitWorkPlacementsType value) {
    -        this.workPlacements = value;
    -    }
    -
    -    /**
    -     * Gets the value of the studentPerformance property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitStudentPerformanceType }
    -     *     
    -     */
    -    public CourseUnitStudentPerformanceType getStudentPerformance() {
    -        return studentPerformance;
    -    }
    -
    -    /**
    -     * Sets the value of the studentPerformance property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitStudentPerformanceType }
    -     *     
    -     */
    -    public void setStudentPerformance(CourseUnitStudentPerformanceType value) {
    -        this.studentPerformance = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nameOfLecturers property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getNameOfLecturers() {
    -        return nameOfLecturers;
    -    }
    -
    -    /**
    -     * Sets the value of the nameOfLecturers property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setNameOfLecturers(RichTextTagType value) {
    -        this.nameOfLecturers = value;
    -    }
    -
    -    /**
    -     * Gets the value of the learningOutcomes property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getLearningOutcomes() {
    -        return learningOutcomes;
    -    }
    -
    -    /**
    -     * Sets the value of the learningOutcomes property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setLearningOutcomes(RichTextTagType value) {
    -        this.learningOutcomes = value;
    -    }
    -
    -    /**
    -     * Gets the value of the prerequisitesAndCorequisites property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getPrerequisitesAndCorequisites() {
    -        return prerequisitesAndCorequisites;
    -    }
    -
    -    /**
    -     * Sets the value of the prerequisitesAndCorequisites property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setPrerequisitesAndCorequisites(RichTextTagType value) {
    -        this.prerequisitesAndCorequisites = value;
    -    }
    -
    -    /**
    -     * Gets the value of the recomendedOptionalProgrammeComponents property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getRecomendedOptionalProgrammeComponents() {
    -        return recomendedOptionalProgrammeComponents;
    -    }
    -
    -    /**
    -     * Sets the value of the recomendedOptionalProgrammeComponents property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) {
    -        this.recomendedOptionalProgrammeComponents = value;
    -    }
    -
    -    /**
    -     * Gets the value of the courseContents property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getCourseContents() {
    -        return courseContents;
    -    }
    -
    -    /**
    -     * Sets the value of the courseContents property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setCourseContents(RichTextTagType value) {
    -        this.courseContents = value;
    -    }
    -
    -    /**
    -     * Gets the value of the recomendedOrRequiredReading property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getRecomendedOrRequiredReading() {
    -        return recomendedOrRequiredReading;
    -    }
    -
    -    /**
    -     * Sets the value of the recomendedOrRequiredReading property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setRecomendedOrRequiredReading(RichTextTagType value) {
    -        this.recomendedOrRequiredReading = value;
    -    }
    -
    -    /**
    -     * Gets the value of the planedLearningActivitiesAndTeachingMethod property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() {
    -        return planedLearningActivitiesAndTeachingMethod;
    -    }
    -
    -    /**
    -     * Sets the value of the planedLearningActivitiesAndTeachingMethod property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) {
    -        this.planedLearningActivitiesAndTeachingMethod = value;
    -    }
    -
    -    /**
    -     * Gets the value of the assesmentMethodsAndCriteria property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAssesmentMethodsAndCriteria() {
    -        return assesmentMethodsAndCriteria;
    -    }
    -
    -    /**
    -     * Sets the value of the assesmentMethodsAndCriteria property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAssesmentMethodsAndCriteria(RichTextTagType value) {
    -        this.assesmentMethodsAndCriteria = value;
    -    }
    -
    -    /**
    -     * Gets the value of the observations property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getObservations() {
    -        return observations;
    -    }
    -
    -    /**
    -     * Sets the value of the observations property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setObservations(RichTextTagType value) {
    -        this.observations = value;
    -    }
    -
    -    /**
    -     * Gets the value of the groupID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getGroupID() {
    -        return groupID;
    -    }
    -
    -    /**
    -     * Sets the value of the groupID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setGroupID(String value) {
    -        this.groupID = value;
    -    }
    -
    -    /**
    -     * Gets the value of the institutionAdministeringStudiesID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getInstitutionAdministeringStudiesID() {
    -        return institutionAdministeringStudiesID;
    -    }
    -
    -    /**
    -     * Sets the value of the institutionAdministeringStudiesID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setInstitutionAdministeringStudiesID(String value) {
    -        this.institutionAdministeringStudiesID = value;
    -    }
    -
    -    /**
    -     * Gets the value of the isRequiredByTheProgramme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public boolean isIsRequiredByTheProgramme() {
    -        if (isRequiredByTheProgramme == null) {
    -            return true;
    -        } else {
    -            return isRequiredByTheProgramme;
    -        }
    -    }
    -
    -    /**
    -     * Sets the value of the isRequiredByTheProgramme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public void setIsRequiredByTheProgramme(Boolean value) {
    -        this.isRequiredByTheProgramme = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="eheaFramework" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Level { - - @XmlValue - protected String value; - @XmlAttribute(name = "eheaFramework", required = true) - protected EHEAFrameworkType eheaFramework; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the eheaFramework property. - * - * @return - * possible object is - * {@link EHEAFrameworkType } - * - */ - public EHEAFrameworkType getEheaFramework() { - return eheaFramework; - } - - /** - * Sets the value of the eheaFramework property. - * - * @param value - * allowed object is - * {@link EHEAFrameworkType } - * - */ - public void setEheaFramework(EHEAFrameworkType value) { - this.eheaFramework = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="modeOfDelivery" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfDeliveryType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class ModeOfDelivery { - - @XmlValue - protected String value; - @XmlAttribute(name = "modeOfDelivery", required = true) - protected ModeOfDeliveryType modeOfDelivery; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the modeOfDelivery property. - * - * @return - * possible object is - * {@link ModeOfDeliveryType } - * - */ - public ModeOfDeliveryType getModeOfDelivery() { - return modeOfDelivery; - } - - /** - * Sets the value of the modeOfDelivery property. - * - * @param value - * allowed object is - * {@link ModeOfDeliveryType } - * - */ - public void setModeOfDelivery(ModeOfDeliveryType value) { - this.modeOfDelivery = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="type" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitTypeType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Type { - - @XmlValue - protected String value; - @XmlAttribute(name = "type") - protected CourseUnitTypeType type; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link CourseUnitTypeType } - * - */ - public CourseUnitTypeType getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link CourseUnitTypeType } - * - */ - public void setType(CourseUnitTypeType value) { - this.type = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="year" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class YearOfStudy { - - @XmlValue - protected String value; - @XmlAttribute(name = "year", required = true) - protected BigDecimal year; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the year property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getYear() { - return year; - } - - /** - * Sets the value of the year property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setYear(BigDecimal value) { - this.year = value; - } - - } + @XmlElement(name = "Code", required = true) + protected String code; + @XmlElement(name = "ScientificArea") + protected String scientificArea; + @XmlElement(name = "Title", required = true) + protected String title; + @XmlElement(name = "Theme") + protected String theme; + @XmlElement(name = "Type", required = true) + protected CourseUnitType.Type type; + @XmlElement(name = "YearOfStudy") + protected CourseUnitType.YearOfStudy yearOfStudy; + @XmlElement(name = "Level") + protected CourseUnitType.Level level; + @XmlElement(name = "ECTSCredits") + protected BigDecimal ectsCredits; + @XmlElement(name = "LocalCredits") + protected BigDecimal localCredits; + @XmlElement(name = "Hours") + protected BigDecimal hours; + @XmlElement(name = "LanguagesOfInstruction") + protected CourseUnitLanguagesOfInstructionType languagesOfInstruction; + @XmlElement(name = "ModeOfDelivery") + protected CourseUnitType.ModeOfDelivery modeOfDelivery; + @XmlElement(name = "WorkPlacements") + protected CourseUnitWorkPlacementsType workPlacements; + @XmlElement(name = "StudentPerformance") + protected CourseUnitStudentPerformanceType studentPerformance; + @XmlElement(name = "NameOfLecturers") + protected RichTextTagType nameOfLecturers; + @XmlElement(name = "LearningOutcomes") + protected RichTextTagType learningOutcomes; + @XmlElement(name = "PrerequisitesAndCorequisites") + protected RichTextTagType prerequisitesAndCorequisites; + @XmlElement(name = "RecomendedOptionalProgrammeComponents") + protected RichTextTagType recomendedOptionalProgrammeComponents; + @XmlElement(name = "CourseContents") + protected RichTextTagType courseContents; + @XmlElement(name = "RecomendedOrRequiredReading") + protected RichTextTagType recomendedOrRequiredReading; + @XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod") + protected RichTextTagType planedLearningActivitiesAndTeachingMethod; + @XmlElement(name = "AssesmentMethodsAndCriteria") + protected RichTextTagType assesmentMethodsAndCriteria; + @XmlElement(name = "Observations") + protected RichTextTagType observations; + @XmlAttribute(name = "groupID", required = true) + protected String groupID; + @XmlAttribute(name = "institutionAdministeringStudiesID", required = true) + protected String institutionAdministeringStudiesID; + @XmlAttribute(name = "isRequiredByTheProgramme") + protected Boolean isRequiredByTheProgramme; + + /** + * Gets the value of the code property. + * + * @return possible object is {@link String } + * + */ + public String getCode() { + return code; + } + + /** + * Sets the value of the code property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setCode(String value) { + this.code = value; + } + + /** + * Gets the value of the scientificArea property. + * + * @return possible object is {@link String } + * + */ + public String getScientificArea() { + return scientificArea; + } + + /** + * Sets the value of the scientificArea property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setScientificArea(String value) { + this.scientificArea = value; + } + + /** + * Gets the value of the title property. + * + * @return possible object is {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the theme property. + * + * @return possible object is {@link String } + * + */ + public String getTheme() { + return theme; + } + + /** + * Sets the value of the theme property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setTheme(String value) { + this.theme = value; + } + + /** + * Gets the value of the type property. + * + * @return possible object is {@link CourseUnitType.Type } + * + */ + public CourseUnitType.Type getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is {@link CourseUnitType.Type } + * + */ + public void setType(CourseUnitType.Type value) { + this.type = value; + } + + /** + * Gets the value of the yearOfStudy property. + * + * @return possible object is {@link CourseUnitType.YearOfStudy } + * + */ + public CourseUnitType.YearOfStudy getYearOfStudy() { + return yearOfStudy; + } + + /** + * Sets the value of the yearOfStudy property. + * + * @param value + * allowed object is {@link CourseUnitType.YearOfStudy } + * + */ + public void setYearOfStudy(CourseUnitType.YearOfStudy value) { + this.yearOfStudy = value; + } + + /** + * Gets the value of the level property. + * + * @return possible object is {@link CourseUnitType.Level } + * + */ + public CourseUnitType.Level getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + * @param value + * allowed object is {@link CourseUnitType.Level } + * + */ + public void setLevel(CourseUnitType.Level value) { + this.level = value; + } + + /** + * Gets the value of the ectsCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getECTSCredits() { + return ectsCredits; + } + + /** + * Sets the value of the ectsCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setECTSCredits(BigDecimal value) { + this.ectsCredits = value; + } + + /** + * Gets the value of the localCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getLocalCredits() { + return localCredits; + } + + /** + * Sets the value of the localCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setLocalCredits(BigDecimal value) { + this.localCredits = value; + } + + /** + * Gets the value of the hours property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getHours() { + return hours; + } + + /** + * Sets the value of the hours property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setHours(BigDecimal value) { + this.hours = value; + } + + /** + * Gets the value of the languagesOfInstruction property. + * + * @return possible object is {@link CourseUnitLanguagesOfInstructionType } + * + */ + public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() { + return languagesOfInstruction; + } + + /** + * Sets the value of the languagesOfInstruction property. + * + * @param value + * allowed object is {@link CourseUnitLanguagesOfInstructionType } + * + */ + public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) { + this.languagesOfInstruction = value; + } + + /** + * Gets the value of the modeOfDelivery property. + * + * @return possible object is {@link CourseUnitType.ModeOfDelivery } + * + */ + public CourseUnitType.ModeOfDelivery getModeOfDelivery() { + return modeOfDelivery; + } + + /** + * Sets the value of the modeOfDelivery property. + * + * @param value + * allowed object is {@link CourseUnitType.ModeOfDelivery } + * + */ + public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) { + this.modeOfDelivery = value; + } + + /** + * Gets the value of the workPlacements property. + * + * @return possible object is {@link CourseUnitWorkPlacementsType } + * + */ + public CourseUnitWorkPlacementsType getWorkPlacements() { + return workPlacements; + } + + /** + * Sets the value of the workPlacements property. + * + * @param value + * allowed object is {@link CourseUnitWorkPlacementsType } + * + */ + public void setWorkPlacements(CourseUnitWorkPlacementsType value) { + this.workPlacements = value; + } + + /** + * Gets the value of the studentPerformance property. + * + * @return possible object is {@link CourseUnitStudentPerformanceType } + * + */ + public CourseUnitStudentPerformanceType getStudentPerformance() { + return studentPerformance; + } + + /** + * Sets the value of the studentPerformance property. + * + * @param value + * allowed object is {@link CourseUnitStudentPerformanceType } + * + */ + public void setStudentPerformance(CourseUnitStudentPerformanceType value) { + this.studentPerformance = value; + } + + /** + * Gets the value of the nameOfLecturers property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getNameOfLecturers() { + return nameOfLecturers; + } + + /** + * Sets the value of the nameOfLecturers property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setNameOfLecturers(RichTextTagType value) { + this.nameOfLecturers = value; + } + + /** + * Gets the value of the learningOutcomes property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getLearningOutcomes() { + return learningOutcomes; + } + + /** + * Sets the value of the learningOutcomes property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setLearningOutcomes(RichTextTagType value) { + this.learningOutcomes = value; + } + + /** + * Gets the value of the prerequisitesAndCorequisites property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getPrerequisitesAndCorequisites() { + return prerequisitesAndCorequisites; + } + + /** + * Sets the value of the prerequisitesAndCorequisites property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setPrerequisitesAndCorequisites(RichTextTagType value) { + this.prerequisitesAndCorequisites = value; + } + + /** + * Gets the value of the recomendedOptionalProgrammeComponents property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getRecomendedOptionalProgrammeComponents() { + return recomendedOptionalProgrammeComponents; + } + + /** + * Sets the value of the recomendedOptionalProgrammeComponents property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) { + this.recomendedOptionalProgrammeComponents = value; + } + + /** + * Gets the value of the courseContents property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getCourseContents() { + return courseContents; + } + + /** + * Sets the value of the courseContents property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setCourseContents(RichTextTagType value) { + this.courseContents = value; + } + + /** + * Gets the value of the recomendedOrRequiredReading property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getRecomendedOrRequiredReading() { + return recomendedOrRequiredReading; + } + + /** + * Sets the value of the recomendedOrRequiredReading property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setRecomendedOrRequiredReading(RichTextTagType value) { + this.recomendedOrRequiredReading = value; + } + + /** + * Gets the value of the planedLearningActivitiesAndTeachingMethod property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() { + return planedLearningActivitiesAndTeachingMethod; + } + + /** + * Sets the value of the planedLearningActivitiesAndTeachingMethod property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) { + this.planedLearningActivitiesAndTeachingMethod = value; + } + + /** + * Gets the value of the assesmentMethodsAndCriteria property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAssesmentMethodsAndCriteria() { + return assesmentMethodsAndCriteria; + } + + /** + * Sets the value of the assesmentMethodsAndCriteria property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAssesmentMethodsAndCriteria(RichTextTagType value) { + this.assesmentMethodsAndCriteria = value; + } + + /** + * Gets the value of the observations property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getObservations() { + return observations; + } + + /** + * Sets the value of the observations property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setObservations(RichTextTagType value) { + this.observations = value; + } + + /** + * Gets the value of the groupID property. + * + * @return possible object is {@link String } + * + */ + public String getGroupID() { + return groupID; + } + + /** + * Sets the value of the groupID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setGroupID(String value) { + this.groupID = value; + } + + /** + * Gets the value of the institutionAdministeringStudiesID property. + * + * @return possible object is {@link String } + * + */ + public String getInstitutionAdministeringStudiesID() { + return institutionAdministeringStudiesID; + } + + /** + * Sets the value of the institutionAdministeringStudiesID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setInstitutionAdministeringStudiesID(String value) { + this.institutionAdministeringStudiesID = value; + } + + /** + * Gets the value of the isRequiredByTheProgramme property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isIsRequiredByTheProgramme() { + if (isRequiredByTheProgramme == null) { + return true; + } else { + return isRequiredByTheProgramme; + } + } + + /** + * Sets the value of the isRequiredByTheProgramme property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setIsRequiredByTheProgramme(Boolean value) { + this.isRequiredByTheProgramme = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="eheaFramework" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Level { + + @XmlValue + protected String value; + @XmlAttribute(name = "eheaFramework", required = true) + protected EHEAFrameworkType eheaFramework; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the eheaFramework property. + * + * @return possible object is {@link EHEAFrameworkType } + * + */ + public EHEAFrameworkType getEheaFramework() { + return eheaFramework; + } + + /** + * Sets the value of the eheaFramework property. + * + * @param value + * allowed object is {@link EHEAFrameworkType } + * + */ + public void setEheaFramework(EHEAFrameworkType value) { + this.eheaFramework = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="modeOfDelivery" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfDeliveryType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class ModeOfDelivery { + + @XmlValue + protected String value; + @XmlAttribute(name = "modeOfDelivery", required = true) + protected ModeOfDeliveryType modeOfDelivery; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the modeOfDelivery property. + * + * @return possible object is {@link ModeOfDeliveryType } + * + */ + public ModeOfDeliveryType getModeOfDelivery() { + return modeOfDelivery; + } + + /** + * Sets the value of the modeOfDelivery property. + * + * @param value + * allowed object is {@link ModeOfDeliveryType } + * + */ + public void setModeOfDelivery(ModeOfDeliveryType value) { + this.modeOfDelivery = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="type" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitTypeType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Type { + + @XmlValue + protected String value; + @XmlAttribute(name = "type") + protected CourseUnitTypeType type; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the type property. + * + * @return possible object is {@link CourseUnitTypeType } + * + */ + public CourseUnitTypeType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is {@link CourseUnitTypeType } + * + */ + public void setType(CourseUnitTypeType value) { + this.type = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="year" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class YearOfStudy { + + @XmlValue + protected String value; + @XmlAttribute(name = "year", required = true) + protected BigDecimal year; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the year property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setYear(BigDecimal value) { + this.year = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java index bb2dd2e50..5978cb2c7 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CourseUnitTypeType. + *

    + * Java class for CourseUnitTypeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="CourseUnitTypeType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -32,37 +33,36 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum CourseUnitTypeType {
     
    +	/**
    +	 * Compulsory
    +	 * 
    +	 */
    +	@XmlEnumValue("Compulsory")
    +	COMPULSORY("Compulsory"),
     
    -    /**
    -     * Compulsory
    -     * 
    -     */
    -    @XmlEnumValue("Compulsory")
    -    COMPULSORY("Compulsory"),
    -
    -    /**
    -     * Optional
    -     * 
    -     */
    -    @XmlEnumValue("Optional")
    -    OPTIONAL("Optional");
    -    private final String value;
    +	/**
    +	 * Optional
    +	 * 
    +	 */
    +	@XmlEnumValue("Optional")
    +	OPTIONAL("Optional");
    +	private final String value;
     
    -    CourseUnitTypeType(String v) {
    -        value = v;
    -    }
    +	CourseUnitTypeType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static CourseUnitTypeType fromValue(String v) {
    -        for (CourseUnitTypeType c: CourseUnitTypeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static CourseUnitTypeType fromValue(String v) {
    +		for (CourseUnitTypeType c : CourseUnitTypeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java
    index eb930ec76..f2d424667 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.math.BigDecimal;
    @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.datatype.XMLGregorianCalendar;
     
    -
     /**
      * Course unit work placement
      * 
    - * 

    Java class for CourseUnitWorkPlacementType complex type. + *

    + * Java class for CourseUnitWorkPlacementType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitWorkPlacementType">
    @@ -41,117 +41,100 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitWorkPlacementType", propOrder = {
    -    "collaboratingInstitution",
    -    "dateFrom",
    -    "dateTo",
    -    "trainingHours"
    -})
    +@XmlType(name = "CourseUnitWorkPlacementType", propOrder = { "collaboratingInstitution", "dateFrom", "dateTo", "trainingHours" })
     public class CourseUnitWorkPlacementType {
     
    -    @XmlElement(name = "CollaboratingInstitution", required = true)
    -    protected String collaboratingInstitution;
    -    @XmlElement(name = "DateFrom")
    -    protected XMLGregorianCalendar dateFrom;
    -    @XmlElement(name = "DateTo")
    -    protected XMLGregorianCalendar dateTo;
    -    @XmlElement(name = "TrainingHours")
    -    protected BigDecimal trainingHours;
    +	@XmlElement(name = "CollaboratingInstitution", required = true)
    +	protected String collaboratingInstitution;
    +	@XmlElement(name = "DateFrom")
    +	protected XMLGregorianCalendar dateFrom;
    +	@XmlElement(name = "DateTo")
    +	protected XMLGregorianCalendar dateTo;
    +	@XmlElement(name = "TrainingHours")
    +	protected BigDecimal trainingHours;
     
    -    /**
    -     * Gets the value of the collaboratingInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCollaboratingInstitution() {
    -        return collaboratingInstitution;
    -    }
    +	/**
    +	 * Gets the value of the collaboratingInstitution property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCollaboratingInstitution() {
    +		return collaboratingInstitution;
    +	}
     
    -    /**
    -     * Sets the value of the collaboratingInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCollaboratingInstitution(String value) {
    -        this.collaboratingInstitution = value;
    -    }
    +	/**
    +	 * Sets the value of the collaboratingInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCollaboratingInstitution(String value) {
    +		this.collaboratingInstitution = value;
    +	}
     
    -    /**
    -     * Gets the value of the dateFrom property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateFrom() {
    -        return dateFrom;
    -    }
    +	/**
    +	 * Gets the value of the dateFrom property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateFrom() {
    +		return dateFrom;
    +	}
     
    -    /**
    -     * Sets the value of the dateFrom property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateFrom(XMLGregorianCalendar value) {
    -        this.dateFrom = value;
    -    }
    +	/**
    +	 * Sets the value of the dateFrom property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateFrom(XMLGregorianCalendar value) {
    +		this.dateFrom = value;
    +	}
     
    -    /**
    -     * Gets the value of the dateTo property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateTo() {
    -        return dateTo;
    -    }
    +	/**
    +	 * Gets the value of the dateTo property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateTo() {
    +		return dateTo;
    +	}
     
    -    /**
    -     * Sets the value of the dateTo property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateTo(XMLGregorianCalendar value) {
    -        this.dateTo = value;
    -    }
    +	/**
    +	 * Sets the value of the dateTo property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateTo(XMLGregorianCalendar value) {
    +		this.dateTo = value;
    +	}
     
    -    /**
    -     * Gets the value of the trainingHours property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getTrainingHours() {
    -        return trainingHours;
    -    }
    +	/**
    +	 * Gets the value of the trainingHours property.
    +	 * 
    +	 * @return possible object is {@link BigDecimal }
    +	 * 
    +	 */
    +	public BigDecimal getTrainingHours() {
    +		return trainingHours;
    +	}
     
    -    /**
    -     * Sets the value of the trainingHours property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setTrainingHours(BigDecimal value) {
    -        this.trainingHours = value;
    -    }
    +	/**
    +	 * Sets the value of the trainingHours property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link BigDecimal }
    +	 * 
    +	 */
    +	public void setTrainingHours(BigDecimal value) {
    +		this.trainingHours = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java
    index f8d62f1e9..9a894f184 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Course unit work placements
      * 
    - * 

    Java class for CourseUnitWorkPlacementsType complex type. + *

    + * Java class for CourseUnitWorkPlacementsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitWorkPlacementsType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = {
    -    "workPlacement"
    -})
    +@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = { "workPlacement" })
     public class CourseUnitWorkPlacementsType {
     
    -    @XmlElement(name = "WorkPlacement", required = true)
    -    protected List workPlacement;
    +	@XmlElement(name = "WorkPlacement", required = true)
    +	protected List workPlacement;
     
    -    /**
    -     * Gets the value of the workPlacement property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the workPlacement property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getWorkPlacement().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CourseUnitWorkPlacementType } - * - * - */ - public List getWorkPlacement() { - if (workPlacement == null) { - workPlacement = new ArrayList(); - } - return this.workPlacement; - } + /** + * Gets the value of the workPlacement property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the workPlacement property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getWorkPlacement().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CourseUnitWorkPlacementType } + * + * + */ + public List getWorkPlacement() { + if (workPlacement == null) { + workPlacement = new ArrayList(); + } + return this.workPlacement; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java index 8d9c69b53..de5325960 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type. + *

    + * Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = {
    -    "mobilityProgramme"
    -})
    +@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = { "mobilityProgramme" })
     public class CoursesAttendedInOtherInstitutionInMobilityProgramsType {
     
    -    @XmlElement(name = "MobilityProgramme", required = true)
    -    protected List mobilityProgramme;
    +	@XmlElement(name = "MobilityProgramme", required = true)
    +	protected List mobilityProgramme;
     
    -    /**
    -     * Gets the value of the mobilityProgramme property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the mobilityProgramme property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getMobilityProgramme().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link MobilityProgrammeType } - * - * - */ - public List getMobilityProgramme() { - if (mobilityProgramme == null) { - mobilityProgramme = new ArrayList(); - } - return this.mobilityProgramme; - } + /** + * Gets the value of the mobilityProgramme property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the mobilityProgramme property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getMobilityProgramme().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeType } + * + * + */ + public List getMobilityProgramme() { + if (mobilityProgramme == null) { + mobilityProgramme = new ArrayList(); + } + return this.mobilityProgramme; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java index 364fa3f85..8cafa0346 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Courses group * - *

    Java class for CoursesGroupType complex type. + *

    + * Java class for CoursesGroupType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesGroupType">
    @@ -43,148 +43,129 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesGroupType", propOrder = {
    -    "name",
    -    "headerInformation",
    -    "coursesGroup",
    -    "footerInformation"
    -})
    +@XmlType(name = "CoursesGroupType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
     public class CoursesGroupType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    -    @XmlElement(name = "HeaderInformation")
    -    protected RichTextTagType headerInformation;
    -    @XmlElement(name = "CoursesGroup")
    -    protected List coursesGroup;
    -    @XmlElement(name = "FooterInformation")
    -    protected RichTextTagType footerInformation;
    -    @XmlAttribute(name = "groupID", required = true)
    -    protected String groupID;
    -
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    -
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    -
    -    /**
    -     * Gets the value of the headerInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getHeaderInformation() {
    -        return headerInformation;
    -    }
    -
    -    /**
    -     * Sets the value of the headerInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setHeaderInformation(RichTextTagType value) {
    -        this.headerInformation = value;
    -    }
    -
    -    /**
    -     * Gets the value of the coursesGroup property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the coursesGroup property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCoursesGroup().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CoursesGroupType } - * - * - */ - public List getCoursesGroup() { - if (coursesGroup == null) { - coursesGroup = new ArrayList(); - } - return this.coursesGroup; - } - - /** - * Gets the value of the footerInformation property. - * - * @return - * possible object is - * {@link RichTextTagType } - * - */ - public RichTextTagType getFooterInformation() { - return footerInformation; - } - - /** - * Sets the value of the footerInformation property. - * - * @param value - * allowed object is - * {@link RichTextTagType } - * - */ - public void setFooterInformation(RichTextTagType value) { - this.footerInformation = value; - } - - /** - * Gets the value of the groupID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getGroupID() { - return groupID; - } - - /** - * Sets the value of the groupID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setGroupID(String value) { - this.groupID = value; - } + @XmlElement(name = "Name", required = true) + protected String name; + @XmlElement(name = "HeaderInformation") + protected RichTextTagType headerInformation; + @XmlElement(name = "CoursesGroup") + protected List coursesGroup; + @XmlElement(name = "FooterInformation") + protected RichTextTagType footerInformation; + @XmlAttribute(name = "groupID", required = true) + protected String groupID; + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the headerInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getHeaderInformation() { + return headerInformation; + } + + /** + * Sets the value of the headerInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setHeaderInformation(RichTextTagType value) { + this.headerInformation = value; + } + + /** + * Gets the value of the coursesGroup property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the coursesGroup property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCoursesGroup().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CoursesGroupType } + * + * + */ + public List getCoursesGroup() { + if (coursesGroup == null) { + coursesGroup = new ArrayList(); + } + return this.coursesGroup; + } + + /** + * Gets the value of the footerInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getFooterInformation() { + return footerInformation; + } + + /** + * Sets the value of the footerInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setFooterInformation(RichTextTagType value) { + this.footerInformation = value; + } + + /** + * Gets the value of the groupID property. + * + * @return possible object is {@link String } + * + */ + public String getGroupID() { + return groupID; + } + + /** + * Sets the value of the groupID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setGroupID(String value) { + this.groupID = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java index 820581335..56ae13b33 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Courses groups * - *

    Java class for CoursesGroupsType complex type. + *

    + * Java class for CoursesGroupsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesGroupsType">
    @@ -41,122 +41,106 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesGroupsType", propOrder = {
    -    "name",
    -    "headerInformation",
    -    "coursesGroup",
    -    "footerInformation"
    -})
    +@XmlType(name = "CoursesGroupsType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
     public class CoursesGroupsType {
     
    -    @XmlElement(name = "Name")
    -    protected String name;
    -    @XmlElement(name = "HeaderInformation")
    -    protected RichTextTagType headerInformation;
    -    @XmlElement(name = "CoursesGroup")
    -    protected List coursesGroup;
    -    @XmlElement(name = "FooterInformation")
    -    protected RichTextTagType footerInformation;
    +	@XmlElement(name = "Name")
    +	protected String name;
    +	@XmlElement(name = "HeaderInformation")
    +	protected RichTextTagType headerInformation;
    +	@XmlElement(name = "CoursesGroup")
    +	protected List coursesGroup;
    +	@XmlElement(name = "FooterInformation")
    +	protected RichTextTagType footerInformation;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    +	/**
    +	 * Gets the value of the name property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    +	/**
    +	 * Sets the value of the name property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setName(String value) {
    +		this.name = value;
    +	}
     
    -    /**
    -     * Gets the value of the headerInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getHeaderInformation() {
    -        return headerInformation;
    -    }
    +	/**
    +	 * Gets the value of the headerInformation property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getHeaderInformation() {
    +		return headerInformation;
    +	}
     
    -    /**
    -     * Sets the value of the headerInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setHeaderInformation(RichTextTagType value) {
    -        this.headerInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the headerInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setHeaderInformation(RichTextTagType value) {
    +		this.headerInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the coursesGroup property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the coursesGroup property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCoursesGroup().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CoursesGroupType } - * - * - */ - public List getCoursesGroup() { - if (coursesGroup == null) { - coursesGroup = new ArrayList(); - } - return this.coursesGroup; - } + /** + * Gets the value of the coursesGroup property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the coursesGroup property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCoursesGroup().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CoursesGroupType } + * + * + */ + public List getCoursesGroup() { + if (coursesGroup == null) { + coursesGroup = new ArrayList(); + } + return this.coursesGroup; + } - /** - * Gets the value of the footerInformation property. - * - * @return - * possible object is - * {@link RichTextTagType } - * - */ - public RichTextTagType getFooterInformation() { - return footerInformation; - } + /** + * Gets the value of the footerInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getFooterInformation() { + return footerInformation; + } - /** - * Sets the value of the footerInformation property. - * - * @param value - * allowed object is - * {@link RichTextTagType } - * - */ - public void setFooterInformation(RichTextTagType value) { - this.footerInformation = value; - } + /** + * Sets the value of the footerInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setFooterInformation(RichTextTagType value) { + this.footerInformation = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java index a2258cab0..38ccacc0b 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Course units * - *

    Java class for CoursesUnitsType complex type. + *

    + * Java class for CoursesUnitsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesUnitsType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesUnitsType", propOrder = {
    -    "courseUnit"
    -})
    +@XmlType(name = "CoursesUnitsType", propOrder = { "courseUnit" })
     public class CoursesUnitsType {
     
    -    @XmlElement(name = "CourseUnit", required = true)
    -    protected List courseUnit;
    +	@XmlElement(name = "CourseUnit", required = true)
    +	protected List courseUnit;
     
    -    /**
    -     * Gets the value of the courseUnit property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the courseUnit property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCourseUnit().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CourseUnitType } - * - * - */ - public List getCourseUnit() { - if (courseUnit == null) { - courseUnit = new ArrayList(); - } - return this.courseUnit; - } + /** + * Gets the value of the courseUnit property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the courseUnit property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCourseUnit().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CourseUnitType } + * + * + */ + public List getCourseUnit() { + if (courseUnit == null) { + courseUnit = new ArrayList(); + } + return this.courseUnit; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java index b08a4fb72..57e9a4dfb 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -17,13 +16,14 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType; - /** * Diploma Supplement * - *

    Java class for DiplomaSupplementType complex type. + *

    + * Java class for DiplomaSupplementType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="DiplomaSupplementType">
    @@ -52,360 +52,316 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "DiplomaSupplementType", propOrder = {
    -    "informationIdentifyingTheHolderOfTheQualification",
    -    "informationIdentifyingTheQualification",
    -    "informationOnTheLevelOfTheQualification",
    -    "informationOnTheContentsAndResultsGained",
    -    "informationOnTheFunctionOfTheQualification",
    -    "additionalInformation",
    -    "certificationOfTheSupplement",
    -    "informationOnTheNationalHigherEducationSystem",
    -    "attachments",
    -    "extensionContent",
    -    "signature"
    -})
    +@XmlType(name = "DiplomaSupplementType", propOrder = { "informationIdentifyingTheHolderOfTheQualification", "informationIdentifyingTheQualification", "informationOnTheLevelOfTheQualification",
    +		"informationOnTheContentsAndResultsGained", "informationOnTheFunctionOfTheQualification", "additionalInformation", "certificationOfTheSupplement",
    +		"informationOnTheNationalHigherEducationSystem", "attachments", "extensionContent", "signature" })
     public class DiplomaSupplementType {
     
    -    @XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
    -    protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
    -    @XmlElement(name = "InformationIdentifyingTheQualification", required = true)
    -    protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
    -    @XmlElement(name = "InformationOnTheLevelOfTheQualification", required = true)
    -    protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
    -    @XmlElement(name = "InformationOnTheContentsAndResultsGained", required = true)
    -    protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
    -    @XmlElement(name = "InformationOnTheFunctionOfTheQualification", required = true)
    -    protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
    -    @XmlElement(name = "AdditionalInformation", required = true)
    -    protected AdditionalInformationType additionalInformation;
    -    @XmlElement(name = "CertificationOfTheSupplement", required = true)
    -    protected CertificationOfTheSupplementType certificationOfTheSupplement;
    -    @XmlElement(name = "InformationOnTheNationalHigherEducationSystem", required = true)
    -    protected RichTextTagType informationOnTheNationalHigherEducationSystem;
    -    @XmlElement(name = "Attachments")
    -    protected AttachmentsType attachments;
    -    @XmlElement(name = "ExtensionContent")
    -    protected List extensionContent;
    -    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    -    protected List signature;
    -    @XmlAttribute(name = "language", required = true)
    -    protected LanguageType language;
    -    @XmlAttribute(name = "isTheOriginalLanguage", required = true)
    -    protected boolean isTheOriginalLanguage;
    +	@XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
    +	protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
    +	@XmlElement(name = "InformationIdentifyingTheQualification", required = true)
    +	protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
    +	@XmlElement(name = "InformationOnTheLevelOfTheQualification", required = true)
    +	protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
    +	@XmlElement(name = "InformationOnTheContentsAndResultsGained", required = true)
    +	protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
    +	@XmlElement(name = "InformationOnTheFunctionOfTheQualification", required = true)
    +	protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
    +	@XmlElement(name = "AdditionalInformation", required = true)
    +	protected AdditionalInformationType additionalInformation;
    +	@XmlElement(name = "CertificationOfTheSupplement", required = true)
    +	protected CertificationOfTheSupplementType certificationOfTheSupplement;
    +	@XmlElement(name = "InformationOnTheNationalHigherEducationSystem", required = true)
    +	protected RichTextTagType informationOnTheNationalHigherEducationSystem;
    +	@XmlElement(name = "Attachments")
    +	protected AttachmentsType attachments;
    +	@XmlElement(name = "ExtensionContent")
    +	protected List extensionContent;
    +	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    +	protected List signature;
    +	@XmlAttribute(name = "language", required = true)
    +	protected LanguageType language;
    +	@XmlAttribute(name = "isTheOriginalLanguage", required = true)
    +	protected boolean isTheOriginalLanguage;
     
    -    /**
    -     * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
    -     *     
    -     */
    -    public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
    -        return informationIdentifyingTheHolderOfTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
    +	 * 
    +	 */
    +	public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
    +		return informationIdentifyingTheHolderOfTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
    -     *     
    -     */
    -    public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
    -        this.informationIdentifyingTheHolderOfTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
    +		this.informationIdentifyingTheHolderOfTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationIdentifyingTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationIdentifyingTheQualificationType }
    -     *     
    -     */
    -    public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
    -        return informationIdentifyingTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationIdentifyingTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationIdentifyingTheQualificationType }
    +	 * 
    +	 */
    +	public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
    +		return informationIdentifyingTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationIdentifyingTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationIdentifyingTheQualificationType }
    -     *     
    -     */
    -    public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
    -        this.informationIdentifyingTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationIdentifyingTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationIdentifyingTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
    +		this.informationIdentifyingTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheLevelOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType }
    -     *     
    -     */
    -    public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
    -        return informationOnTheLevelOfTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheLevelOfTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType }
    +	 * 
    +	 */
    +	public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
    +		return informationOnTheLevelOfTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheLevelOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType }
    -     *     
    -     */
    -    public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
    -        this.informationOnTheLevelOfTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheLevelOfTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
    +		this.informationOnTheLevelOfTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheContentsAndResultsGained property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType }
    -     *     
    -     */
    -    public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
    -        return informationOnTheContentsAndResultsGained;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheContentsAndResultsGained property.
    +	 * 
    +	 * @return possible object is {@link InformationOnTheContentsAndResultsGainedType }
    +	 * 
    +	 */
    +	public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
    +		return informationOnTheContentsAndResultsGained;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheContentsAndResultsGained property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType }
    -     *     
    -     */
    -    public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
    -        this.informationOnTheContentsAndResultsGained = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheContentsAndResultsGained property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationOnTheContentsAndResultsGainedType }
    +	 * 
    +	 */
    +	public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
    +		this.informationOnTheContentsAndResultsGained = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheFunctionOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType }
    -     *     
    -     */
    -    public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
    -        return informationOnTheFunctionOfTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheFunctionOfTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType }
    +	 * 
    +	 */
    +	public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
    +		return informationOnTheFunctionOfTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheFunctionOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType }
    -     *     
    -     */
    -    public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
    -        this.informationOnTheFunctionOfTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheFunctionOfTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationOnTheFunctionOfTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
    +		this.informationOnTheFunctionOfTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AdditionalInformationType }
    -     *     
    -     */
    -    public AdditionalInformationType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    +	/**
    +	 * Gets the value of the additionalInformation property.
    +	 * 
    +	 * @return possible object is {@link AdditionalInformationType }
    +	 * 
    +	 */
    +	public AdditionalInformationType getAdditionalInformation() {
    +		return additionalInformation;
    +	}
     
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AdditionalInformationType }
    -     *     
    -     */
    -    public void setAdditionalInformation(AdditionalInformationType value) {
    -        this.additionalInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the additionalInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AdditionalInformationType }
    +	 * 
    +	 */
    +	public void setAdditionalInformation(AdditionalInformationType value) {
    +		this.additionalInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the certificationOfTheSupplement property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CertificationOfTheSupplementType }
    -     *     
    -     */
    -    public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
    -        return certificationOfTheSupplement;
    -    }
    +	/**
    +	 * Gets the value of the certificationOfTheSupplement property.
    +	 * 
    +	 * @return possible object is {@link CertificationOfTheSupplementType }
    +	 * 
    +	 */
    +	public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
    +		return certificationOfTheSupplement;
    +	}
     
    -    /**
    -     * Sets the value of the certificationOfTheSupplement property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CertificationOfTheSupplementType }
    -     *     
    -     */
    -    public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
    -        this.certificationOfTheSupplement = value;
    -    }
    +	/**
    +	 * Sets the value of the certificationOfTheSupplement property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CertificationOfTheSupplementType }
    +	 * 
    +	 */
    +	public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
    +		this.certificationOfTheSupplement = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheNationalHigherEducationSystem property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
    -        return informationOnTheNationalHigherEducationSystem;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheNationalHigherEducationSystem property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
    +		return informationOnTheNationalHigherEducationSystem;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheNationalHigherEducationSystem property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
    -        this.informationOnTheNationalHigherEducationSystem = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheNationalHigherEducationSystem property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
    +		this.informationOnTheNationalHigherEducationSystem = value;
    +	}
     
    -    /**
    -     * Gets the value of the attachments property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachmentsType }
    -     *     
    -     */
    -    public AttachmentsType getAttachments() {
    -        return attachments;
    -    }
    +	/**
    +	 * Gets the value of the attachments property.
    +	 * 
    +	 * @return possible object is {@link AttachmentsType }
    +	 * 
    +	 */
    +	public AttachmentsType getAttachments() {
    +		return attachments;
    +	}
     
    -    /**
    -     * Sets the value of the attachments property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachmentsType }
    -     *     
    -     */
    -    public void setAttachments(AttachmentsType value) {
    -        this.attachments = value;
    -    }
    +	/**
    +	 * Sets the value of the attachments property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachmentsType }
    +	 * 
    +	 */
    +	public void setAttachments(AttachmentsType value) {
    +		this.attachments = value;
    +	}
     
    -    /**
    -     * Gets the value of the extensionContent property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the extensionContent property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getExtensionContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link ExtensionContentType } - * - * - */ - public List getExtensionContent() { - if (extensionContent == null) { - extensionContent = new ArrayList(); - } - return this.extensionContent; - } + /** + * Gets the value of the extensionContent property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the extensionContent property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getExtensionContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link ExtensionContentType } + * + * + */ + public List getExtensionContent() { + if (extensionContent == null) { + extensionContent = new ArrayList(); + } + return this.extensionContent; + } - /** - * Digital signature Gets the value of the signature property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the signature property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSignature().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link SignatureType } - * - * - */ - public List getSignature() { - if (signature == null) { - signature = new ArrayList(); - } - return this.signature; - } + /** + * Digital signature Gets the value of the signature property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the signature property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSignature().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link SignatureType } + * + * + */ + public List getSignature() { + if (signature == null) { + signature = new ArrayList(); + } + return this.signature; + } - /** - * Gets the value of the language property. - * - * @return - * possible object is - * {@link LanguageType } - * - */ - public LanguageType getLanguage() { - return language; - } + /** + * Gets the value of the language property. + * + * @return possible object is {@link LanguageType } + * + */ + public LanguageType getLanguage() { + return language; + } - /** - * Sets the value of the language property. - * - * @param value - * allowed object is - * {@link LanguageType } - * - */ - public void setLanguage(LanguageType value) { - this.language = value; - } + /** + * Sets the value of the language property. + * + * @param value + * allowed object is {@link LanguageType } + * + */ + public void setLanguage(LanguageType value) { + this.language = value; + } - /** - * Gets the value of the isTheOriginalLanguage property. - * - */ - public boolean isIsTheOriginalLanguage() { - return isTheOriginalLanguage; - } + /** + * Gets the value of the isTheOriginalLanguage property. + * + */ + public boolean isIsTheOriginalLanguage() { + return isTheOriginalLanguage; + } - /** - * Sets the value of the isTheOriginalLanguage property. - * - */ - public void setIsTheOriginalLanguage(boolean value) { - this.isTheOriginalLanguage = value; - } + /** + * Sets the value of the isTheOriginalLanguage property. + * + */ + public void setIsTheOriginalLanguage(boolean value) { + this.isTheOriginalLanguage = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java index 94be08fb8..7916ead8d 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java @@ -5,18 +5,19 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for ECTSGradingScaleType. + *

    + * Java class for ECTSGradingScaleType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ECTSGradingScaleType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -36,55 +37,54 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum ECTSGradingScaleType {
     
    -
    -    /**
    -     * Top 10%
    -     * 
    -     */
    -    A,
    -
    -    /**
    -     * Next 25%
    -     * 
    -     */
    -    B,
    -
    -    /**
    -     * Next 30%
    -     * 
    -     */
    -    C,
    -
    -    /**
    -     * Next 25%
    -     * 
    -     */
    -    D,
    -
    -    /**
    -     * Lowest 10%
    -     * 
    -     */
    -    E,
    -
    -    /**
    -     * Fail
    -     * 
    -     */
    -    FX,
    -
    -    /**
    -     * Fail
    -     * 
    -     */
    -    F;
    -
    -    public String value() {
    -        return name();
    -    }
    -
    -    public static ECTSGradingScaleType fromValue(String v) {
    -        return valueOf(v);
    -    }
    +	/**
    +	 * Top 10%
    +	 * 
    +	 */
    +	A,
    +
    +	/**
    +	 * Next 25%
    +	 * 
    +	 */
    +	B,
    +
    +	/**
    +	 * Next 30%
    +	 * 
    +	 */
    +	C,
    +
    +	/**
    +	 * Next 25%
    +	 * 
    +	 */
    +	D,
    +
    +	/**
    +	 * Lowest 10%
    +	 * 
    +	 */
    +	E,
    +
    +	/**
    +	 * Fail
    +	 * 
    +	 */
    +	FX,
    +
    +	/**
    +	 * Fail
    +	 * 
    +	 */
    +	F;
    +
    +	public String value() {
    +		return name();
    +	}
    +
    +	public static ECTSGradingScaleType fromValue(String v) {
    +		return valueOf(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java
    index 05dbdedfe..49a5a74ee 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for EHEAFrameworkType. + *

    + * Java class for EHEAFrameworkType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="EHEAFrameworkType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -33,44 +34,43 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum EHEAFrameworkType {
     
    +	/**
    +	 * First Cycle
    +	 * 
    +	 */
    +	@XmlEnumValue("FirstCycle")
    +	FIRST_CYCLE("FirstCycle"),
     
    -    /**
    -     * First Cycle
    -     * 
    -     */
    -    @XmlEnumValue("FirstCycle")
    -    FIRST_CYCLE("FirstCycle"),
    -
    -    /**
    -     * Second Cycle
    -     * 
    -     */
    -    @XmlEnumValue("SecondCycle")
    -    SECOND_CYCLE("SecondCycle"),
    +	/**
    +	 * Second Cycle
    +	 * 
    +	 */
    +	@XmlEnumValue("SecondCycle")
    +	SECOND_CYCLE("SecondCycle"),
     
    -    /**
    -     * Third Cycle
    -     * 
    -     */
    -    @XmlEnumValue("ThirdCycle")
    -    THIRD_CYCLE("ThirdCycle");
    -    private final String value;
    +	/**
    +	 * Third Cycle
    +	 * 
    +	 */
    +	@XmlEnumValue("ThirdCycle")
    +	THIRD_CYCLE("ThirdCycle");
    +	private final String value;
     
    -    EHEAFrameworkType(String v) {
    -        value = v;
    -    }
    +	EHEAFrameworkType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static EHEAFrameworkType fromValue(String v) {
    -        for (EHEAFrameworkType c: EHEAFrameworkType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static EHEAFrameworkType fromValue(String v) {
    +		for (EHEAFrameworkType c : EHEAFrameworkType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java
    index 5eb351cf7..588017469 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -18,13 +17,14 @@ import javax.xml.bind.annotation.XmlMixed;
     import javax.xml.bind.annotation.XmlType;
     import org.w3c.dom.Element;
     
    -
     /**
      * Extension content
      * 
    - * 

    Java class for ExtensionContentType complex type. + *

    + * Java class for ExtensionContentType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ExtensionContentType">
    @@ -42,70 +42,61 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ExtensionContentType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "ExtensionContentType", propOrder = { "content" })
     public class ExtensionContentType {
     
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "id")
    -    protected String id;
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "id")
    +	protected String id;
     
    -    /**
    -     * Extension content Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Extension content Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java index 804dfc3e9..7efeaaf15 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Family name(s) * - *

    Java class for FamilyNameType complex type. + *

    + * Java class for FamilyNameType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="FamilyNameType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "FamilyNameType", propOrder = {
    -    "surname"
    -})
    +@XmlType(name = "FamilyNameType", propOrder = { "surname" })
     public class FamilyNameType {
     
    -    @XmlElement(name = "Surname", required = true)
    -    protected List surname;
    +	@XmlElement(name = "Surname", required = true)
    +	protected List surname;
     
    -    /**
    -     * Gets the value of the surname property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the surname property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSurname().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getSurname() { - if (surname == null) { - surname = new ArrayList(); - } - return this.surname; - } + /** + * Gets the value of the surname property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the surname property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSurname().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getSurname() { + if (surname == null) { + surname = new ArrayList(); + } + return this.surname; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java index 92c9dee87..8aa5feaf0 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for GenderType. + *

    + * Java class for GenderType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="GenderType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -32,37 +33,36 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum GenderType {
     
    +	/**
    +	 * Female
    +	 * 
    +	 */
    +	@XmlEnumValue("Female")
    +	FEMALE("Female"),
     
    -    /**
    -     * Female
    -     * 
    -     */
    -    @XmlEnumValue("Female")
    -    FEMALE("Female"),
    -
    -    /**
    -     * Male
    -     * 
    -     */
    -    @XmlEnumValue("Male")
    -    MALE("Male");
    -    private final String value;
    +	/**
    +	 * Male
    +	 * 
    +	 */
    +	@XmlEnumValue("Male")
    +	MALE("Male");
    +	private final String value;
     
    -    GenderType(String v) {
    -        value = v;
    -    }
    +	GenderType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static GenderType fromValue(String v) {
    -        for (GenderType c: GenderType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static GenderType fromValue(String v) {
    +		for (GenderType c : GenderType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java
    index ac27d7149..169c94455 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Given name(s)
      * 
    - * 

    Java class for GivenNameType complex type. + *

    + * Java class for GivenNameType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="GivenNameType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "GivenNameType", propOrder = {
    -    "name"
    -})
    +@XmlType(name = "GivenNameType", propOrder = { "name" })
     public class GivenNameType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected List name;
    +	@XmlElement(name = "Name", required = true)
    +	protected List name;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the name property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getName().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getName() { - if (name == null) { - name = new ArrayList(); - } - return this.name; - } + /** + * Gets the value of the name property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the name property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getName().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getName() { + if (name == null) { + name = new ArrayList(); + } + return this.name; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java index ab896f7f4..a853aec65 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Grading scheme and grade distribution guidance * - *

    Java class for GradingSchemeAndGradeDistributionGuidanceType complex type. + *

    + * Java class for GradingSchemeAndGradeDistributionGuidanceType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="GradingSchemeAndGradeDistributionGuidanceType">
    @@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = {
    -    "gradingScheme",
    -    "gradeDistributionGuidance"
    -})
    +@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = { "gradingScheme", "gradeDistributionGuidance" })
     public class GradingSchemeAndGradeDistributionGuidanceType {
     
    -    @XmlElement(name = "GradingScheme", required = true)
    -    protected RichTextTagType gradingScheme;
    -    @XmlElement(name = "GradeDistributionGuidance")
    -    protected RichTextTagType gradeDistributionGuidance;
    +	@XmlElement(name = "GradingScheme", required = true)
    +	protected RichTextTagType gradingScheme;
    +	@XmlElement(name = "GradeDistributionGuidance")
    +	protected RichTextTagType gradeDistributionGuidance;
     
    -    /**
    -     * Gets the value of the gradingScheme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getGradingScheme() {
    -        return gradingScheme;
    -    }
    +	/**
    +	 * Gets the value of the gradingScheme property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getGradingScheme() {
    +		return gradingScheme;
    +	}
     
    -    /**
    -     * Sets the value of the gradingScheme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setGradingScheme(RichTextTagType value) {
    -        this.gradingScheme = value;
    -    }
    +	/**
    +	 * Sets the value of the gradingScheme property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setGradingScheme(RichTextTagType value) {
    +		this.gradingScheme = value;
    +	}
     
    -    /**
    -     * Gets the value of the gradeDistributionGuidance property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getGradeDistributionGuidance() {
    -        return gradeDistributionGuidance;
    -    }
    +	/**
    +	 * Gets the value of the gradeDistributionGuidance property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getGradeDistributionGuidance() {
    +		return gradeDistributionGuidance;
    +	}
     
    -    /**
    -     * Sets the value of the gradeDistributionGuidance property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setGradeDistributionGuidance(RichTextTagType value) {
    -        this.gradeDistributionGuidance = value;
    -    }
    +	/**
    +	 * Sets the value of the gradeDistributionGuidance property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setGradeDistributionGuidance(RichTextTagType value) {
    +		this.gradeDistributionGuidance = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java
    index 22383f975..4908eab0a 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for ImageMimeType. + *

    + * Java class for ImageMimeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ImageMimeType">
      *   <restriction base="{urn:crue:academic:xsd:language:diplomasupplement}MimeType">
    @@ -35,58 +36,57 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum(MimeType.class)
     public enum ImageMimeType {
     
    +	/**
    +	 * GIF image
    +	 * 
    +	 */
    +	@XmlEnumValue("image/gif")
    +	IMAGE_GIF(MimeType.IMAGE_GIF),
     
    -    /**
    -     * GIF image
    -     * 
    -     */
    -    @XmlEnumValue("image/gif")
    -    IMAGE_GIF(MimeType.IMAGE_GIF),
    -
    -    /**
    -     * JPEG JFIF image
    -     * 
    -     */
    -    @XmlEnumValue("image/jpeg")
    -    IMAGE_JPEG(MimeType.IMAGE_JPEG),
    +	/**
    +	 * JPEG JFIF image
    +	 * 
    +	 */
    +	@XmlEnumValue("image/jpeg")
    +	IMAGE_JPEG(MimeType.IMAGE_JPEG),
     
    -    /**
    -     * JPEG JFIF image
    -     * 
    -     */
    -    @XmlEnumValue("image/pjpeg")
    -    IMAGE_PJPEG(MimeType.IMAGE_PJPEG),
    +	/**
    +	 * JPEG JFIF image
    +	 * 
    +	 */
    +	@XmlEnumValue("image/pjpeg")
    +	IMAGE_PJPEG(MimeType.IMAGE_PJPEG),
     
    -    /**
    -     * Portable Network Graphics
    -     * 
    -     */
    -    @XmlEnumValue("image/png")
    -    IMAGE_PNG(MimeType.IMAGE_PNG),
    +	/**
    +	 * Portable Network Graphics
    +	 * 
    +	 */
    +	@XmlEnumValue("image/png")
    +	IMAGE_PNG(MimeType.IMAGE_PNG),
     
    -    /**
    -     * Tag Image File Format
    -     * 
    -     */
    -    @XmlEnumValue("image/tiff")
    -    IMAGE_TIFF(MimeType.IMAGE_TIFF);
    -    private final MimeType value;
    +	/**
    +	 * Tag Image File Format
    +	 * 
    +	 */
    +	@XmlEnumValue("image/tiff")
    +	IMAGE_TIFF(MimeType.IMAGE_TIFF);
    +	private final MimeType value;
     
    -    ImageMimeType(MimeType v) {
    -        value = v;
    -    }
    +	ImageMimeType(MimeType v) {
    +		value = v;
    +	}
     
    -    public MimeType value() {
    -        return value;
    -    }
    +	public MimeType value() {
    +		return value;
    +	}
     
    -    public static ImageMimeType fromValue(MimeType v) {
    -        for (ImageMimeType c: ImageMimeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v.toString());
    -    }
    +	public static ImageMimeType fromValue(MimeType v) {
    +		for (ImageMimeType c : ImageMimeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v.toString());
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java
    index 7f5076886..f43574139 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     import javax.xml.datatype.XMLGregorianCalendar;
     
    -
     /**
      * Information identifying the holder of the qualification
      * 
    - * 

    Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type. + *

    + * Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
    @@ -61,360 +61,318 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = {
    -    "familyName",
    -    "givenName",
    -    "dateOfBirth",
    -    "studentIdentificationNumber",
    -    "countryOfBirth",
    -    "placeOfBirth",
    -    "gender"
    -})
    +@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = { "familyName", "givenName", "dateOfBirth", "studentIdentificationNumber", "countryOfBirth", "placeOfBirth",
    +		"gender" })
     public class InformationIdentifyingTheHolderOfTheQualificationType {
     
    -    @XmlElement(name = "FamilyName", required = true)
    -    protected FamilyNameType familyName;
    -    @XmlElement(name = "GivenName", required = true)
    -    protected GivenNameType givenName;
    -    @XmlElement(name = "DateOfBirth", required = true)
    -    protected XMLGregorianCalendar dateOfBirth;
    -    @XmlElement(name = "StudentIdentificationNumber")
    -    protected String studentIdentificationNumber;
    -    @XmlElement(name = "CountryOfBirth")
    -    protected InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth countryOfBirth;
    -    @XmlElement(name = "PlaceOfBirth")
    -    protected String placeOfBirth;
    -    @XmlElement(name = "Gender")
    -    protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender;
    -
    -    /**
    -     * Gets the value of the familyName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public FamilyNameType getFamilyName() {
    -        return familyName;
    -    }
    -
    -    /**
    -     * Sets the value of the familyName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public void setFamilyName(FamilyNameType value) {
    -        this.familyName = value;
    -    }
    -
    -    /**
    -     * Gets the value of the givenName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public GivenNameType getGivenName() {
    -        return givenName;
    -    }
    -
    -    /**
    -     * Sets the value of the givenName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public void setGivenName(GivenNameType value) {
    -        this.givenName = value;
    -    }
    -
    -    /**
    -     * Gets the value of the dateOfBirth property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateOfBirth() {
    -        return dateOfBirth;
    -    }
    -
    -    /**
    -     * Sets the value of the dateOfBirth property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateOfBirth(XMLGregorianCalendar value) {
    -        this.dateOfBirth = value;
    -    }
    -
    -    /**
    -     * Gets the value of the studentIdentificationNumber property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStudentIdentificationNumber() {
    -        return studentIdentificationNumber;
    -    }
    -
    -    /**
    -     * Sets the value of the studentIdentificationNumber property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStudentIdentificationNumber(String value) {
    -        this.studentIdentificationNumber = value;
    -    }
    -
    -    /**
    -     * Gets the value of the countryOfBirth property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
    -     *     
    -     */
    -    public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth getCountryOfBirth() {
    -        return countryOfBirth;
    -    }
    -
    -    /**
    -     * Sets the value of the countryOfBirth property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
    -     *     
    -     */
    -    public void setCountryOfBirth(InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth value) {
    -        this.countryOfBirth = value;
    -    }
    -
    -    /**
    -     * Gets the value of the placeOfBirth property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getPlaceOfBirth() {
    -        return placeOfBirth;
    -    }
    -
    -    /**
    -     * Sets the value of the placeOfBirth property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setPlaceOfBirth(String value) {
    -        this.placeOfBirth = value;
    -    }
    -
    -    /**
    -     * Gets the value of the gender property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
    -     *     
    -     */
    -    public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() {
    -        return gender;
    -    }
    -
    -    /**
    -     * Sets the value of the gender property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
    -     *     
    -     */
    -    public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) {
    -        this.gender = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="country" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class CountryOfBirth { - - @XmlValue - protected String value; - @XmlAttribute(name = "country") - protected CountryType country; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link CountryType } - * - */ - public CountryType getCountry() { - return country; - } - - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link CountryType } - * - */ - public void setCountry(CountryType value) { - this.country = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="gender" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}GenderType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Gender { - - @XmlValue - protected String value; - @XmlAttribute(name = "gender", required = true) - protected GenderType gender; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the gender property. - * - * @return - * possible object is - * {@link GenderType } - * - */ - public GenderType getGender() { - return gender; - } - - /** - * Sets the value of the gender property. - * - * @param value - * allowed object is - * {@link GenderType } - * - */ - public void setGender(GenderType value) { - this.gender = value; - } - - } + @XmlElement(name = "FamilyName", required = true) + protected FamilyNameType familyName; + @XmlElement(name = "GivenName", required = true) + protected GivenNameType givenName; + @XmlElement(name = "DateOfBirth", required = true) + protected XMLGregorianCalendar dateOfBirth; + @XmlElement(name = "StudentIdentificationNumber") + protected String studentIdentificationNumber; + @XmlElement(name = "CountryOfBirth") + protected InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth countryOfBirth; + @XmlElement(name = "PlaceOfBirth") + protected String placeOfBirth; + @XmlElement(name = "Gender") + protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender; + + /** + * Gets the value of the familyName property. + * + * @return possible object is {@link FamilyNameType } + * + */ + public FamilyNameType getFamilyName() { + return familyName; + } + + /** + * Sets the value of the familyName property. + * + * @param value + * allowed object is {@link FamilyNameType } + * + */ + public void setFamilyName(FamilyNameType value) { + this.familyName = value; + } + + /** + * Gets the value of the givenName property. + * + * @return possible object is {@link GivenNameType } + * + */ + public GivenNameType getGivenName() { + return givenName; + } + + /** + * Sets the value of the givenName property. + * + * @param value + * allowed object is {@link GivenNameType } + * + */ + public void setGivenName(GivenNameType value) { + this.givenName = value; + } + + /** + * Gets the value of the dateOfBirth property. + * + * @return possible object is {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getDateOfBirth() { + return dateOfBirth; + } + + /** + * Sets the value of the dateOfBirth property. + * + * @param value + * allowed object is {@link XMLGregorianCalendar } + * + */ + public void setDateOfBirth(XMLGregorianCalendar value) { + this.dateOfBirth = value; + } + + /** + * Gets the value of the studentIdentificationNumber property. + * + * @return possible object is {@link String } + * + */ + public String getStudentIdentificationNumber() { + return studentIdentificationNumber; + } + + /** + * Sets the value of the studentIdentificationNumber property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setStudentIdentificationNumber(String value) { + this.studentIdentificationNumber = value; + } + + /** + * Gets the value of the countryOfBirth property. + * + * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth } + * + */ + public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth getCountryOfBirth() { + return countryOfBirth; + } + + /** + * Sets the value of the countryOfBirth property. + * + * @param value + * allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth } + * + */ + public void setCountryOfBirth(InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth value) { + this.countryOfBirth = value; + } + + /** + * Gets the value of the placeOfBirth property. + * + * @return possible object is {@link String } + * + */ + public String getPlaceOfBirth() { + return placeOfBirth; + } + + /** + * Sets the value of the placeOfBirth property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setPlaceOfBirth(String value) { + this.placeOfBirth = value; + } + + /** + * Gets the value of the gender property. + * + * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender } + * + */ + public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() { + return gender; + } + + /** + * Sets the value of the gender property. + * + * @param value + * allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender } + * + */ + public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) { + this.gender = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="country" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class CountryOfBirth { + + @XmlValue + protected String value; + @XmlAttribute(name = "country") + protected CountryType country; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link CountryType } + * + */ + public CountryType getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link CountryType } + * + */ + public void setCountry(CountryType value) { + this.country = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="gender" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}GenderType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Gender { + + @XmlValue + protected String value; + @XmlAttribute(name = "gender", required = true) + protected GenderType gender; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the gender property. + * + * @return possible object is {@link GenderType } + * + */ + public GenderType getGender() { + return gender; + } + + /** + * Sets the value of the gender property. + * + * @param value + * allowed object is {@link GenderType } + * + */ + public void setGender(GenderType value) { + this.gender = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java index 3820c55a3..31a38bbc4 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Information identifying the qualification * - *

    Java class for InformationIdentifyingTheQualificationType complex type. + *

    + * Java class for InformationIdentifyingTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationIdentifyingTheQualificationType">
    @@ -41,171 +41,147 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = {
    -    "qualification",
    -    "titleConferred",
    -    "mainFieldsOfStudy",
    -    "nameAndStatusOfAwardingInstitution",
    -    "nameAndStatusOfInstitutionAdministeringStudies",
    -    "languagesOfInstructionAndExamination"
    -})
    +@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = { "qualification", "titleConferred", "mainFieldsOfStudy", "nameAndStatusOfAwardingInstitution",
    +		"nameAndStatusOfInstitutionAdministeringStudies", "languagesOfInstructionAndExamination" })
     public class InformationIdentifyingTheQualificationType {
     
    -    @XmlElement(name = "Qualification", required = true)
    -    protected QualificationType qualification;
    -    @XmlElement(name = "TitleConferred")
    -    protected TitleConferredType titleConferred;
    -    @XmlElement(name = "MainFieldsOfStudy", required = true)
    -    protected RichTextTagType mainFieldsOfStudy;
    -    @XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
    -    protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
    -    @XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
    -    protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
    -    @XmlElement(name = "LanguagesOfInstructionAndExamination", required = true)
    -    protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
    -
    -    /**
    -     * Gets the value of the qualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link QualificationType }
    -     *     
    -     */
    -    public QualificationType getQualification() {
    -        return qualification;
    -    }
    -
    -    /**
    -     * Sets the value of the qualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link QualificationType }
    -     *     
    -     */
    -    public void setQualification(QualificationType value) {
    -        this.qualification = value;
    -    }
    -
    -    /**
    -     * Gets the value of the titleConferred property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link TitleConferredType }
    -     *     
    -     */
    -    public TitleConferredType getTitleConferred() {
    -        return titleConferred;
    -    }
    -
    -    /**
    -     * Sets the value of the titleConferred property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link TitleConferredType }
    -     *     
    -     */
    -    public void setTitleConferred(TitleConferredType value) {
    -        this.titleConferred = value;
    -    }
    -
    -    /**
    -     * Gets the value of the mainFieldsOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getMainFieldsOfStudy() {
    -        return mainFieldsOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the mainFieldsOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setMainFieldsOfStudy(RichTextTagType value) {
    -        this.mainFieldsOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nameAndStatusOfAwardingInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link NameAndStatusOfAwardingInstitutionType }
    -     *     
    -     */
    -    public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
    -        return nameAndStatusOfAwardingInstitution;
    -    }
    -
    -    /**
    -     * Sets the value of the nameAndStatusOfAwardingInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link NameAndStatusOfAwardingInstitutionType }
    -     *     
    -     */
    -    public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
    -        this.nameAndStatusOfAwardingInstitution = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    -     *     
    -     */
    -    public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
    -        return nameAndStatusOfInstitutionAdministeringStudies;
    -    }
    -
    -    /**
    -     * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    -     *     
    -     */
    -    public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
    -        this.nameAndStatusOfInstitutionAdministeringStudies = value;
    -    }
    -
    -    /**
    -     * Gets the value of the languagesOfInstructionAndExamination property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LanguagesOfInstructionAndExaminationType }
    -     *     
    -     */
    -    public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
    -        return languagesOfInstructionAndExamination;
    -    }
    -
    -    /**
    -     * Sets the value of the languagesOfInstructionAndExamination property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LanguagesOfInstructionAndExaminationType }
    -     *     
    -     */
    -    public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
    -        this.languagesOfInstructionAndExamination = value;
    -    }
    +	@XmlElement(name = "Qualification", required = true)
    +	protected QualificationType qualification;
    +	@XmlElement(name = "TitleConferred")
    +	protected TitleConferredType titleConferred;
    +	@XmlElement(name = "MainFieldsOfStudy", required = true)
    +	protected RichTextTagType mainFieldsOfStudy;
    +	@XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
    +	protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
    +	@XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
    +	protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
    +	@XmlElement(name = "LanguagesOfInstructionAndExamination", required = true)
    +	protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
    +
    +	/**
    +	 * Gets the value of the qualification property.
    +	 * 
    +	 * @return possible object is {@link QualificationType }
    +	 * 
    +	 */
    +	public QualificationType getQualification() {
    +		return qualification;
    +	}
    +
    +	/**
    +	 * Sets the value of the qualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link QualificationType }
    +	 * 
    +	 */
    +	public void setQualification(QualificationType value) {
    +		this.qualification = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the titleConferred property.
    +	 * 
    +	 * @return possible object is {@link TitleConferredType }
    +	 * 
    +	 */
    +	public TitleConferredType getTitleConferred() {
    +		return titleConferred;
    +	}
    +
    +	/**
    +	 * Sets the value of the titleConferred property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link TitleConferredType }
    +	 * 
    +	 */
    +	public void setTitleConferred(TitleConferredType value) {
    +		this.titleConferred = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the mainFieldsOfStudy property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getMainFieldsOfStudy() {
    +		return mainFieldsOfStudy;
    +	}
    +
    +	/**
    +	 * Sets the value of the mainFieldsOfStudy property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setMainFieldsOfStudy(RichTextTagType value) {
    +		this.mainFieldsOfStudy = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the nameAndStatusOfAwardingInstitution property.
    +	 * 
    +	 * @return possible object is {@link NameAndStatusOfAwardingInstitutionType }
    +	 * 
    +	 */
    +	public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
    +		return nameAndStatusOfAwardingInstitution;
    +	}
    +
    +	/**
    +	 * Sets the value of the nameAndStatusOfAwardingInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link NameAndStatusOfAwardingInstitutionType }
    +	 * 
    +	 */
    +	public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
    +		this.nameAndStatusOfAwardingInstitution = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    +	 * 
    +	 * @return possible object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    +	 * 
    +	 */
    +	public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
    +		return nameAndStatusOfInstitutionAdministeringStudies;
    +	}
    +
    +	/**
    +	 * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    +	 * 
    +	 */
    +	public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
    +		this.nameAndStatusOfInstitutionAdministeringStudies = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the languagesOfInstructionAndExamination property.
    +	 * 
    +	 * @return possible object is {@link LanguagesOfInstructionAndExaminationType }
    +	 * 
    +	 */
    +	public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
    +		return languagesOfInstructionAndExamination;
    +	}
    +
    +	/**
    +	 * Sets the value of the languagesOfInstructionAndExamination property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link LanguagesOfInstructionAndExaminationType }
    +	 * 
    +	 */
    +	public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
    +		this.languagesOfInstructionAndExamination = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java
    index 68869c7ba..274a01e32 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Information on the contents and results gained
      * 
    - * 

    Java class for InformationOnTheContentsAndResultsGainedType complex type. + *

    + * Java class for InformationOnTheContentsAndResultsGainedType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationOnTheContentsAndResultsGainedType">
    @@ -49,197 +49,173 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = {
    -    "modeOfStudy",
    -    "programmeRequirements",
    -    "programmeDetails",
    -    "gradingSchemeAndGradeDistributionGuidance",
    -    "overallClassificationOfTheQualification"
    -})
    +@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = { "modeOfStudy", "programmeRequirements", "programmeDetails", "gradingSchemeAndGradeDistributionGuidance",
    +		"overallClassificationOfTheQualification" })
     public class InformationOnTheContentsAndResultsGainedType {
     
    -    @XmlElement(name = "ModeOfStudy", required = true)
    -    protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy;
    -    @XmlElement(name = "ProgrammeRequirements", required = true)
    -    protected ProgrammeRequirementsType programmeRequirements;
    -    @XmlElement(name = "ProgrammeDetails", required = true)
    -    protected ProgrammeDetailsType programmeDetails;
    -    @XmlElement(name = "GradingSchemeAndGradeDistributionGuidance", required = true)
    -    protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance;
    -    @XmlElement(name = "OverallClassificationOfTheQualification", required = true)
    -    protected RichTextTagType overallClassificationOfTheQualification;
    -
    -    /**
    -     * Gets the value of the modeOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
    -     *     
    -     */
    -    public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() {
    -        return modeOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the modeOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
    -     *     
    -     */
    -    public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) {
    -        this.modeOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the programmeRequirements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ProgrammeRequirementsType }
    -     *     
    -     */
    -    public ProgrammeRequirementsType getProgrammeRequirements() {
    -        return programmeRequirements;
    -    }
    -
    -    /**
    -     * Sets the value of the programmeRequirements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ProgrammeRequirementsType }
    -     *     
    -     */
    -    public void setProgrammeRequirements(ProgrammeRequirementsType value) {
    -        this.programmeRequirements = value;
    -    }
    -
    -    /**
    -     * Gets the value of the programmeDetails property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ProgrammeDetailsType }
    -     *     
    -     */
    -    public ProgrammeDetailsType getProgrammeDetails() {
    -        return programmeDetails;
    -    }
    -
    -    /**
    -     * Sets the value of the programmeDetails property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ProgrammeDetailsType }
    -     *     
    -     */
    -    public void setProgrammeDetails(ProgrammeDetailsType value) {
    -        this.programmeDetails = value;
    -    }
    -
    -    /**
    -     * Gets the value of the gradingSchemeAndGradeDistributionGuidance property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
    -     *     
    -     */
    -    public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() {
    -        return gradingSchemeAndGradeDistributionGuidance;
    -    }
    -
    -    /**
    -     * Sets the value of the gradingSchemeAndGradeDistributionGuidance property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
    -     *     
    -     */
    -    public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) {
    -        this.gradingSchemeAndGradeDistributionGuidance = value;
    -    }
    -
    -    /**
    -     * Gets the value of the overallClassificationOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getOverallClassificationOfTheQualification() {
    -        return overallClassificationOfTheQualification;
    -    }
    -
    -    /**
    -     * Sets the value of the overallClassificationOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setOverallClassificationOfTheQualification(RichTextTagType value) {
    -        this.overallClassificationOfTheQualification = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    -     *       <attribute name="modeOfStudy" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfStudyType" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class ModeOfStudy - extends RichTextTagType - { - - @XmlAttribute(name = "modeOfStudy", required = true) - protected ModeOfStudyType modeOfStudy; - - /** - * Gets the value of the modeOfStudy property. - * - * @return - * possible object is - * {@link ModeOfStudyType } - * - */ - public ModeOfStudyType getModeOfStudy() { - return modeOfStudy; - } - - /** - * Sets the value of the modeOfStudy property. - * - * @param value - * allowed object is - * {@link ModeOfStudyType } - * - */ - public void setModeOfStudy(ModeOfStudyType value) { - this.modeOfStudy = value; - } - - } + @XmlElement(name = "ModeOfStudy", required = true) + protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy; + @XmlElement(name = "ProgrammeRequirements", required = true) + protected ProgrammeRequirementsType programmeRequirements; + @XmlElement(name = "ProgrammeDetails", required = true) + protected ProgrammeDetailsType programmeDetails; + @XmlElement(name = "GradingSchemeAndGradeDistributionGuidance", required = true) + protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance; + @XmlElement(name = "OverallClassificationOfTheQualification", required = true) + protected RichTextTagType overallClassificationOfTheQualification; + + /** + * Gets the value of the modeOfStudy property. + * + * @return possible object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } + * + */ + public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() { + return modeOfStudy; + } + + /** + * Sets the value of the modeOfStudy property. + * + * @param value + * allowed object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } + * + */ + public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) { + this.modeOfStudy = value; + } + + /** + * Gets the value of the programmeRequirements property. + * + * @return possible object is {@link ProgrammeRequirementsType } + * + */ + public ProgrammeRequirementsType getProgrammeRequirements() { + return programmeRequirements; + } + + /** + * Sets the value of the programmeRequirements property. + * + * @param value + * allowed object is {@link ProgrammeRequirementsType } + * + */ + public void setProgrammeRequirements(ProgrammeRequirementsType value) { + this.programmeRequirements = value; + } + + /** + * Gets the value of the programmeDetails property. + * + * @return possible object is {@link ProgrammeDetailsType } + * + */ + public ProgrammeDetailsType getProgrammeDetails() { + return programmeDetails; + } + + /** + * Sets the value of the programmeDetails property. + * + * @param value + * allowed object is {@link ProgrammeDetailsType } + * + */ + public void setProgrammeDetails(ProgrammeDetailsType value) { + this.programmeDetails = value; + } + + /** + * Gets the value of the gradingSchemeAndGradeDistributionGuidance property. + * + * @return possible object is {@link GradingSchemeAndGradeDistributionGuidanceType } + * + */ + public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() { + return gradingSchemeAndGradeDistributionGuidance; + } + + /** + * Sets the value of the gradingSchemeAndGradeDistributionGuidance property. + * + * @param value + * allowed object is {@link GradingSchemeAndGradeDistributionGuidanceType } + * + */ + public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) { + this.gradingSchemeAndGradeDistributionGuidance = value; + } + + /** + * Gets the value of the overallClassificationOfTheQualification property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getOverallClassificationOfTheQualification() { + return overallClassificationOfTheQualification; + } + + /** + * Sets the value of the overallClassificationOfTheQualification property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setOverallClassificationOfTheQualification(RichTextTagType value) { + this.overallClassificationOfTheQualification = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    +	 *       <attribute name="modeOfStudy" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfStudyType" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class ModeOfStudy extends RichTextTagType { + + @XmlAttribute(name = "modeOfStudy", required = true) + protected ModeOfStudyType modeOfStudy; + + /** + * Gets the value of the modeOfStudy property. + * + * @return possible object is {@link ModeOfStudyType } + * + */ + public ModeOfStudyType getModeOfStudy() { + return modeOfStudy; + } + + /** + * Sets the value of the modeOfStudy property. + * + * @param value + * allowed object is {@link ModeOfStudyType } + * + */ + public void setModeOfStudy(ModeOfStudyType value) { + this.modeOfStudy = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java index e16bb9b22..383caae19 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Information on the function of the qualification type * - *

    Java class for InformationOnTheFunctionOfTheQualificationType complex type. + *

    + * Java class for InformationOnTheFunctionOfTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationOnTheFunctionOfTheQualificationType">
    @@ -46,116 +46,103 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = {
    -    "accessToFurtherStudy",
    -    "professionalStatus"
    -})
    +@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = { "accessToFurtherStudy", "professionalStatus" })
     public class InformationOnTheFunctionOfTheQualificationType {
     
    -    @XmlElement(name = "AccessToFurtherStudy", required = true)
    -    protected RichTextTagType accessToFurtherStudy;
    -    @XmlElement(name = "ProfessionalStatus")
    -    protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus;
    -
    -    /**
    -     * Gets the value of the accessToFurtherStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAccessToFurtherStudy() {
    -        return accessToFurtherStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the accessToFurtherStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAccessToFurtherStudy(RichTextTagType value) {
    -        this.accessToFurtherStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the professionalStatus property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
    -     *     
    -     */
    -    public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() {
    -        return professionalStatus;
    -    }
    -
    -    /**
    -     * Sets the value of the professionalStatus property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
    -     *     
    -     */
    -    public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) {
    -        this.professionalStatus = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    -     *       <attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class ProfessionalStatus - extends RichTextTagType - { - - @XmlAttribute(name = "isRegulatedProfession") - protected Boolean isRegulatedProfession; - - /** - * Gets the value of the isRegulatedProfession property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsRegulatedProfession() { - return isRegulatedProfession; - } - - /** - * Sets the value of the isRegulatedProfession property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsRegulatedProfession(Boolean value) { - this.isRegulatedProfession = value; - } - - } + @XmlElement(name = "AccessToFurtherStudy", required = true) + protected RichTextTagType accessToFurtherStudy; + @XmlElement(name = "ProfessionalStatus") + protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus; + + /** + * Gets the value of the accessToFurtherStudy property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAccessToFurtherStudy() { + return accessToFurtherStudy; + } + + /** + * Sets the value of the accessToFurtherStudy property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAccessToFurtherStudy(RichTextTagType value) { + this.accessToFurtherStudy = value; + } + + /** + * Gets the value of the professionalStatus property. + * + * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } + * + */ + public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() { + return professionalStatus; + } + + /** + * Sets the value of the professionalStatus property. + * + * @param value + * allowed object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } + * + */ + public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) { + this.professionalStatus = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    +	 *       <attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class ProfessionalStatus extends RichTextTagType { + + @XmlAttribute(name = "isRegulatedProfession") + protected Boolean isRegulatedProfession; + + /** + * Gets the value of the isRegulatedProfession property. + * + * @return possible object is {@link Boolean } + * + */ + public Boolean isIsRegulatedProfession() { + return isRegulatedProfession; + } + + /** + * Sets the value of the isRegulatedProfession property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setIsRegulatedProfession(Boolean value) { + this.isRegulatedProfession = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java index 796130137..27282fe36 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.math.BigDecimal; @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Information on the level of the qualification * - *

    Java class for InformationOnTheLevelOfTheQualificationType complex type. + *

    + * Java class for InformationOnTheLevelOfTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationOnTheLevelOfTheQualificationType">
    @@ -61,331 +61,295 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = {
    -    "level",
    -    "officialLengthOfProgramme",
    -    "accessRequirements"
    -})
    +@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = { "level", "officialLengthOfProgramme", "accessRequirements" })
     public class InformationOnTheLevelOfTheQualificationType {
     
    -    @XmlElement(name = "Level", required = true)
    -    protected InformationOnTheLevelOfTheQualificationType.Level level;
    -    @XmlElement(name = "OfficialLengthOfProgramme", required = true)
    -    protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme;
    -    @XmlElement(name = "AccessRequirements", required = true)
    -    protected RichTextTagType accessRequirements;
    -
    -    /**
    -     * Gets the value of the level property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
    -     *     
    -     */
    -    public InformationOnTheLevelOfTheQualificationType.Level getLevel() {
    -        return level;
    -    }
    -
    -    /**
    -     * Sets the value of the level property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
    -     *     
    -     */
    -    public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) {
    -        this.level = value;
    -    }
    -
    -    /**
    -     * Gets the value of the officialLengthOfProgramme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
    -     *     
    -     */
    -    public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() {
    -        return officialLengthOfProgramme;
    -    }
    -
    -    /**
    -     * Sets the value of the officialLengthOfProgramme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
    -     *     
    -     */
    -    public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) {
    -        this.officialLengthOfProgramme = value;
    -    }
    -
    -    /**
    -     * Gets the value of the accessRequirements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAccessRequirements() {
    -        return accessRequirements;
    -    }
    -
    -    /**
    -     * Sets the value of the accessRequirements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAccessRequirements(RichTextTagType value) {
    -        this.accessRequirements = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    -     *       <attribute name="isced1997" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED1997Type" />
    -     *       <attribute name="isced2011" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED2011Type" />
    -     *       <attribute name="eheaFramework" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
    -     *       <attribute name="nfq" type="{urn:crue:academic:xsd:language:diplomasupplement}NFQType" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Level - extends RichTextTagType - { - - @XmlAttribute(name = "isced1997") - protected String isced1997; - @XmlAttribute(name = "isced2011") - protected String isced2011; - @XmlAttribute(name = "eheaFramework") - protected EHEAFrameworkType eheaFramework; - @XmlAttribute(name = "nfq") - protected String nfq; - - /** - * Gets the value of the isced1997 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIsced1997() { - return isced1997; - } - - /** - * Sets the value of the isced1997 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIsced1997(String value) { - this.isced1997 = value; - } - - /** - * Gets the value of the isced2011 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIsced2011() { - return isced2011; - } - - /** - * Sets the value of the isced2011 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIsced2011(String value) { - this.isced2011 = value; - } - - /** - * Gets the value of the eheaFramework property. - * - * @return - * possible object is - * {@link EHEAFrameworkType } - * - */ - public EHEAFrameworkType getEheaFramework() { - return eheaFramework; - } - - /** - * Sets the value of the eheaFramework property. - * - * @param value - * allowed object is - * {@link EHEAFrameworkType } - * - */ - public void setEheaFramework(EHEAFrameworkType value) { - this.eheaFramework = value; - } - - /** - * Gets the value of the nfq property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNfq() { - return nfq; - } - - /** - * Sets the value of the nfq property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNfq(String value) { - this.nfq = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    -     *       <attribute name="ectsCredits" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
    -     *       <attribute name="years" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
    -     *       <attribute name="semesters" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveIntegerType" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class OfficialLengthOfProgramme - extends RichTextTagType - { - - @XmlAttribute(name = "ectsCredits") - protected BigDecimal ectsCredits; - @XmlAttribute(name = "years", required = true) - protected BigDecimal years; - @XmlAttribute(name = "semesters") - protected Integer semesters; - - /** - * Gets the value of the ectsCredits property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getEctsCredits() { - return ectsCredits; - } - - /** - * Sets the value of the ectsCredits property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setEctsCredits(BigDecimal value) { - this.ectsCredits = value; - } - - /** - * Gets the value of the years property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getYears() { - return years; - } - - /** - * Sets the value of the years property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setYears(BigDecimal value) { - this.years = value; - } - - /** - * Gets the value of the semesters property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getSemesters() { - return semesters; - } - - /** - * Sets the value of the semesters property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setSemesters(Integer value) { - this.semesters = value; - } - - } + @XmlElement(name = "Level", required = true) + protected InformationOnTheLevelOfTheQualificationType.Level level; + @XmlElement(name = "OfficialLengthOfProgramme", required = true) + protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme; + @XmlElement(name = "AccessRequirements", required = true) + protected RichTextTagType accessRequirements; + + /** + * Gets the value of the level property. + * + * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.Level } + * + */ + public InformationOnTheLevelOfTheQualificationType.Level getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + * @param value + * allowed object is {@link InformationOnTheLevelOfTheQualificationType.Level } + * + */ + public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) { + this.level = value; + } + + /** + * Gets the value of the officialLengthOfProgramme property. + * + * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } + * + */ + public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() { + return officialLengthOfProgramme; + } + + /** + * Sets the value of the officialLengthOfProgramme property. + * + * @param value + * allowed object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } + * + */ + public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) { + this.officialLengthOfProgramme = value; + } + + /** + * Gets the value of the accessRequirements property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAccessRequirements() { + return accessRequirements; + } + + /** + * Sets the value of the accessRequirements property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAccessRequirements(RichTextTagType value) { + this.accessRequirements = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    +	 *       <attribute name="isced1997" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED1997Type" />
    +	 *       <attribute name="isced2011" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED2011Type" />
    +	 *       <attribute name="eheaFramework" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
    +	 *       <attribute name="nfq" type="{urn:crue:academic:xsd:language:diplomasupplement}NFQType" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Level extends RichTextTagType { + + @XmlAttribute(name = "isced1997") + protected String isced1997; + @XmlAttribute(name = "isced2011") + protected String isced2011; + @XmlAttribute(name = "eheaFramework") + protected EHEAFrameworkType eheaFramework; + @XmlAttribute(name = "nfq") + protected String nfq; + + /** + * Gets the value of the isced1997 property. + * + * @return possible object is {@link String } + * + */ + public String getIsced1997() { + return isced1997; + } + + /** + * Sets the value of the isced1997 property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setIsced1997(String value) { + this.isced1997 = value; + } + + /** + * Gets the value of the isced2011 property. + * + * @return possible object is {@link String } + * + */ + public String getIsced2011() { + return isced2011; + } + + /** + * Sets the value of the isced2011 property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setIsced2011(String value) { + this.isced2011 = value; + } + + /** + * Gets the value of the eheaFramework property. + * + * @return possible object is {@link EHEAFrameworkType } + * + */ + public EHEAFrameworkType getEheaFramework() { + return eheaFramework; + } + + /** + * Sets the value of the eheaFramework property. + * + * @param value + * allowed object is {@link EHEAFrameworkType } + * + */ + public void setEheaFramework(EHEAFrameworkType value) { + this.eheaFramework = value; + } + + /** + * Gets the value of the nfq property. + * + * @return possible object is {@link String } + * + */ + public String getNfq() { + return nfq; + } + + /** + * Sets the value of the nfq property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setNfq(String value) { + this.nfq = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    +	 *       <attribute name="ectsCredits" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
    +	 *       <attribute name="years" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
    +	 *       <attribute name="semesters" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveIntegerType" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class OfficialLengthOfProgramme extends RichTextTagType { + + @XmlAttribute(name = "ectsCredits") + protected BigDecimal ectsCredits; + @XmlAttribute(name = "years", required = true) + protected BigDecimal years; + @XmlAttribute(name = "semesters") + protected Integer semesters; + + /** + * Gets the value of the ectsCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getEctsCredits() { + return ectsCredits; + } + + /** + * Sets the value of the ectsCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setEctsCredits(BigDecimal value) { + this.ectsCredits = value; + } + + /** + * Gets the value of the years property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getYears() { + return years; + } + + /** + * Sets the value of the years property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setYears(BigDecimal value) { + this.years = value; + } + + /** + * Gets the value of the semesters property. + * + * @return possible object is {@link Integer } + * + */ + public Integer getSemesters() { + return semesters; + } + + /** + * Sets the value of the semesters property. + * + * @param value + * allowed object is {@link Integer } + * + */ + public void setSemesters(Integer value) { + this.semesters = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java index c19db9312..a99aca0f7 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -18,13 +17,14 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; - /** * Name and status of the institution * - *

    Java class for InstitutionType complex type. + *

    + * Java class for InstitutionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InstitutionType">
    @@ -64,391 +64,344 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InstitutionType", propOrder = {
    -    "name",
    -    "status",
    -    "country",
    -    "additionalInformation",
    -    "contactInformation",
    -    "attachedImageRef"
    -})
    -@XmlSeeAlso({
    -    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
    -    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class
    -})
    +@XmlType(name = "InstitutionType", propOrder = { "name", "status", "country", "additionalInformation", "contactInformation", "attachedImageRef" })
    +@XmlSeeAlso({ eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
    +		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class })
     public class InstitutionType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    -    @XmlElement(name = "Status", required = true)
    -    protected String status;
    -    @XmlElement(name = "Country", required = true)
    -    protected InstitutionType.Country country;
    -    @XmlElement(name = "AdditionalInformation")
    -    protected RichTextTagType additionalInformation;
    -    @XmlElement(name = "ContactInformation")
    -    protected ContactInformationType contactInformation;
    -    @XmlElement(name = "AttachedImageRef")
    -    protected InstitutionType.AttachedImageRef attachedImageRef;
    -    @XmlAttribute(name = "nationalID")
    -    protected String nationalID;
    -    @XmlAttribute(name = "erasmusID")
    -    protected String erasmusID;
    -
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    -
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    -
    -    /**
    -     * Gets the value of the status property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStatus() {
    -        return status;
    -    }
    -
    -    /**
    -     * Sets the value of the status property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStatus(String value) {
    -        this.status = value;
    -    }
    -
    -    /**
    -     * Gets the value of the country property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InstitutionType.Country }
    -     *     
    -     */
    -    public InstitutionType.Country getCountry() {
    -        return country;
    -    }
    -
    -    /**
    -     * Sets the value of the country property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InstitutionType.Country }
    -     *     
    -     */
    -    public void setCountry(InstitutionType.Country value) {
    -        this.country = value;
    -    }
    -
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    -
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAdditionalInformation(RichTextTagType value) {
    -        this.additionalInformation = value;
    -    }
    -
    -    /**
    -     * Gets the value of the contactInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ContactInformationType }
    -     *     
    -     */
    -    public ContactInformationType getContactInformation() {
    -        return contactInformation;
    -    }
    -
    -    /**
    -     * Sets the value of the contactInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ContactInformationType }
    -     *     
    -     */
    -    public void setContactInformation(ContactInformationType value) {
    -        this.contactInformation = value;
    -    }
    -
    -    /**
    -     * Gets the value of the attachedImageRef property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InstitutionType.AttachedImageRef }
    -     *     
    -     */
    -    public InstitutionType.AttachedImageRef getAttachedImageRef() {
    -        return attachedImageRef;
    -    }
    -
    -    /**
    -     * Sets the value of the attachedImageRef property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InstitutionType.AttachedImageRef }
    -     *     
    -     */
    -    public void setAttachedImageRef(InstitutionType.AttachedImageRef value) {
    -        this.attachedImageRef = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nationalID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNationalID() {
    -        return nationalID;
    -    }
    -
    -    /**
    -     * Sets the value of the nationalID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNationalID(String value) {
    -        this.nationalID = value;
    -    }
    -
    -    /**
    -     * Gets the value of the erasmusID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getErasmusID() {
    -        return erasmusID;
    -    }
    -
    -    /**
    -     * Sets the value of the erasmusID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setErasmusID(String value) {
    -        this.erasmusID = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class AttachedImageRef { - - @XmlValue - protected String value; - @XmlAttribute(name = "attachedID", required = true) - @XmlIDREF - @XmlSchemaType(name = "IDREF") - protected Object attachedID; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the attachedID property. - * - * @return - * possible object is - * {@link Object } - * - */ - public Object getAttachedID() { - return attachedID; - } - - /** - * Sets the value of the attachedID property. - * - * @param value - * allowed object is - * {@link Object } - * - */ - public void setAttachedID(Object value) { - this.attachedID = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Country { - - @XmlValue - protected String value; - @XmlAttribute(name = "country", required = true) - protected CountryType country; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link CountryType } - * - */ - public CountryType getCountry() { - return country; - } - - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link CountryType } - * - */ - public void setCountry(CountryType value) { - this.country = value; - } - - } + @XmlElement(name = "Name", required = true) + protected String name; + @XmlElement(name = "Status", required = true) + protected String status; + @XmlElement(name = "Country", required = true) + protected InstitutionType.Country country; + @XmlElement(name = "AdditionalInformation") + protected RichTextTagType additionalInformation; + @XmlElement(name = "ContactInformation") + protected ContactInformationType contactInformation; + @XmlElement(name = "AttachedImageRef") + protected InstitutionType.AttachedImageRef attachedImageRef; + @XmlAttribute(name = "nationalID") + protected String nationalID; + @XmlAttribute(name = "erasmusID") + protected String erasmusID; + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the status property. + * + * @return possible object is {@link String } + * + */ + public String getStatus() { + return status; + } + + /** + * Sets the value of the status property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setStatus(String value) { + this.status = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link InstitutionType.Country } + * + */ + public InstitutionType.Country getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link InstitutionType.Country } + * + */ + public void setCountry(InstitutionType.Country value) { + this.country = value; + } + + /** + * Gets the value of the additionalInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAdditionalInformation() { + return additionalInformation; + } + + /** + * Sets the value of the additionalInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAdditionalInformation(RichTextTagType value) { + this.additionalInformation = value; + } + + /** + * Gets the value of the contactInformation property. + * + * @return possible object is {@link ContactInformationType } + * + */ + public ContactInformationType getContactInformation() { + return contactInformation; + } + + /** + * Sets the value of the contactInformation property. + * + * @param value + * allowed object is {@link ContactInformationType } + * + */ + public void setContactInformation(ContactInformationType value) { + this.contactInformation = value; + } + + /** + * Gets the value of the attachedImageRef property. + * + * @return possible object is {@link InstitutionType.AttachedImageRef } + * + */ + public InstitutionType.AttachedImageRef getAttachedImageRef() { + return attachedImageRef; + } + + /** + * Sets the value of the attachedImageRef property. + * + * @param value + * allowed object is {@link InstitutionType.AttachedImageRef } + * + */ + public void setAttachedImageRef(InstitutionType.AttachedImageRef value) { + this.attachedImageRef = value; + } + + /** + * Gets the value of the nationalID property. + * + * @return possible object is {@link String } + * + */ + public String getNationalID() { + return nationalID; + } + + /** + * Sets the value of the nationalID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setNationalID(String value) { + this.nationalID = value; + } + + /** + * Gets the value of the erasmusID property. + * + * @return possible object is {@link String } + * + */ + public String getErasmusID() { + return erasmusID; + } + + /** + * Sets the value of the erasmusID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setErasmusID(String value) { + this.erasmusID = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class AttachedImageRef { + + @XmlValue + protected String value; + @XmlAttribute(name = "attachedID", required = true) + @XmlIDREF + @XmlSchemaType(name = "IDREF") + protected Object attachedID; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the attachedID property. + * + * @return possible object is {@link Object } + * + */ + public Object getAttachedID() { + return attachedID; + } + + /** + * Sets the value of the attachedID property. + * + * @param value + * allowed object is {@link Object } + * + */ + public void setAttachedID(Object value) { + this.attachedID = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Country { + + @XmlValue + protected String value; + @XmlAttribute(name = "country", required = true) + protected CountryType country; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link CountryType } + * + */ + public CountryType getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link CountryType } + * + */ + public void setCountry(CountryType value) { + this.country = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java index 7cbc99872..7efdf9488 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for LanguageType. + *

    + * Java class for LanguageType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="LanguageType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -128,709 +129,708 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum LanguageType {
     
    -
    -    /**
    -     * Abkhazian
    -     * 
    -     */
    -    @XmlEnumValue("ab")
    -    AB("ab"),
    -
    -    /**
    -     * Afrikaans
    -     * 
    -     */
    -    @XmlEnumValue("af")
    -    AF("af"),
    -
    -    /**
    -     * Aragonese
    -     * 
    -     */
    -    @XmlEnumValue("an")
    -    AN("an"),
    -
    -    /**
    -     * Arabic
    -     * 
    -     */
    -    @XmlEnumValue("ar")
    -    AR("ar"),
    -
    -    /**
    -     * Assamese
    -     * 
    -     */
    -    @XmlEnumValue("as")
    -    AS("as"),
    -
    -    /**
    -     * Azerbaijani
    -     * 
    -     */
    -    @XmlEnumValue("az")
    -    AZ("az"),
    -
    -    /**
    -     * Belarusian
    -     * 
    -     */
    -    @XmlEnumValue("be")
    -    BE("be"),
    -
    -    /**
    -     * Bulgarian
    -     * 
    -     */
    -    @XmlEnumValue("bg")
    -    BG("bg"),
    -
    -    /**
    -     * Bengali
    -     * 
    -     */
    -    @XmlEnumValue("bn")
    -    BN("bn"),
    -
    -    /**
    -     * Tibetan
    -     * 
    -     */
    -    @XmlEnumValue("bo")
    -    BO("bo"),
    -
    -    /**
    -     * Breton
    -     * 
    -     */
    -    @XmlEnumValue("br")
    -    BR("br"),
    -
    -    /**
    -     * Bosnian
    -     * 
    -     */
    -    @XmlEnumValue("bs")
    -    BS("bs"),
    -
    -    /**
    -     * Catalan / Valencian
    -     * 
    -     */
    -    @XmlEnumValue("ca")
    -    CA("ca"),
    -
    -    /**
    -     * Chechen
    -     * 
    -     */
    -    @XmlEnumValue("ce")
    -    CE("ce"),
    -
    -    /**
    -     * Corsican
    -     * 
    -     */
    -    @XmlEnumValue("co")
    -    CO("co"),
    -
    -    /**
    -     * Czech
    -     * 
    -     */
    -    @XmlEnumValue("cs")
    -    CS("cs"),
    -
    -    /**
    -     * Welsh
    -     * 
    -     */
    -    @XmlEnumValue("cy")
    -    CY("cy"),
    -
    -    /**
    -     * Danish
    -     * 
    -     */
    -    @XmlEnumValue("da")
    -    DA("da"),
    -
    -    /**
    -     * German
    -     * 
    -     */
    -    @XmlEnumValue("de")
    -    DE("de"),
    -
    -    /**
    -     * Greek
    -     * 
    -     */
    -    @XmlEnumValue("el")
    -    EL("el"),
    -
    -    /**
    -     * English
    -     * 
    -     */
    -    @XmlEnumValue("en")
    -    EN("en"),
    -
    -    /**
    -     * Spanish / Castilian
    -     * 
    -     */
    -    @XmlEnumValue("es")
    -    ES("es"),
    -
    -    /**
    -     * Estonian
    -     * 
    -     */
    -    @XmlEnumValue("et")
    -    ET("et"),
    -
    -    /**
    -     * Basque
    -     * 
    -     */
    -    @XmlEnumValue("eu")
    -    EU("eu"),
    -
    -    /**
    -     * Persian
    -     * 
    -     */
    -    @XmlEnumValue("fa")
    -    FA("fa"),
    -
    -    /**
    -     * Finnish
    -     * 
    -     */
    -    @XmlEnumValue("fi")
    -    FI("fi"),
    -
    -    /**
    -     * Fijian
    -     * 
    -     */
    -    @XmlEnumValue("fj")
    -    FJ("fj"),
    -
    -    /**
    -     * Faroese
    -     * 
    -     */
    -    @XmlEnumValue("fo")
    -    FO("fo"),
    -
    -    /**
    -     * French
    -     * 
    -     */
    -    @XmlEnumValue("fr")
    -    FR("fr"),
    -
    -    /**
    -     * Western Frisian
    -     * 
    -     */
    -    @XmlEnumValue("fy")
    -    FY("fy"),
    -
    -    /**
    -     * Irish
    -     * 
    -     */
    -    @XmlEnumValue("ga")
    -    GA("ga"),
    -
    -    /**
    -     * Gaelic / Scottish Gaelic
    -     * 
    -     */
    -    @XmlEnumValue("gd")
    -    GD("gd"),
    -
    -    /**
    -     * Galician
    -     * 
    -     */
    -    @XmlEnumValue("gl")
    -    GL("gl"),
    -
    -    /**
    -     * Manx
    -     * 
    -     */
    -    @XmlEnumValue("gv")
    -    GV("gv"),
    -
    -    /**
    -     * Ancient Greek
    -     * 
    -     */
    -    @XmlEnumValue("grc")
    -    GRC("grc"),
    -
    -    /**
    -     * Alemanic; Swiss German
    -     * 
    -     */
    -    @XmlEnumValue("gsw")
    -    GSW("gsw"),
    -
    -    /**
    -     * Hebrew
    -     * 
    -     */
    -    @XmlEnumValue("he")
    -    HE("he"),
    -
    -    /**
    -     * Hindi
    -     * 
    -     */
    -    @XmlEnumValue("hi")
    -    HI("hi"),
    -
    -    /**
    -     * Croatian
    -     * 
    -     */
    -    @XmlEnumValue("hr")
    -    HR("hr"),
    -
    -    /**
    -     * Haitian; Haitian Creole
    -     * 
    -     */
    -    @XmlEnumValue("ht")
    -    HT("ht"),
    -
    -    /**
    -     * Hungarian
    -     * 
    -     */
    -    @XmlEnumValue("hu")
    -    HU("hu"),
    -
    -    /**
    -     * Armenian
    -     * 
    -     */
    -    @XmlEnumValue("hy")
    -    HY("hy"),
    -
    -    /**
    -     * Indonesian
    -     * 
    -     */
    -    @XmlEnumValue("id")
    -    ID("id"),
    -
    -    /**
    -     * Icelandic
    -     * 
    -     */
    -    @XmlEnumValue("is")
    -    IS("is"),
    -
    -    /**
    -     * Italian
    -     * 
    -     */
    -    @XmlEnumValue("it")
    -    IT("it"),
    -
    -    /**
    -     * Japanese
    -     * 
    -     */
    -    @XmlEnumValue("ja")
    -    JA("ja"),
    -
    -    /**
    -     * Javanese
    -     * 
    -     */
    -    @XmlEnumValue("jv")
    -    JV("jv"),
    -
    -    /**
    -     * Georgian
    -     * 
    -     */
    -    @XmlEnumValue("ka")
    -    KA("ka"),
    -
    -    /**
    -     * Kongo
    -     * 
    -     */
    -    @XmlEnumValue("kg")
    -    KG("kg"),
    -
    -    /**
    -     * Korean
    -     * 
    -     */
    -    @XmlEnumValue("ko")
    -    KO("ko"),
    -
    -    /**
    -     * Kurdish
    -     * 
    -     */
    -    @XmlEnumValue("ku")
    -    KU("ku"),
    -
    -    /**
    -     * Cornish
    -     * 
    -     */
    -    @XmlEnumValue("kw")
    -    KW("kw"),
    -
    -    /**
    -     * Kirghiz
    -     * 
    -     */
    -    @XmlEnumValue("ky")
    -    KY("ky"),
    -
    -    /**
    -     * Luxembourgish; Letzeburgesch
    -     * 
    -     */
    -    @XmlEnumValue("lb")
    -    LB("lb"),
    -
    -    /**
    -     * Limburgan; Limburger; Limburgish
    -     * 
    -     */
    -    @XmlEnumValue("li")
    -    LI("li"),
    -
    -    /**
    -     * Lingala
    -     * 
    -     */
    -    @XmlEnumValue("ln")
    -    LN("ln"),
    -
    -    /**
    -     * Lithuanian
    -     * 
    -     */
    -    @XmlEnumValue("lt")
    -    LT("lt"),
    -
    -    /**
    -     * Latvian
    -     * 
    -     */
    -    @XmlEnumValue("lv")
    -    LV("lv"),
    -
    -    /**
    -     * Malagasy
    -     * 
    -     */
    -    @XmlEnumValue("mg")
    -    MG("mg"),
    -
    -    /**
    -     * Macedonian
    -     * 
    -     */
    -    @XmlEnumValue("mk")
    -    MK("mk"),
    -
    -    /**
    -     * Mongolian
    -     * 
    -     */
    -    @XmlEnumValue("mn")
    -    MN("mn"),
    -
    -    /**
    -     * Moldavian
    -     * 
    -     */
    -    @XmlEnumValue("mo")
    -    MO("mo"),
    -
    -    /**
    -     * Malay
    -     * 
    -     */
    -    @XmlEnumValue("ms")
    -    MS("ms"),
    -
    -    /**
    -     * Maltese
    -     * 
    -     */
    -    @XmlEnumValue("mt")
    -    MT("mt"),
    -
    -    /**
    -     * Burmese
    -     * 
    -     */
    -    @XmlEnumValue("my")
    -    MY("my"),
    -
    -    /**
    -     * Norwegian
    -     * 
    -     */
    -    @XmlEnumValue("nb")
    -    NB("nb"),
    -
    -    /**
    -     * Nepali
    -     * 
    -     */
    -    @XmlEnumValue("ne")
    -    NE("ne"),
    -
    -    /**
    -     * Dutch
    -     * 
    -     */
    -    @XmlEnumValue("nl")
    -    NL("nl"),
    -
    -    /**
    -     * Norwegian (Nynorsk)
    -     * 
    -     */
    -    @XmlEnumValue("nn")
    -    NN("nn"),
    -
    -    /**
    -     * Norwegian
    -     * 
    -     */
    -    @XmlEnumValue("no")
    -    NO("no"),
    -
    -    /**
    -     * Polish
    -     * 
    -     */
    -    @XmlEnumValue("pl")
    -    PL("pl"),
    -
    -    /**
    -     * Portuguese
    -     * 
    -     */
    -    @XmlEnumValue("pt")
    -    PT("pt"),
    -
    -    /**
    -     * Raeto-Romance
    -     * 
    -     */
    -    @XmlEnumValue("rm")
    -    RM("rm"),
    -
    -    /**
    -     * Romanian
    -     * 
    -     */
    -    @XmlEnumValue("ro")
    -    RO("ro"),
    -
    -    /**
    -     * Russian
    -     * 
    -     */
    -    @XmlEnumValue("ru")
    -    RU("ru"),
    -
    -    /**
    -     * Sardinian
    -     * 
    -     */
    -    @XmlEnumValue("sc")
    -    SC("sc"),
    -
    -    /**
    -     * Northern Sami
    -     * 
    -     */
    -    @XmlEnumValue("se")
    -    SE("se"),
    -
    -    /**
    -     * Slovak
    -     * 
    -     */
    -    @XmlEnumValue("sk")
    -    SK("sk"),
    -
    -    /**
    -     * Slovenian
    -     * 
    -     */
    -    @XmlEnumValue("sl")
    -    SL("sl"),
    -
    -    /**
    -     * Somali
    -     * 
    -     */
    -    @XmlEnumValue("so")
    -    SO("so"),
    -
    -    /**
    -     * Albanian
    -     * 
    -     */
    -    @XmlEnumValue("sq")
    -    SQ("sq"),
    -
    -    /**
    -     * Serbian
    -     * 
    -     */
    -    @XmlEnumValue("sr")
    -    SR("sr"),
    -
    -    /**
    -     * Swedish
    -     * 
    -     */
    -    @XmlEnumValue("sv")
    -    SV("sv"),
    -
    -    /**
    -     * Swahili
    -     * 
    -     */
    -    @XmlEnumValue("sw")
    -    SW("sw"),
    -
    -    /**
    -     * Turkmen
    -     * 
    -     */
    -    @XmlEnumValue("tk")
    -    TK("tk"),
    -
    -    /**
    -     * Turkish
    -     * 
    -     */
    -    @XmlEnumValue("tr")
    -    TR("tr"),
    -
    -    /**
    -     * Tahitian
    -     * 
    -     */
    -    @XmlEnumValue("ty")
    -    TY("ty"),
    -
    -    /**
    -     * Ukrainian
    -     * 
    -     */
    -    @XmlEnumValue("uk")
    -    UK("uk"),
    -
    -    /**
    -     * Urdu
    -     * 
    -     */
    -    @XmlEnumValue("ur")
    -    UR("ur"),
    -
    -    /**
    -     * Uzbek
    -     * 
    -     */
    -    @XmlEnumValue("uz")
    -    UZ("uz"),
    -
    -    /**
    -     * Vietnamese
    -     * 
    -     */
    -    @XmlEnumValue("vi")
    -    VI("vi"),
    -
    -    /**
    -     * Yiddish
    -     * 
    -     */
    -    @XmlEnumValue("yi")
    -    YI("yi"),
    -
    -    /**
    -     * Chinese
    -     * 
    -     */
    -    @XmlEnumValue("zh")
    -    ZH("zh"),
    -
    -    /**
    -     * Church Slavic
    -     * 
    -     */
    -    @XmlEnumValue("cu")
    -    CU("cu"),
    -
    -    /**
    -     * Esperanto
    -     * 
    -     */
    -    @XmlEnumValue("eo")
    -    EO("eo"),
    -
    -    /**
    -     * Latin
    -     * 
    -     */
    -    @XmlEnumValue("la")
    -    LA("la"),
    -
    -    /**
    -     * Occitan (post 1500);
    -     * 
    -     */
    -    @XmlEnumValue("oc")
    -    OC("oc"),
    -
    -    /**
    -     * VVola
    -     * 
    -     */
    -    @XmlEnumValue("vo")
    -    VO("vo");
    -    private final String value;
    -
    -    LanguageType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static LanguageType fromValue(String v) {
    -        for (LanguageType c: LanguageType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	/**
    +	 * Abkhazian
    +	 * 
    +	 */
    +	@XmlEnumValue("ab")
    +	AB("ab"),
    +
    +	/**
    +	 * Afrikaans
    +	 * 
    +	 */
    +	@XmlEnumValue("af")
    +	AF("af"),
    +
    +	/**
    +	 * Aragonese
    +	 * 
    +	 */
    +	@XmlEnumValue("an")
    +	AN("an"),
    +
    +	/**
    +	 * Arabic
    +	 * 
    +	 */
    +	@XmlEnumValue("ar")
    +	AR("ar"),
    +
    +	/**
    +	 * Assamese
    +	 * 
    +	 */
    +	@XmlEnumValue("as")
    +	AS("as"),
    +
    +	/**
    +	 * Azerbaijani
    +	 * 
    +	 */
    +	@XmlEnumValue("az")
    +	AZ("az"),
    +
    +	/**
    +	 * Belarusian
    +	 * 
    +	 */
    +	@XmlEnumValue("be")
    +	BE("be"),
    +
    +	/**
    +	 * Bulgarian
    +	 * 
    +	 */
    +	@XmlEnumValue("bg")
    +	BG("bg"),
    +
    +	/**
    +	 * Bengali
    +	 * 
    +	 */
    +	@XmlEnumValue("bn")
    +	BN("bn"),
    +
    +	/**
    +	 * Tibetan
    +	 * 
    +	 */
    +	@XmlEnumValue("bo")
    +	BO("bo"),
    +
    +	/**
    +	 * Breton
    +	 * 
    +	 */
    +	@XmlEnumValue("br")
    +	BR("br"),
    +
    +	/**
    +	 * Bosnian
    +	 * 
    +	 */
    +	@XmlEnumValue("bs")
    +	BS("bs"),
    +
    +	/**
    +	 * Catalan / Valencian
    +	 * 
    +	 */
    +	@XmlEnumValue("ca")
    +	CA("ca"),
    +
    +	/**
    +	 * Chechen
    +	 * 
    +	 */
    +	@XmlEnumValue("ce")
    +	CE("ce"),
    +
    +	/**
    +	 * Corsican
    +	 * 
    +	 */
    +	@XmlEnumValue("co")
    +	CO("co"),
    +
    +	/**
    +	 * Czech
    +	 * 
    +	 */
    +	@XmlEnumValue("cs")
    +	CS("cs"),
    +
    +	/**
    +	 * Welsh
    +	 * 
    +	 */
    +	@XmlEnumValue("cy")
    +	CY("cy"),
    +
    +	/**
    +	 * Danish
    +	 * 
    +	 */
    +	@XmlEnumValue("da")
    +	DA("da"),
    +
    +	/**
    +	 * German
    +	 * 
    +	 */
    +	@XmlEnumValue("de")
    +	DE("de"),
    +
    +	/**
    +	 * Greek
    +	 * 
    +	 */
    +	@XmlEnumValue("el")
    +	EL("el"),
    +
    +	/**
    +	 * English
    +	 * 
    +	 */
    +	@XmlEnumValue("en")
    +	EN("en"),
    +
    +	/**
    +	 * Spanish / Castilian
    +	 * 
    +	 */
    +	@XmlEnumValue("es")
    +	ES("es"),
    +
    +	/**
    +	 * Estonian
    +	 * 
    +	 */
    +	@XmlEnumValue("et")
    +	ET("et"),
    +
    +	/**
    +	 * Basque
    +	 * 
    +	 */
    +	@XmlEnumValue("eu")
    +	EU("eu"),
    +
    +	/**
    +	 * Persian
    +	 * 
    +	 */
    +	@XmlEnumValue("fa")
    +	FA("fa"),
    +
    +	/**
    +	 * Finnish
    +	 * 
    +	 */
    +	@XmlEnumValue("fi")
    +	FI("fi"),
    +
    +	/**
    +	 * Fijian
    +	 * 
    +	 */
    +	@XmlEnumValue("fj")
    +	FJ("fj"),
    +
    +	/**
    +	 * Faroese
    +	 * 
    +	 */
    +	@XmlEnumValue("fo")
    +	FO("fo"),
    +
    +	/**
    +	 * French
    +	 * 
    +	 */
    +	@XmlEnumValue("fr")
    +	FR("fr"),
    +
    +	/**
    +	 * Western Frisian
    +	 * 
    +	 */
    +	@XmlEnumValue("fy")
    +	FY("fy"),
    +
    +	/**
    +	 * Irish
    +	 * 
    +	 */
    +	@XmlEnumValue("ga")
    +	GA("ga"),
    +
    +	/**
    +	 * Gaelic / Scottish Gaelic
    +	 * 
    +	 */
    +	@XmlEnumValue("gd")
    +	GD("gd"),
    +
    +	/**
    +	 * Galician
    +	 * 
    +	 */
    +	@XmlEnumValue("gl")
    +	GL("gl"),
    +
    +	/**
    +	 * Manx
    +	 * 
    +	 */
    +	@XmlEnumValue("gv")
    +	GV("gv"),
    +
    +	/**
    +	 * Ancient Greek
    +	 * 
    +	 */
    +	@XmlEnumValue("grc")
    +	GRC("grc"),
    +
    +	/**
    +	 * Alemanic; Swiss German
    +	 * 
    +	 */
    +	@XmlEnumValue("gsw")
    +	GSW("gsw"),
    +
    +	/**
    +	 * Hebrew
    +	 * 
    +	 */
    +	@XmlEnumValue("he")
    +	HE("he"),
    +
    +	/**
    +	 * Hindi
    +	 * 
    +	 */
    +	@XmlEnumValue("hi")
    +	HI("hi"),
    +
    +	/**
    +	 * Croatian
    +	 * 
    +	 */
    +	@XmlEnumValue("hr")
    +	HR("hr"),
    +
    +	/**
    +	 * Haitian; Haitian Creole
    +	 * 
    +	 */
    +	@XmlEnumValue("ht")
    +	HT("ht"),
    +
    +	/**
    +	 * Hungarian
    +	 * 
    +	 */
    +	@XmlEnumValue("hu")
    +	HU("hu"),
    +
    +	/**
    +	 * Armenian
    +	 * 
    +	 */
    +	@XmlEnumValue("hy")
    +	HY("hy"),
    +
    +	/**
    +	 * Indonesian
    +	 * 
    +	 */
    +	@XmlEnumValue("id")
    +	ID("id"),
    +
    +	/**
    +	 * Icelandic
    +	 * 
    +	 */
    +	@XmlEnumValue("is")
    +	IS("is"),
    +
    +	/**
    +	 * Italian
    +	 * 
    +	 */
    +	@XmlEnumValue("it")
    +	IT("it"),
    +
    +	/**
    +	 * Japanese
    +	 * 
    +	 */
    +	@XmlEnumValue("ja")
    +	JA("ja"),
    +
    +	/**
    +	 * Javanese
    +	 * 
    +	 */
    +	@XmlEnumValue("jv")
    +	JV("jv"),
    +
    +	/**
    +	 * Georgian
    +	 * 
    +	 */
    +	@XmlEnumValue("ka")
    +	KA("ka"),
    +
    +	/**
    +	 * Kongo
    +	 * 
    +	 */
    +	@XmlEnumValue("kg")
    +	KG("kg"),
    +
    +	/**
    +	 * Korean
    +	 * 
    +	 */
    +	@XmlEnumValue("ko")
    +	KO("ko"),
    +
    +	/**
    +	 * Kurdish
    +	 * 
    +	 */
    +	@XmlEnumValue("ku")
    +	KU("ku"),
    +
    +	/**
    +	 * Cornish
    +	 * 
    +	 */
    +	@XmlEnumValue("kw")
    +	KW("kw"),
    +
    +	/**
    +	 * Kirghiz
    +	 * 
    +	 */
    +	@XmlEnumValue("ky")
    +	KY("ky"),
    +
    +	/**
    +	 * Luxembourgish; Letzeburgesch
    +	 * 
    +	 */
    +	@XmlEnumValue("lb")
    +	LB("lb"),
    +
    +	/**
    +	 * Limburgan; Limburger; Limburgish
    +	 * 
    +	 */
    +	@XmlEnumValue("li")
    +	LI("li"),
    +
    +	/**
    +	 * Lingala
    +	 * 
    +	 */
    +	@XmlEnumValue("ln")
    +	LN("ln"),
    +
    +	/**
    +	 * Lithuanian
    +	 * 
    +	 */
    +	@XmlEnumValue("lt")
    +	LT("lt"),
    +
    +	/**
    +	 * Latvian
    +	 * 
    +	 */
    +	@XmlEnumValue("lv")
    +	LV("lv"),
    +
    +	/**
    +	 * Malagasy
    +	 * 
    +	 */
    +	@XmlEnumValue("mg")
    +	MG("mg"),
    +
    +	/**
    +	 * Macedonian
    +	 * 
    +	 */
    +	@XmlEnumValue("mk")
    +	MK("mk"),
    +
    +	/**
    +	 * Mongolian
    +	 * 
    +	 */
    +	@XmlEnumValue("mn")
    +	MN("mn"),
    +
    +	/**
    +	 * Moldavian
    +	 * 
    +	 */
    +	@XmlEnumValue("mo")
    +	MO("mo"),
    +
    +	/**
    +	 * Malay
    +	 * 
    +	 */
    +	@XmlEnumValue("ms")
    +	MS("ms"),
    +
    +	/**
    +	 * Maltese
    +	 * 
    +	 */
    +	@XmlEnumValue("mt")
    +	MT("mt"),
    +
    +	/**
    +	 * Burmese
    +	 * 
    +	 */
    +	@XmlEnumValue("my")
    +	MY("my"),
    +
    +	/**
    +	 * Norwegian
    +	 * 
    +	 */
    +	@XmlEnumValue("nb")
    +	NB("nb"),
    +
    +	/**
    +	 * Nepali
    +	 * 
    +	 */
    +	@XmlEnumValue("ne")
    +	NE("ne"),
    +
    +	/**
    +	 * Dutch
    +	 * 
    +	 */
    +	@XmlEnumValue("nl")
    +	NL("nl"),
    +
    +	/**
    +	 * Norwegian (Nynorsk)
    +	 * 
    +	 */
    +	@XmlEnumValue("nn")
    +	NN("nn"),
    +
    +	/**
    +	 * Norwegian
    +	 * 
    +	 */
    +	@XmlEnumValue("no")
    +	NO("no"),
    +
    +	/**
    +	 * Polish
    +	 * 
    +	 */
    +	@XmlEnumValue("pl")
    +	PL("pl"),
    +
    +	/**
    +	 * Portuguese
    +	 * 
    +	 */
    +	@XmlEnumValue("pt")
    +	PT("pt"),
    +
    +	/**
    +	 * Raeto-Romance
    +	 * 
    +	 */
    +	@XmlEnumValue("rm")
    +	RM("rm"),
    +
    +	/**
    +	 * Romanian
    +	 * 
    +	 */
    +	@XmlEnumValue("ro")
    +	RO("ro"),
    +
    +	/**
    +	 * Russian
    +	 * 
    +	 */
    +	@XmlEnumValue("ru")
    +	RU("ru"),
    +
    +	/**
    +	 * Sardinian
    +	 * 
    +	 */
    +	@XmlEnumValue("sc")
    +	SC("sc"),
    +
    +	/**
    +	 * Northern Sami
    +	 * 
    +	 */
    +	@XmlEnumValue("se")
    +	SE("se"),
    +
    +	/**
    +	 * Slovak
    +	 * 
    +	 */
    +	@XmlEnumValue("sk")
    +	SK("sk"),
    +
    +	/**
    +	 * Slovenian
    +	 * 
    +	 */
    +	@XmlEnumValue("sl")
    +	SL("sl"),
    +
    +	/**
    +	 * Somali
    +	 * 
    +	 */
    +	@XmlEnumValue("so")
    +	SO("so"),
    +
    +	/**
    +	 * Albanian
    +	 * 
    +	 */
    +	@XmlEnumValue("sq")
    +	SQ("sq"),
    +
    +	/**
    +	 * Serbian
    +	 * 
    +	 */
    +	@XmlEnumValue("sr")
    +	SR("sr"),
    +
    +	/**
    +	 * Swedish
    +	 * 
    +	 */
    +	@XmlEnumValue("sv")
    +	SV("sv"),
    +
    +	/**
    +	 * Swahili
    +	 * 
    +	 */
    +	@XmlEnumValue("sw")
    +	SW("sw"),
    +
    +	/**
    +	 * Turkmen
    +	 * 
    +	 */
    +	@XmlEnumValue("tk")
    +	TK("tk"),
    +
    +	/**
    +	 * Turkish
    +	 * 
    +	 */
    +	@XmlEnumValue("tr")
    +	TR("tr"),
    +
    +	/**
    +	 * Tahitian
    +	 * 
    +	 */
    +	@XmlEnumValue("ty")
    +	TY("ty"),
    +
    +	/**
    +	 * Ukrainian
    +	 * 
    +	 */
    +	@XmlEnumValue("uk")
    +	UK("uk"),
    +
    +	/**
    +	 * Urdu
    +	 * 
    +	 */
    +	@XmlEnumValue("ur")
    +	UR("ur"),
    +
    +	/**
    +	 * Uzbek
    +	 * 
    +	 */
    +	@XmlEnumValue("uz")
    +	UZ("uz"),
    +
    +	/**
    +	 * Vietnamese
    +	 * 
    +	 */
    +	@XmlEnumValue("vi")
    +	VI("vi"),
    +
    +	/**
    +	 * Yiddish
    +	 * 
    +	 */
    +	@XmlEnumValue("yi")
    +	YI("yi"),
    +
    +	/**
    +	 * Chinese
    +	 * 
    +	 */
    +	@XmlEnumValue("zh")
    +	ZH("zh"),
    +
    +	/**
    +	 * Church Slavic
    +	 * 
    +	 */
    +	@XmlEnumValue("cu")
    +	CU("cu"),
    +
    +	/**
    +	 * Esperanto
    +	 * 
    +	 */
    +	@XmlEnumValue("eo")
    +	EO("eo"),
    +
    +	/**
    +	 * Latin
    +	 * 
    +	 */
    +	@XmlEnumValue("la")
    +	LA("la"),
    +
    +	/**
    +	 * Occitan (post 1500);
    +	 * 
    +	 */
    +	@XmlEnumValue("oc")
    +	OC("oc"),
    +
    +	/**
    +	 * VVola
    +	 * 
    +	 */
    +	@XmlEnumValue("vo")
    +	VO("vo");
    +	private final String value;
    +
    +	LanguageType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static LanguageType fromValue(String v) {
    +		for (LanguageType c : LanguageType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java
    index 202da42b4..6920b52de 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.math.BigDecimal;
    @@ -17,13 +16,14 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Language of instruction and examination
      * 
    - * 

    Java class for LanguagesOfInstructionAndExaminationType complex type. + *

    + * Java class for LanguagesOfInstructionAndExaminationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="LanguagesOfInstructionAndExaminationType">
    @@ -49,121 +49,110 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = {
    -    "language"
    -})
    +@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = { "language" })
     public class LanguagesOfInstructionAndExaminationType {
     
    -    @XmlElement(name = "Language", required = true)
    -    protected List language;
    -
    -    /**
    -     * Gets the value of the language property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the language property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getLanguage().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link LanguagesOfInstructionAndExaminationType.Language } - * - * - */ - public List getLanguage() { - if (language == null) { - language = new ArrayList(); - } - return this.language; - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    -     *       <attribute name="language" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
    -     *       <attribute name="percent" type="{urn:crue:academic:xsd:language:diplomasupplement}PercentType" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Language - extends RichTextTagType - { - - @XmlAttribute(name = "language", required = true) - protected LanguageType language; - @XmlAttribute(name = "percent") - protected BigDecimal percent; - - /** - * Gets the value of the language property. - * - * @return - * possible object is - * {@link LanguageType } - * - */ - public LanguageType getLanguage() { - return language; - } - - /** - * Sets the value of the language property. - * - * @param value - * allowed object is - * {@link LanguageType } - * - */ - public void setLanguage(LanguageType value) { - this.language = value; - } - - /** - * Gets the value of the percent property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getPercent() { - return percent; - } - - /** - * Sets the value of the percent property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setPercent(BigDecimal value) { - this.percent = value; - } - - } + @XmlElement(name = "Language", required = true) + protected List language; + + /** + * Gets the value of the language property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the language property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getLanguage().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link LanguagesOfInstructionAndExaminationType.Language } + * + * + */ + public List getLanguage() { + if (language == null) { + language = new ArrayList(); + } + return this.language; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
    +	 *       <attribute name="language" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
    +	 *       <attribute name="percent" type="{urn:crue:academic:xsd:language:diplomasupplement}PercentType" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Language extends RichTextTagType { + + @XmlAttribute(name = "language", required = true) + protected LanguageType language; + @XmlAttribute(name = "percent") + protected BigDecimal percent; + + /** + * Gets the value of the language property. + * + * @return possible object is {@link LanguageType } + * + */ + public LanguageType getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is {@link LanguageType } + * + */ + public void setLanguage(LanguageType value) { + this.language = value; + } + + /** + * Gets the value of the percent property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getPercent() { + return percent; + } + + /** + * Sets the value of the percent property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setPercent(BigDecimal value) { + this.percent = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java index 96c7b66dd..49291e403 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.datatype.XMLGregorianCalendar; - /** * Local grade * - *

    Java class for LocalGradeType complex type. + *

    + * Java class for LocalGradeType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="LocalGradeType">
    @@ -50,198 +50,174 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "LocalGradeType", propOrder = {
    -    "academicYear",
    -    "dateIssued",
    -    "grade",
    -    "source"
    -})
    +@XmlType(name = "LocalGradeType", propOrder = { "academicYear", "dateIssued", "grade", "source" })
     public class LocalGradeType {
     
    -    @XmlElement(name = "AcademicYear", required = true)
    -    protected String academicYear;
    -    @XmlElement(name = "DateIssued")
    -    protected XMLGregorianCalendar dateIssued;
    -    @XmlElement(name = "Grade", required = true)
    -    protected String grade;
    -    @XmlElement(name = "Source")
    -    protected LocalGradeType.Source source;
    -
    -    /**
    -     * Gets the value of the academicYear property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAcademicYear() {
    -        return academicYear;
    -    }
    -
    -    /**
    -     * Sets the value of the academicYear property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAcademicYear(String value) {
    -        this.academicYear = value;
    -    }
    -
    -    /**
    -     * Gets the value of the dateIssued property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateIssued() {
    -        return dateIssued;
    -    }
    -
    -    /**
    -     * Sets the value of the dateIssued property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateIssued(XMLGregorianCalendar value) {
    -        this.dateIssued = value;
    -    }
    -
    -    /**
    -     * Gets the value of the grade property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getGrade() {
    -        return grade;
    -    }
    -
    -    /**
    -     * Sets the value of the grade property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setGrade(String value) {
    -        this.grade = value;
    -    }
    -
    -    /**
    -     * Gets the value of the source property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LocalGradeType.Source }
    -     *     
    -     */
    -    public LocalGradeType.Source getSource() {
    -        return source;
    -    }
    -
    -    /**
    -     * Sets the value of the source property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LocalGradeType.Source }
    -     *     
    -     */
    -    public void setSource(LocalGradeType.Source value) {
    -        this.source = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="source" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}SourceGradeType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Source { - - @XmlValue - protected String value; - @XmlAttribute(name = "source", required = true) - protected SourceGradeType source; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the source property. - * - * @return - * possible object is - * {@link SourceGradeType } - * - */ - public SourceGradeType getSource() { - return source; - } - - /** - * Sets the value of the source property. - * - * @param value - * allowed object is - * {@link SourceGradeType } - * - */ - public void setSource(SourceGradeType value) { - this.source = value; - } - - } + @XmlElement(name = "AcademicYear", required = true) + protected String academicYear; + @XmlElement(name = "DateIssued") + protected XMLGregorianCalendar dateIssued; + @XmlElement(name = "Grade", required = true) + protected String grade; + @XmlElement(name = "Source") + protected LocalGradeType.Source source; + + /** + * Gets the value of the academicYear property. + * + * @return possible object is {@link String } + * + */ + public String getAcademicYear() { + return academicYear; + } + + /** + * Sets the value of the academicYear property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAcademicYear(String value) { + this.academicYear = value; + } + + /** + * Gets the value of the dateIssued property. + * + * @return possible object is {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getDateIssued() { + return dateIssued; + } + + /** + * Sets the value of the dateIssued property. + * + * @param value + * allowed object is {@link XMLGregorianCalendar } + * + */ + public void setDateIssued(XMLGregorianCalendar value) { + this.dateIssued = value; + } + + /** + * Gets the value of the grade property. + * + * @return possible object is {@link String } + * + */ + public String getGrade() { + return grade; + } + + /** + * Sets the value of the grade property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setGrade(String value) { + this.grade = value; + } + + /** + * Gets the value of the source property. + * + * @return possible object is {@link LocalGradeType.Source } + * + */ + public LocalGradeType.Source getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is {@link LocalGradeType.Source } + * + */ + public void setSource(LocalGradeType.Source value) { + this.source = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="source" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}SourceGradeType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Source { + + @XmlValue + protected String value; + @XmlAttribute(name = "source", required = true) + protected SourceGradeType source; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the source property. + * + * @return possible object is {@link SourceGradeType } + * + */ + public SourceGradeType getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is {@link SourceGradeType } + * + */ + public void setSource(SourceGradeType value) { + this.source = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java index a83d3bf21..c4e131862 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for MimeType. + *

    + * Java class for MimeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="MimeType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -37,72 +38,71 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum MimeType {
     
    -
    -    /**
    -     * GIF image
    -     * 
    -     */
    -    @XmlEnumValue("image/gif")
    -    IMAGE_GIF("image/gif"),
    -
    -    /**
    -     * JPEG JFIF image
    -     * 
    -     */
    -    @XmlEnumValue("image/jpeg")
    -    IMAGE_JPEG("image/jpeg"),
    -
    -    /**
    -     * JPEG JFIF image
    -     * 
    -     */
    -    @XmlEnumValue("image/pjpeg")
    -    IMAGE_PJPEG("image/pjpeg"),
    -
    -    /**
    -     * Portable Network Graphics
    -     * 
    -     */
    -    @XmlEnumValue("image/png")
    -    IMAGE_PNG("image/png"),
    -
    -    /**
    -     * Tag Image File Format
    -     * 
    -     */
    -    @XmlEnumValue("image/tiff")
    -    IMAGE_TIFF("image/tiff"),
    -
    -    /**
    -     * HTML
    -     * 
    -     */
    -    @XmlEnumValue("text/html")
    -    TEXT_HTML("text/html"),
    -
    -    /**
    -     * Portable Document Format
    -     * 
    -     */
    -    @XmlEnumValue("application/pdf")
    -    APPLICATION_PDF("application/pdf");
    -    private final String value;
    -
    -    MimeType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static MimeType fromValue(String v) {
    -        for (MimeType c: MimeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	/**
    +	 * GIF image
    +	 * 
    +	 */
    +	@XmlEnumValue("image/gif")
    +	IMAGE_GIF("image/gif"),
    +
    +	/**
    +	 * JPEG JFIF image
    +	 * 
    +	 */
    +	@XmlEnumValue("image/jpeg")
    +	IMAGE_JPEG("image/jpeg"),
    +
    +	/**
    +	 * JPEG JFIF image
    +	 * 
    +	 */
    +	@XmlEnumValue("image/pjpeg")
    +	IMAGE_PJPEG("image/pjpeg"),
    +
    +	/**
    +	 * Portable Network Graphics
    +	 * 
    +	 */
    +	@XmlEnumValue("image/png")
    +	IMAGE_PNG("image/png"),
    +
    +	/**
    +	 * Tag Image File Format
    +	 * 
    +	 */
    +	@XmlEnumValue("image/tiff")
    +	IMAGE_TIFF("image/tiff"),
    +
    +	/**
    +	 * HTML
    +	 * 
    +	 */
    +	@XmlEnumValue("text/html")
    +	TEXT_HTML("text/html"),
    +
    +	/**
    +	 * Portable Document Format
    +	 * 
    +	 */
    +	@XmlEnumValue("application/pdf")
    +	APPLICATION_PDF("application/pdf");
    +	private final String value;
    +
    +	MimeType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static MimeType fromValue(String v) {
    +		for (MimeType c : MimeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java
    index e54f9c61a..9ed52c50d 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.math.BigDecimal;
    @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
      * Mobility programme course unit
      * 
    - * 

    Java class for MobilityProgrammeCourseUnitType complex type. + *

    + * Java class for MobilityProgrammeCourseUnitType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MobilityProgrammeCourseUnitType">
    @@ -51,228 +51,201 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = {
    -    "code",
    -    "title",
    -    "ectsCredits",
    -    "additionalInformation"
    -})
    +@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = { "code", "title", "ectsCredits", "additionalInformation" })
     public class MobilityProgrammeCourseUnitType {
     
    -    @XmlElement(name = "Code")
    -    protected String code;
    -    @XmlElement(name = "Title", required = true)
    -    protected MobilityProgrammeCourseUnitType.Title title;
    -    @XmlElement(name = "ECTSCredits")
    -    protected BigDecimal ectsCredits;
    -    @XmlElement(name = "AdditionalInformation")
    -    protected RichTextTagType additionalInformation;
    -    @XmlAttribute(name = "isInTheLearningAgreement")
    -    protected Boolean isInTheLearningAgreement;
    -
    -    /**
    -     * Gets the value of the code property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCode() {
    -        return code;
    -    }
    -
    -    /**
    -     * Sets the value of the code property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCode(String value) {
    -        this.code = value;
    -    }
    -
    -    /**
    -     * Gets the value of the title property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MobilityProgrammeCourseUnitType.Title }
    -     *     
    -     */
    -    public MobilityProgrammeCourseUnitType.Title getTitle() {
    -        return title;
    -    }
    -
    -    /**
    -     * Sets the value of the title property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MobilityProgrammeCourseUnitType.Title }
    -     *     
    -     */
    -    public void setTitle(MobilityProgrammeCourseUnitType.Title value) {
    -        this.title = value;
    -    }
    -
    -    /**
    -     * Gets the value of the ectsCredits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getECTSCredits() {
    -        return ectsCredits;
    -    }
    -
    -    /**
    -     * Sets the value of the ectsCredits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setECTSCredits(BigDecimal value) {
    -        this.ectsCredits = value;
    -    }
    -
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    -
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAdditionalInformation(RichTextTagType value) {
    -        this.additionalInformation = value;
    -    }
    -
    -    /**
    -     * Gets the value of the isInTheLearningAgreement property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public boolean isIsInTheLearningAgreement() {
    -        if (isInTheLearningAgreement == null) {
    -            return true;
    -        } else {
    -            return isInTheLearningAgreement;
    -        }
    -    }
    -
    -    /**
    -     * Sets the value of the isInTheLearningAgreement property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public void setIsInTheLearningAgreement(Boolean value) {
    -        this.isInTheLearningAgreement = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="language" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Title { - - @XmlValue - protected String value; - @XmlAttribute(name = "language") - protected LanguageType language; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the language property. - * - * @return - * possible object is - * {@link LanguageType } - * - */ - public LanguageType getLanguage() { - return language; - } - - /** - * Sets the value of the language property. - * - * @param value - * allowed object is - * {@link LanguageType } - * - */ - public void setLanguage(LanguageType value) { - this.language = value; - } - - } + @XmlElement(name = "Code") + protected String code; + @XmlElement(name = "Title", required = true) + protected MobilityProgrammeCourseUnitType.Title title; + @XmlElement(name = "ECTSCredits") + protected BigDecimal ectsCredits; + @XmlElement(name = "AdditionalInformation") + protected RichTextTagType additionalInformation; + @XmlAttribute(name = "isInTheLearningAgreement") + protected Boolean isInTheLearningAgreement; + + /** + * Gets the value of the code property. + * + * @return possible object is {@link String } + * + */ + public String getCode() { + return code; + } + + /** + * Sets the value of the code property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setCode(String value) { + this.code = value; + } + + /** + * Gets the value of the title property. + * + * @return possible object is {@link MobilityProgrammeCourseUnitType.Title } + * + */ + public MobilityProgrammeCourseUnitType.Title getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is {@link MobilityProgrammeCourseUnitType.Title } + * + */ + public void setTitle(MobilityProgrammeCourseUnitType.Title value) { + this.title = value; + } + + /** + * Gets the value of the ectsCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getECTSCredits() { + return ectsCredits; + } + + /** + * Sets the value of the ectsCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setECTSCredits(BigDecimal value) { + this.ectsCredits = value; + } + + /** + * Gets the value of the additionalInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAdditionalInformation() { + return additionalInformation; + } + + /** + * Sets the value of the additionalInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAdditionalInformation(RichTextTagType value) { + this.additionalInformation = value; + } + + /** + * Gets the value of the isInTheLearningAgreement property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isIsInTheLearningAgreement() { + if (isInTheLearningAgreement == null) { + return true; + } else { + return isInTheLearningAgreement; + } + } + + /** + * Sets the value of the isInTheLearningAgreement property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setIsInTheLearningAgreement(Boolean value) { + this.isInTheLearningAgreement = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="language" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Title { + + @XmlValue + protected String value; + @XmlAttribute(name = "language") + protected LanguageType language; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the language property. + * + * @return possible object is {@link LanguageType } + * + */ + public LanguageType getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is {@link LanguageType } + * + */ + public void setLanguage(LanguageType value) { + this.language = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java index 557c6610c..4ec7f4424 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Mobility programme courses units * - *

    Java class for MobilityProgrammeCoursesUnitsType complex type. + *

    + * Java class for MobilityProgrammeCoursesUnitsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MobilityProgrammeCoursesUnitsType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = {
    -    "courseUnit"
    -})
    +@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = { "courseUnit" })
     public class MobilityProgrammeCoursesUnitsType {
     
    -    @XmlElement(name = "CourseUnit", required = true)
    -    protected List courseUnit;
    +	@XmlElement(name = "CourseUnit", required = true)
    +	protected List courseUnit;
     
    -    /**
    -     * Gets the value of the courseUnit property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the courseUnit property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCourseUnit().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link MobilityProgrammeCourseUnitType } - * - * - */ - public List getCourseUnit() { - if (courseUnit == null) { - courseUnit = new ArrayList(); - } - return this.courseUnit; - } + /** + * Gets the value of the courseUnit property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the courseUnit property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCourseUnit().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeCourseUnitType } + * + * + */ + public List getCourseUnit() { + if (courseUnit == null) { + courseUnit = new ArrayList(); + } + return this.courseUnit; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java index 0c91a826c..02528aea2 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.datatype.XMLGregorianCalendar; - /** * Mobility programme * - *

    Java class for MobilityProgrammeType complex type. + *

    + * Java class for MobilityProgrammeType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MobilityProgrammeType">
    @@ -54,306 +54,266 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MobilityProgrammeType", propOrder = {
    -    "type",
    -    "fieldOfStudy",
    -    "country",
    -    "receivingInstitutionName",
    -    "academicYear",
    -    "dateFrom",
    -    "dateTo",
    -    "coursesUnits"
    -})
    +@XmlType(name = "MobilityProgrammeType", propOrder = { "type", "fieldOfStudy", "country", "receivingInstitutionName", "academicYear", "dateFrom", "dateTo", "coursesUnits" })
     public class MobilityProgrammeType {
     
    -    @XmlElement(name = "Type", required = true)
    -    protected String type;
    -    @XmlElement(name = "FieldOfStudy")
    -    protected String fieldOfStudy;
    -    @XmlElement(name = "Country", required = true)
    -    protected MobilityProgrammeType.Country country;
    -    @XmlElement(name = "ReceivingInstitutionName", required = true)
    -    protected String receivingInstitutionName;
    -    @XmlElement(name = "AcademicYear", required = true)
    -    protected String academicYear;
    -    @XmlElement(name = "DateFrom")
    -    protected XMLGregorianCalendar dateFrom;
    -    @XmlElement(name = "DateTo")
    -    protected XMLGregorianCalendar dateTo;
    -    @XmlElement(name = "CoursesUnits", required = true)
    -    protected MobilityProgrammeCoursesUnitsType coursesUnits;
    -
    -    /**
    -     * Gets the value of the type property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getType() {
    -        return type;
    -    }
    +	@XmlElement(name = "Type", required = true)
    +	protected String type;
    +	@XmlElement(name = "FieldOfStudy")
    +	protected String fieldOfStudy;
    +	@XmlElement(name = "Country", required = true)
    +	protected MobilityProgrammeType.Country country;
    +	@XmlElement(name = "ReceivingInstitutionName", required = true)
    +	protected String receivingInstitutionName;
    +	@XmlElement(name = "AcademicYear", required = true)
    +	protected String academicYear;
    +	@XmlElement(name = "DateFrom")
    +	protected XMLGregorianCalendar dateFrom;
    +	@XmlElement(name = "DateTo")
    +	protected XMLGregorianCalendar dateTo;
    +	@XmlElement(name = "CoursesUnits", required = true)
    +	protected MobilityProgrammeCoursesUnitsType coursesUnits;
     
    -    /**
    -     * Sets the value of the type property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setType(String value) {
    -        this.type = value;
    -    }
    +	/**
    +	 * Gets the value of the type property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getType() {
    +		return type;
    +	}
     
    -    /**
    -     * Gets the value of the fieldOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getFieldOfStudy() {
    -        return fieldOfStudy;
    -    }
    +	/**
    +	 * Sets the value of the type property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setType(String value) {
    +		this.type = value;
    +	}
     
    -    /**
    -     * Sets the value of the fieldOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setFieldOfStudy(String value) {
    -        this.fieldOfStudy = value;
    -    }
    +	/**
    +	 * Gets the value of the fieldOfStudy property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getFieldOfStudy() {
    +		return fieldOfStudy;
    +	}
     
    -    /**
    -     * Gets the value of the country property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MobilityProgrammeType.Country }
    -     *     
    -     */
    -    public MobilityProgrammeType.Country getCountry() {
    -        return country;
    -    }
    +	/**
    +	 * Sets the value of the fieldOfStudy property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setFieldOfStudy(String value) {
    +		this.fieldOfStudy = value;
    +	}
     
    -    /**
    -     * Sets the value of the country property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MobilityProgrammeType.Country }
    -     *     
    -     */
    -    public void setCountry(MobilityProgrammeType.Country value) {
    -        this.country = value;
    -    }
    +	/**
    +	 * Gets the value of the country property.
    +	 * 
    +	 * @return possible object is {@link MobilityProgrammeType.Country }
    +	 * 
    +	 */
    +	public MobilityProgrammeType.Country getCountry() {
    +		return country;
    +	}
     
    -    /**
    -     * Gets the value of the receivingInstitutionName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getReceivingInstitutionName() {
    -        return receivingInstitutionName;
    -    }
    +	/**
    +	 * Sets the value of the country property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MobilityProgrammeType.Country }
    +	 * 
    +	 */
    +	public void setCountry(MobilityProgrammeType.Country value) {
    +		this.country = value;
    +	}
     
    -    /**
    -     * Sets the value of the receivingInstitutionName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setReceivingInstitutionName(String value) {
    -        this.receivingInstitutionName = value;
    -    }
    +	/**
    +	 * Gets the value of the receivingInstitutionName property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getReceivingInstitutionName() {
    +		return receivingInstitutionName;
    +	}
     
    -    /**
    -     * Gets the value of the academicYear property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAcademicYear() {
    -        return academicYear;
    -    }
    +	/**
    +	 * Sets the value of the receivingInstitutionName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setReceivingInstitutionName(String value) {
    +		this.receivingInstitutionName = value;
    +	}
     
    -    /**
    -     * Sets the value of the academicYear property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAcademicYear(String value) {
    -        this.academicYear = value;
    -    }
    +	/**
    +	 * Gets the value of the academicYear property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAcademicYear() {
    +		return academicYear;
    +	}
     
    -    /**
    -     * Gets the value of the dateFrom property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateFrom() {
    -        return dateFrom;
    -    }
    +	/**
    +	 * Sets the value of the academicYear property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAcademicYear(String value) {
    +		this.academicYear = value;
    +	}
     
    -    /**
    -     * Sets the value of the dateFrom property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateFrom(XMLGregorianCalendar value) {
    -        this.dateFrom = value;
    -    }
    +	/**
    +	 * Gets the value of the dateFrom property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateFrom() {
    +		return dateFrom;
    +	}
     
    -    /**
    -     * Gets the value of the dateTo property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateTo() {
    -        return dateTo;
    -    }
    +	/**
    +	 * Sets the value of the dateFrom property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateFrom(XMLGregorianCalendar value) {
    +		this.dateFrom = value;
    +	}
     
    -    /**
    -     * Sets the value of the dateTo property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateTo(XMLGregorianCalendar value) {
    -        this.dateTo = value;
    -    }
    +	/**
    +	 * Gets the value of the dateTo property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateTo() {
    +		return dateTo;
    +	}
     
    -    /**
    -     * Gets the value of the coursesUnits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MobilityProgrammeCoursesUnitsType }
    -     *     
    -     */
    -    public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
    -        return coursesUnits;
    -    }
    +	/**
    +	 * Sets the value of the dateTo property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateTo(XMLGregorianCalendar value) {
    +		this.dateTo = value;
    +	}
     
    -    /**
    -     * Sets the value of the coursesUnits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MobilityProgrammeCoursesUnitsType }
    -     *     
    -     */
    -    public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
    -        this.coursesUnits = value;
    -    }
    +	/**
    +	 * Gets the value of the coursesUnits property.
    +	 * 
    +	 * @return possible object is {@link MobilityProgrammeCoursesUnitsType }
    +	 * 
    +	 */
    +	public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
    +		return coursesUnits;
    +	}
     
    +	/**
    +	 * Sets the value of the coursesUnits property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MobilityProgrammeCoursesUnitsType }
    +	 * 
    +	 */
    +	public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
    +		this.coursesUnits = value;
    +	}
     
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Country { + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Country { - @XmlValue - protected String value; - @XmlAttribute(name = "country", required = true) - protected CountryType country; + @XmlValue + protected String value; + @XmlAttribute(name = "country", required = true) + protected CountryType country; - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link CountryType } - * - */ - public CountryType getCountry() { - return country; - } + /** + * Gets the value of the country property. + * + * @return possible object is {@link CountryType } + * + */ + public CountryType getCountry() { + return country; + } - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link CountryType } - * - */ - public void setCountry(CountryType value) { - this.country = value; - } + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link CountryType } + * + */ + public void setCountry(CountryType value) { + this.country = value; + } - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java index 762ba0e99..23a4152de 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for ModeOfDeliveryType. + *

    + * Java class for ModeOfDeliveryType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ModeOfDeliveryType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -32,37 +33,36 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum ModeOfDeliveryType {
     
    +	/**
    +	 * Face-to-face
    +	 * 
    +	 */
    +	@XmlEnumValue("FaceToFace")
    +	FACE_TO_FACE("FaceToFace"),
     
    -    /**
    -     * Face-to-face
    -     * 
    -     */
    -    @XmlEnumValue("FaceToFace")
    -    FACE_TO_FACE("FaceToFace"),
    -
    -    /**
    -     * Distance learning
    -     * 
    -     */
    -    @XmlEnumValue("DistanceLearning")
    -    DISTANCE_LEARNING("DistanceLearning");
    -    private final String value;
    +	/**
    +	 * Distance learning
    +	 * 
    +	 */
    +	@XmlEnumValue("DistanceLearning")
    +	DISTANCE_LEARNING("DistanceLearning");
    +	private final String value;
     
    -    ModeOfDeliveryType(String v) {
    -        value = v;
    -    }
    +	ModeOfDeliveryType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static ModeOfDeliveryType fromValue(String v) {
    -        for (ModeOfDeliveryType c: ModeOfDeliveryType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static ModeOfDeliveryType fromValue(String v) {
    +		for (ModeOfDeliveryType c : ModeOfDeliveryType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java
    index c8f32a752..5cb0d2646 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for ModeOfStudyType. + *

    + * Java class for ModeOfStudyType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ModeOfStudyType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -35,58 +36,57 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum ModeOfStudyType {
     
    +	/**
    +	 * Full time
    +	 * 
    +	 */
    +	@XmlEnumValue("FullTime")
    +	FULL_TIME("FullTime"),
     
    -    /**
    -     * Full time
    -     * 
    -     */
    -    @XmlEnumValue("FullTime")
    -    FULL_TIME("FullTime"),
    -
    -    /**
    -     * Par time
    -     * 
    -     */
    -    @XmlEnumValue("ParTime")
    -    PAR_TIME("ParTime"),
    +	/**
    +	 * Par time
    +	 * 
    +	 */
    +	@XmlEnumValue("ParTime")
    +	PAR_TIME("ParTime"),
     
    -    /**
    -     * Distance
    -     * 
    -     */
    -    @XmlEnumValue("Distance")
    -    DISTANCE("Distance"),
    +	/**
    +	 * Distance
    +	 * 
    +	 */
    +	@XmlEnumValue("Distance")
    +	DISTANCE("Distance"),
     
    -    /**
    -     * eLearning
    -     * 
    -     */
    -    @XmlEnumValue("eLearning")
    -    E_LEARNING("eLearning"),
    +	/**
    +	 * eLearning
    +	 * 
    +	 */
    +	@XmlEnumValue("eLearning")
    +	E_LEARNING("eLearning"),
     
    -    /**
    -     * Another
    -     * 
    -     */
    -    @XmlEnumValue("Another")
    -    ANOTHER("Another");
    -    private final String value;
    +	/**
    +	 * Another
    +	 * 
    +	 */
    +	@XmlEnumValue("Another")
    +	ANOTHER("Another");
    +	private final String value;
     
    -    ModeOfStudyType(String v) {
    -        value = v;
    -    }
    +	ModeOfStudyType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static ModeOfStudyType fromValue(String v) {
    -        for (ModeOfStudyType c: ModeOfStudyType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static ModeOfStudyType fromValue(String v) {
    +		for (ModeOfStudyType c : ModeOfStudyType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java
    index f4bd8a5d1..ab83f154e 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
     
    -
     /**
      * Multilingual Diploma Supplement (DS)
      * 
    - * 

    Java class for MultilingualDiplomaSupplementType complex type. + *

    + * Java class for MultilingualDiplomaSupplementType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MultilingualDiplomaSupplementType">
    @@ -40,73 +40,66 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MultilingualDiplomaSupplementType", propOrder = {
    -    "diplomaSupplement",
    -    "signature"
    -})
    +@XmlType(name = "MultilingualDiplomaSupplementType", propOrder = { "diplomaSupplement", "signature" })
     public class MultilingualDiplomaSupplementType {
     
    -    @XmlElement(name = "DiplomaSupplement", required = true)
    -    protected List diplomaSupplement;
    -    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    -    protected List signature;
    +	@XmlElement(name = "DiplomaSupplement", required = true)
    +	protected List diplomaSupplement;
    +	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    +	protected List signature;
     
    -    /**
    -     * Diploma Supplement Gets the value of the diplomaSupplement property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the diplomaSupplement property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getDiplomaSupplement().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link DiplomaSupplementType } - * - * - */ - public List getDiplomaSupplement() { - if (diplomaSupplement == null) { - diplomaSupplement = new ArrayList(); - } - return this.diplomaSupplement; - } + /** + * Diploma Supplement Gets the value of the diplomaSupplement property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the diplomaSupplement property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getDiplomaSupplement().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link DiplomaSupplementType } + * + * + */ + public List getDiplomaSupplement() { + if (diplomaSupplement == null) { + diplomaSupplement = new ArrayList(); + } + return this.diplomaSupplement; + } - /** - * Digital signature Gets the value of the signature property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the signature property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSignature().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link SignatureType } - * - * - */ - public List getSignature() { - if (signature == null) { - signature = new ArrayList(); - } - return this.signature; - } + /** + * Digital signature Gets the value of the signature property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the signature property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSignature().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link SignatureType } + * + * + */ + public List getSignature() { + if (signature == null) { + signature = new ArrayList(); + } + return this.signature; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java index 063244c03..8424677c1 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Name and status of awarding institution * - *

    Java class for NameAndStatusOfAwardingInstitutionType complex type. + *

    + * Java class for NameAndStatusOfAwardingInstitutionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="NameAndStatusOfAwardingInstitutionType">
    @@ -47,94 +47,86 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = {
    -    "awardingInstitution"
    -})
    +@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = { "awardingInstitution" })
     public class NameAndStatusOfAwardingInstitutionType {
     
    -    @XmlElement(name = "AwardingInstitution", required = true)
    -    protected List awardingInstitution;
    -
    -    /**
    -     * Gets the value of the awardingInstitution property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the awardingInstitution property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getAwardingInstitution().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } - * - * - */ - public List getAwardingInstitution() { - if (awardingInstitution == null) { - awardingInstitution = new ArrayList(); - } - return this.awardingInstitution; - } + @XmlElement(name = "AwardingInstitution", required = true) + protected List awardingInstitution; + /** + * Gets the value of the awardingInstitution property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the awardingInstitution property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getAwardingInstitution().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } + * + * + */ + public List getAwardingInstitution() { + if (awardingInstitution == null) { + awardingInstitution = new ArrayList(); + } + return this.awardingInstitution; + } - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
    -     *       <attribute name="awardingInstitutionID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class AwardingInstitution - extends InstitutionType - { + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
    +	 *       <attribute name="awardingInstitutionID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class AwardingInstitution extends InstitutionType { - @XmlAttribute(name = "awardingInstitutionID", required = true) - protected String awardingInstitutionID; + @XmlAttribute(name = "awardingInstitutionID", required = true) + protected String awardingInstitutionID; - /** - * Gets the value of the awardingInstitutionID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAwardingInstitutionID() { - return awardingInstitutionID; - } + /** + * Gets the value of the awardingInstitutionID property. + * + * @return possible object is {@link String } + * + */ + public String getAwardingInstitutionID() { + return awardingInstitutionID; + } - /** - * Sets the value of the awardingInstitutionID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAwardingInstitutionID(String value) { - this.awardingInstitutionID = value; - } + /** + * Sets the value of the awardingInstitutionID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAwardingInstitutionID(String value) { + this.awardingInstitutionID = value; + } - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java index 3083da620..90225c9a0 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import java.util.ArrayList; @@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Name and status of institution administering studies * - *

    Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type. + *

    + * Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
    @@ -47,94 +47,86 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = {
    -    "institutionAdministeringStudies"
    -})
    +@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = { "institutionAdministeringStudies" })
     public class NameAndStatusOfInstitutionAdministeringStudiesType {
     
    -    @XmlElement(name = "InstitutionAdministeringStudies", required = true)
    -    protected List institutionAdministeringStudies;
    -
    -    /**
    -     * Gets the value of the institutionAdministeringStudies property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the institutionAdministeringStudies property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getInstitutionAdministeringStudies().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } - * - * - */ - public List getInstitutionAdministeringStudies() { - if (institutionAdministeringStudies == null) { - institutionAdministeringStudies = new ArrayList(); - } - return this.institutionAdministeringStudies; - } + @XmlElement(name = "InstitutionAdministeringStudies", required = true) + protected List institutionAdministeringStudies; + /** + * Gets the value of the institutionAdministeringStudies property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the institutionAdministeringStudies property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getInstitutionAdministeringStudies().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } + * + * + */ + public List getInstitutionAdministeringStudies() { + if (institutionAdministeringStudies == null) { + institutionAdministeringStudies = new ArrayList(); + } + return this.institutionAdministeringStudies; + } - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
    -     *       <attribute name="institutionAdministeringStudiesID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class InstitutionAdministeringStudies - extends InstitutionType - { + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
    +	 *       <attribute name="institutionAdministeringStudiesID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class InstitutionAdministeringStudies extends InstitutionType { - @XmlAttribute(name = "institutionAdministeringStudiesID", required = true) - protected String institutionAdministeringStudiesID; + @XmlAttribute(name = "institutionAdministeringStudiesID", required = true) + protected String institutionAdministeringStudiesID; - /** - * Gets the value of the institutionAdministeringStudiesID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getInstitutionAdministeringStudiesID() { - return institutionAdministeringStudiesID; - } + /** + * Gets the value of the institutionAdministeringStudiesID property. + * + * @return possible object is {@link String } + * + */ + public String getInstitutionAdministeringStudiesID() { + return institutionAdministeringStudiesID; + } - /** - * Sets the value of the institutionAdministeringStudiesID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setInstitutionAdministeringStudiesID(String value) { - this.institutionAdministeringStudiesID = value; - } + /** + * Sets the value of the institutionAdministeringStudiesID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setInstitutionAdministeringStudiesID(String value) { + this.institutionAdministeringStudiesID = value; + } - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java index b6473551b..83b337368 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.JAXBElement; @@ -13,644 +12,636 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; - /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the crue.academic.xsd.language.diplomasupplement package. - *

    An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. + * This object contains factory methods for each Java content interface and Java element interface generated in the crue.academic.xsd.language.diplomasupplement package. + *

    + * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class. * */ @XmlRegistry public class ObjectFactory { - private final static QName _MultilingualDiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "MultilingualDiplomaSupplement"); - private final static QName _DiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "DiplomaSupplement"); - private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Italic"); - private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "BreakLine"); - private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "AttachedRef"); - private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Underline"); - private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Bold"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: crue.academic.xsd.language.diplomasupplement - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link AddressType } - * - */ - public AddressType createAddressType() { - return new AddressType(); - } - - /** - * Create an instance of {@link LanguagesOfInstructionAndExaminationType } - * - */ - public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() { - return new LanguagesOfInstructionAndExaminationType(); - } - - /** - * Create an instance of {@link RichTextTagType } - * - */ - public RichTextTagType createRichTextTagType() { - return new RichTextTagType(); - } - - /** - * Create an instance of {@link MobilityProgrammeType } - * - */ - public MobilityProgrammeType createMobilityProgrammeType() { - return new MobilityProgrammeType(); - } - - /** - * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType } - * - */ - public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() { - return new NameAndStatusOfInstitutionAdministeringStudiesType(); - } - - /** - * Create an instance of {@link InstitutionType } - * - */ - public InstitutionType createInstitutionType() { - return new InstitutionType(); - } - - /** - * Create an instance of {@link MobilityProgrammeCourseUnitType } - * - */ - public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() { - return new MobilityProgrammeCourseUnitType(); - } - - /** - * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType } - * - */ - public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() { - return new InformationIdentifyingTheHolderOfTheQualificationType(); - } - - /** - * Create an instance of {@link CourseUnitType } - * - */ - public CourseUnitType createCourseUnitType() { - return new CourseUnitType(); - } - - /** - * Create an instance of {@link LocalGradeType } - * - */ - public LocalGradeType createLocalGradeType() { - return new LocalGradeType(); - } - - /** - * Create an instance of {@link InformationOnTheContentsAndResultsGainedType } - * - */ - public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() { - return new InformationOnTheContentsAndResultsGainedType(); - } - - /** - * Create an instance of {@link InformationOnTheLevelOfTheQualificationType } - * - */ - public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() { - return new InformationOnTheLevelOfTheQualificationType(); - } - - /** - * Create an instance of {@link NameAndStatusOfAwardingInstitutionType } - * - */ - public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() { - return new NameAndStatusOfAwardingInstitutionType(); - } - - /** - * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType } - * - */ - public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() { - return new InformationOnTheFunctionOfTheQualificationType(); - } - - /** - * Create an instance of {@link MultilingualDiplomaSupplementType } - * - */ - public MultilingualDiplomaSupplementType createMultilingualDiplomaSupplementType() { - return new MultilingualDiplomaSupplementType(); - } - - /** - * Create an instance of {@link DiplomaSupplementType } - * - */ - public DiplomaSupplementType createDiplomaSupplementType() { - return new DiplomaSupplementType(); - } - - /** - * Create an instance of {@link ExtensionContentType } - * - */ - public ExtensionContentType createExtensionContentType() { - return new ExtensionContentType(); - } - - /** - * Create an instance of {@link AttachedImageURLType } - * - */ - public AttachedImageURLType createAttachedImageURLType() { - return new AttachedImageURLType(); - } - - /** - * Create an instance of {@link CourseStructureDiagramType } - * - */ - public CourseStructureDiagramType createCourseStructureDiagramType() { - return new CourseStructureDiagramType(); - } - - /** - * Create an instance of {@link CourseUnitWorkPlacementType } - * - */ - public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() { - return new CourseUnitWorkPlacementType(); - } - - /** - * Create an instance of {@link InformationIdentifyingTheQualificationType } - * - */ - public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() { - return new InformationIdentifyingTheQualificationType(); - } - - /** - * Create an instance of {@link MobilityProgrammeCoursesUnitsType } - * - */ - public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() { - return new MobilityProgrammeCoursesUnitsType(); - } - - /** - * Create an instance of {@link QualificationType } - * - */ - public QualificationType createQualificationType() { - return new QualificationType(); - } - - /** - * Create an instance of {@link CertificationOfTheSupplementType } - * - */ - public CertificationOfTheSupplementType createCertificationOfTheSupplementType() { - return new CertificationOfTheSupplementType(); - } - - /** - * Create an instance of {@link AttachedFileURLType } - * - */ - public AttachedFileURLType createAttachedFileURLType() { - return new AttachedFileURLType(); - } - - /** - * Create an instance of {@link ProgrammeRequirementsType } - * - */ - public ProgrammeRequirementsType createProgrammeRequirementsType() { - return new ProgrammeRequirementsType(); - } - - /** - * Create an instance of {@link CourseUnitWorkPlacementsType } - * - */ - public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() { - return new CourseUnitWorkPlacementsType(); - } - - /** - * Create an instance of {@link AdditionalInformationType } - * - */ - public AdditionalInformationType createAdditionalInformationType() { - return new AdditionalInformationType(); - } - - /** - * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType } - * - */ - public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() { - return new GradingSchemeAndGradeDistributionGuidanceType(); - } - - /** - * Create an instance of {@link AttachmentsType } - * - */ - public AttachmentsType createAttachmentsType() { - return new AttachmentsType(); - } - - /** - * Create an instance of {@link CourseUnitLanguageOfInstructionType } - * - */ - public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() { - return new CourseUnitLanguageOfInstructionType(); - } - - /** - * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType } - * - */ - public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() { - return new CoursesAttendedInOtherInstitutionInMobilityProgramsType(); - } - - /** - * Create an instance of {@link FamilyNameType } - * - */ - public FamilyNameType createFamilyNameType() { - return new FamilyNameType(); - } - - /** - * Create an instance of {@link CoursesGroupsType } - * - */ - public CoursesGroupsType createCoursesGroupsType() { - return new CoursesGroupsType(); - } - - /** - * Create an instance of {@link TitleConferredType } - * - */ - public TitleConferredType createTitleConferredType() { - return new TitleConferredType(); - } - - /** - * Create an instance of {@link OfficialStampType } - * - */ - public OfficialStampType createOfficialStampType() { - return new OfficialStampType(); - } - - /** - * Create an instance of {@link CourseUnitStudentPerformanceType } - * - */ - public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() { - return new CourseUnitStudentPerformanceType(); - } - - /** - * Create an instance of {@link GivenNameType } - * - */ - public GivenNameType createGivenNameType() { - return new GivenNameType(); - } - - /** - * Create an instance of {@link CoursesUnitsType } - * - */ - public CoursesUnitsType createCoursesUnitsType() { - return new CoursesUnitsType(); - } - - /** - * Create an instance of {@link ProgrammeDetailsType } - * - */ - public ProgrammeDetailsType createProgrammeDetailsType() { - return new ProgrammeDetailsType(); - } - - /** - * Create an instance of {@link OfficialCertifyingType } - * - */ - public OfficialCertifyingType createOfficialCertifyingType() { - return new OfficialCertifyingType(); - } - - /** - * Create an instance of {@link CourseUnitLanguagesOfInstructionType } - * - */ - public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() { - return new CourseUnitLanguagesOfInstructionType(); - } - - /** - * Create an instance of {@link AttachedImageDataType } - * - */ - public AttachedImageDataType createAttachedImageDataType() { - return new AttachedImageDataType(); - } - - /** - * Create an instance of {@link AttachedType } - * - */ - public AttachedType createAttachedType() { - return new AttachedType(); - } - - /** - * Create an instance of {@link CoursesGroupType } - * - */ - public CoursesGroupType createCoursesGroupType() { - return new CoursesGroupType(); - } - - /** - * Create an instance of {@link AttachedFileDataType } - * - */ - public AttachedFileDataType createAttachedFileDataType() { - return new AttachedFileDataType(); - } - - /** - * Create an instance of {@link ContactInformationType } - * - */ - public ContactInformationType createContactInformationType() { - return new ContactInformationType(); - } - - /** - * Create an instance of {@link OfficialsCertifyingType } - * - */ - public OfficialsCertifyingType createOfficialsCertifyingType() { - return new OfficialsCertifyingType(); - } - - /** - * Create an instance of {@link AddressType.Country } - * - */ - public AddressType.Country createAddressTypeCountry() { - return new AddressType.Country(); - } - - /** - * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language } - * - */ - public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() { - return new LanguagesOfInstructionAndExaminationType.Language(); - } - - /** - * Create an instance of {@link RichTextTagType.AttachedRef } - * - */ - public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() { - return new RichTextTagType.AttachedRef(); - } - - /** - * Create an instance of {@link MobilityProgrammeType.Country } - * - */ - public MobilityProgrammeType.Country createMobilityProgrammeTypeCountry() { - return new MobilityProgrammeType.Country(); - } - - /** - * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } - * - */ - public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() { - return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies(); - } - - /** - * Create an instance of {@link InstitutionType.Country } - * - */ - public InstitutionType.Country createInstitutionTypeCountry() { - return new InstitutionType.Country(); - } - - /** - * Create an instance of {@link InstitutionType.AttachedImageRef } - * - */ - public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() { - return new InstitutionType.AttachedImageRef(); - } - - /** - * Create an instance of {@link MobilityProgrammeCourseUnitType.Title } - * - */ - public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() { - return new MobilityProgrammeCourseUnitType.Title(); - } - - /** - * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth } - * - */ - public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth createInformationIdentifyingTheHolderOfTheQualificationTypeCountryOfBirth() { - return new InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth(); - } - - /** - * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender } - * - */ - public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() { - return new InformationIdentifyingTheHolderOfTheQualificationType.Gender(); - } - - /** - * Create an instance of {@link CourseUnitType.Type } - * - */ - public CourseUnitType.Type createCourseUnitTypeType() { - return new CourseUnitType.Type(); - } - - /** - * Create an instance of {@link CourseUnitType.YearOfStudy } - * - */ - public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() { - return new CourseUnitType.YearOfStudy(); - } - - /** - * Create an instance of {@link CourseUnitType.Level } - * - */ - public CourseUnitType.Level createCourseUnitTypeLevel() { - return new CourseUnitType.Level(); - } - - /** - * Create an instance of {@link CourseUnitType.ModeOfDelivery } - * - */ - public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() { - return new CourseUnitType.ModeOfDelivery(); - } - - /** - * Create an instance of {@link LocalGradeType.Source } - * - */ - public LocalGradeType.Source createLocalGradeTypeSource() { - return new LocalGradeType.Source(); - } - - /** - * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } - * - */ - public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() { - return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy(); - } - - /** - * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level } - * - */ - public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() { - return new InformationOnTheLevelOfTheQualificationType.Level(); - } - - /** - * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } - * - */ - public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() { - return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme(); - } - - /** - * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } - * - */ - public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() { - return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution(); - } - - /** - * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } - * - */ - public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() { - return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualDiplomaSupplementType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "MultilingualDiplomaSupplement") - public JAXBElement createMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) { - return new JAXBElement(_MultilingualDiplomaSupplement_QNAME, MultilingualDiplomaSupplementType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "DiplomaSupplement") - public JAXBElement createDiplomaSupplement(DiplomaSupplementType value) { - return new JAXBElement(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Italic", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeItalic(String value) { - return new JAXBElement(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "BreakLine", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeBreakLine(String value) { - return new JAXBElement(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "AttachedRef", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) { - return new JAXBElement(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Underline", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeUnderline(String value) { - return new JAXBElement(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Bold", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeBold(String value) { - return new JAXBElement(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value); - } + private final static QName _MultilingualDiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "MultilingualDiplomaSupplement"); + private final static QName _DiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "DiplomaSupplement"); + private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Italic"); + private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "BreakLine"); + private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "AttachedRef"); + private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Underline"); + private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Bold"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: crue.academic.xsd.language.diplomasupplement + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link AddressType } + * + */ + public AddressType createAddressType() { + return new AddressType(); + } + + /** + * Create an instance of {@link LanguagesOfInstructionAndExaminationType } + * + */ + public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() { + return new LanguagesOfInstructionAndExaminationType(); + } + + /** + * Create an instance of {@link RichTextTagType } + * + */ + public RichTextTagType createRichTextTagType() { + return new RichTextTagType(); + } + + /** + * Create an instance of {@link MobilityProgrammeType } + * + */ + public MobilityProgrammeType createMobilityProgrammeType() { + return new MobilityProgrammeType(); + } + + /** + * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType } + * + */ + public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() { + return new NameAndStatusOfInstitutionAdministeringStudiesType(); + } + + /** + * Create an instance of {@link InstitutionType } + * + */ + public InstitutionType createInstitutionType() { + return new InstitutionType(); + } + + /** + * Create an instance of {@link MobilityProgrammeCourseUnitType } + * + */ + public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() { + return new MobilityProgrammeCourseUnitType(); + } + + /** + * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType } + * + */ + public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() { + return new InformationIdentifyingTheHolderOfTheQualificationType(); + } + + /** + * Create an instance of {@link CourseUnitType } + * + */ + public CourseUnitType createCourseUnitType() { + return new CourseUnitType(); + } + + /** + * Create an instance of {@link LocalGradeType } + * + */ + public LocalGradeType createLocalGradeType() { + return new LocalGradeType(); + } + + /** + * Create an instance of {@link InformationOnTheContentsAndResultsGainedType } + * + */ + public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() { + return new InformationOnTheContentsAndResultsGainedType(); + } + + /** + * Create an instance of {@link InformationOnTheLevelOfTheQualificationType } + * + */ + public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() { + return new InformationOnTheLevelOfTheQualificationType(); + } + + /** + * Create an instance of {@link NameAndStatusOfAwardingInstitutionType } + * + */ + public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() { + return new NameAndStatusOfAwardingInstitutionType(); + } + + /** + * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType } + * + */ + public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() { + return new InformationOnTheFunctionOfTheQualificationType(); + } + + /** + * Create an instance of {@link MultilingualDiplomaSupplementType } + * + */ + public MultilingualDiplomaSupplementType createMultilingualDiplomaSupplementType() { + return new MultilingualDiplomaSupplementType(); + } + + /** + * Create an instance of {@link DiplomaSupplementType } + * + */ + public DiplomaSupplementType createDiplomaSupplementType() { + return new DiplomaSupplementType(); + } + + /** + * Create an instance of {@link ExtensionContentType } + * + */ + public ExtensionContentType createExtensionContentType() { + return new ExtensionContentType(); + } + + /** + * Create an instance of {@link AttachedImageURLType } + * + */ + public AttachedImageURLType createAttachedImageURLType() { + return new AttachedImageURLType(); + } + + /** + * Create an instance of {@link CourseStructureDiagramType } + * + */ + public CourseStructureDiagramType createCourseStructureDiagramType() { + return new CourseStructureDiagramType(); + } + + /** + * Create an instance of {@link CourseUnitWorkPlacementType } + * + */ + public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() { + return new CourseUnitWorkPlacementType(); + } + + /** + * Create an instance of {@link InformationIdentifyingTheQualificationType } + * + */ + public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() { + return new InformationIdentifyingTheQualificationType(); + } + + /** + * Create an instance of {@link MobilityProgrammeCoursesUnitsType } + * + */ + public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() { + return new MobilityProgrammeCoursesUnitsType(); + } + + /** + * Create an instance of {@link QualificationType } + * + */ + public QualificationType createQualificationType() { + return new QualificationType(); + } + + /** + * Create an instance of {@link CertificationOfTheSupplementType } + * + */ + public CertificationOfTheSupplementType createCertificationOfTheSupplementType() { + return new CertificationOfTheSupplementType(); + } + + /** + * Create an instance of {@link AttachedFileURLType } + * + */ + public AttachedFileURLType createAttachedFileURLType() { + return new AttachedFileURLType(); + } + + /** + * Create an instance of {@link ProgrammeRequirementsType } + * + */ + public ProgrammeRequirementsType createProgrammeRequirementsType() { + return new ProgrammeRequirementsType(); + } + + /** + * Create an instance of {@link CourseUnitWorkPlacementsType } + * + */ + public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() { + return new CourseUnitWorkPlacementsType(); + } + + /** + * Create an instance of {@link AdditionalInformationType } + * + */ + public AdditionalInformationType createAdditionalInformationType() { + return new AdditionalInformationType(); + } + + /** + * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType } + * + */ + public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() { + return new GradingSchemeAndGradeDistributionGuidanceType(); + } + + /** + * Create an instance of {@link AttachmentsType } + * + */ + public AttachmentsType createAttachmentsType() { + return new AttachmentsType(); + } + + /** + * Create an instance of {@link CourseUnitLanguageOfInstructionType } + * + */ + public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() { + return new CourseUnitLanguageOfInstructionType(); + } + + /** + * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType } + * + */ + public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() { + return new CoursesAttendedInOtherInstitutionInMobilityProgramsType(); + } + + /** + * Create an instance of {@link FamilyNameType } + * + */ + public FamilyNameType createFamilyNameType() { + return new FamilyNameType(); + } + + /** + * Create an instance of {@link CoursesGroupsType } + * + */ + public CoursesGroupsType createCoursesGroupsType() { + return new CoursesGroupsType(); + } + + /** + * Create an instance of {@link TitleConferredType } + * + */ + public TitleConferredType createTitleConferredType() { + return new TitleConferredType(); + } + + /** + * Create an instance of {@link OfficialStampType } + * + */ + public OfficialStampType createOfficialStampType() { + return new OfficialStampType(); + } + + /** + * Create an instance of {@link CourseUnitStudentPerformanceType } + * + */ + public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() { + return new CourseUnitStudentPerformanceType(); + } + + /** + * Create an instance of {@link GivenNameType } + * + */ + public GivenNameType createGivenNameType() { + return new GivenNameType(); + } + + /** + * Create an instance of {@link CoursesUnitsType } + * + */ + public CoursesUnitsType createCoursesUnitsType() { + return new CoursesUnitsType(); + } + + /** + * Create an instance of {@link ProgrammeDetailsType } + * + */ + public ProgrammeDetailsType createProgrammeDetailsType() { + return new ProgrammeDetailsType(); + } + + /** + * Create an instance of {@link OfficialCertifyingType } + * + */ + public OfficialCertifyingType createOfficialCertifyingType() { + return new OfficialCertifyingType(); + } + + /** + * Create an instance of {@link CourseUnitLanguagesOfInstructionType } + * + */ + public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() { + return new CourseUnitLanguagesOfInstructionType(); + } + + /** + * Create an instance of {@link AttachedImageDataType } + * + */ + public AttachedImageDataType createAttachedImageDataType() { + return new AttachedImageDataType(); + } + + /** + * Create an instance of {@link AttachedType } + * + */ + public AttachedType createAttachedType() { + return new AttachedType(); + } + + /** + * Create an instance of {@link CoursesGroupType } + * + */ + public CoursesGroupType createCoursesGroupType() { + return new CoursesGroupType(); + } + + /** + * Create an instance of {@link AttachedFileDataType } + * + */ + public AttachedFileDataType createAttachedFileDataType() { + return new AttachedFileDataType(); + } + + /** + * Create an instance of {@link ContactInformationType } + * + */ + public ContactInformationType createContactInformationType() { + return new ContactInformationType(); + } + + /** + * Create an instance of {@link OfficialsCertifyingType } + * + */ + public OfficialsCertifyingType createOfficialsCertifyingType() { + return new OfficialsCertifyingType(); + } + + /** + * Create an instance of {@link AddressType.Country } + * + */ + public AddressType.Country createAddressTypeCountry() { + return new AddressType.Country(); + } + + /** + * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language } + * + */ + public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() { + return new LanguagesOfInstructionAndExaminationType.Language(); + } + + /** + * Create an instance of {@link RichTextTagType.AttachedRef } + * + */ + public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() { + return new RichTextTagType.AttachedRef(); + } + + /** + * Create an instance of {@link MobilityProgrammeType.Country } + * + */ + public MobilityProgrammeType.Country createMobilityProgrammeTypeCountry() { + return new MobilityProgrammeType.Country(); + } + + /** + * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } + * + */ + public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() { + return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies(); + } + + /** + * Create an instance of {@link InstitutionType.Country } + * + */ + public InstitutionType.Country createInstitutionTypeCountry() { + return new InstitutionType.Country(); + } + + /** + * Create an instance of {@link InstitutionType.AttachedImageRef } + * + */ + public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() { + return new InstitutionType.AttachedImageRef(); + } + + /** + * Create an instance of {@link MobilityProgrammeCourseUnitType.Title } + * + */ + public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() { + return new MobilityProgrammeCourseUnitType.Title(); + } + + /** + * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth } + * + */ + public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth createInformationIdentifyingTheHolderOfTheQualificationTypeCountryOfBirth() { + return new InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth(); + } + + /** + * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender } + * + */ + public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() { + return new InformationIdentifyingTheHolderOfTheQualificationType.Gender(); + } + + /** + * Create an instance of {@link CourseUnitType.Type } + * + */ + public CourseUnitType.Type createCourseUnitTypeType() { + return new CourseUnitType.Type(); + } + + /** + * Create an instance of {@link CourseUnitType.YearOfStudy } + * + */ + public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() { + return new CourseUnitType.YearOfStudy(); + } + + /** + * Create an instance of {@link CourseUnitType.Level } + * + */ + public CourseUnitType.Level createCourseUnitTypeLevel() { + return new CourseUnitType.Level(); + } + + /** + * Create an instance of {@link CourseUnitType.ModeOfDelivery } + * + */ + public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() { + return new CourseUnitType.ModeOfDelivery(); + } + + /** + * Create an instance of {@link LocalGradeType.Source } + * + */ + public LocalGradeType.Source createLocalGradeTypeSource() { + return new LocalGradeType.Source(); + } + + /** + * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } + * + */ + public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() { + return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy(); + } + + /** + * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level } + * + */ + public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() { + return new InformationOnTheLevelOfTheQualificationType.Level(); + } + + /** + * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } + * + */ + public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() { + return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme(); + } + + /** + * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } + * + */ + public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() { + return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution(); + } + + /** + * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } + * + */ + public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() { + return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualDiplomaSupplementType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "MultilingualDiplomaSupplement") + public JAXBElement createMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) { + return new JAXBElement(_MultilingualDiplomaSupplement_QNAME, MultilingualDiplomaSupplementType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "DiplomaSupplement") + public JAXBElement createDiplomaSupplement(DiplomaSupplementType value) { + return new JAXBElement(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Italic", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeItalic(String value) { + return new JAXBElement(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "BreakLine", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeBreakLine(String value) { + return new JAXBElement(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "AttachedRef", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) { + return new JAXBElement(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Underline", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeUnderline(String value) { + return new JAXBElement(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Bold", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeBold(String value) { + return new JAXBElement(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value); + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java index 1d2cfd97e..ddf4b7ecc 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Official certifying the DS * - *

    Java class for OfficialCertifyingType complex type. + *

    + * Java class for OfficialCertifyingType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="OfficialCertifyingType">
    @@ -40,116 +40,100 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "OfficialCertifyingType", propOrder = {
    -    "familyName",
    -    "givenName",
    -    "capacity"
    -})
    +@XmlType(name = "OfficialCertifyingType", propOrder = { "familyName", "givenName", "capacity" })
     public class OfficialCertifyingType {
     
    -    @XmlElement(name = "FamilyName", required = true)
    -    protected FamilyNameType familyName;
    -    @XmlElement(name = "GivenName", required = true)
    -    protected GivenNameType givenName;
    -    @XmlElement(name = "Capacity", required = true)
    -    protected String capacity;
    -    @XmlAttribute(name = "awardingInstitutionID", required = true)
    -    protected String awardingInstitutionID;
    +	@XmlElement(name = "FamilyName", required = true)
    +	protected FamilyNameType familyName;
    +	@XmlElement(name = "GivenName", required = true)
    +	protected GivenNameType givenName;
    +	@XmlElement(name = "Capacity", required = true)
    +	protected String capacity;
    +	@XmlAttribute(name = "awardingInstitutionID", required = true)
    +	protected String awardingInstitutionID;
     
    -    /**
    -     * Gets the value of the familyName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public FamilyNameType getFamilyName() {
    -        return familyName;
    -    }
    +	/**
    +	 * Gets the value of the familyName property.
    +	 * 
    +	 * @return possible object is {@link FamilyNameType }
    +	 * 
    +	 */
    +	public FamilyNameType getFamilyName() {
    +		return familyName;
    +	}
     
    -    /**
    -     * Sets the value of the familyName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public void setFamilyName(FamilyNameType value) {
    -        this.familyName = value;
    -    }
    +	/**
    +	 * Sets the value of the familyName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link FamilyNameType }
    +	 * 
    +	 */
    +	public void setFamilyName(FamilyNameType value) {
    +		this.familyName = value;
    +	}
     
    -    /**
    -     * Gets the value of the givenName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public GivenNameType getGivenName() {
    -        return givenName;
    -    }
    +	/**
    +	 * Gets the value of the givenName property.
    +	 * 
    +	 * @return possible object is {@link GivenNameType }
    +	 * 
    +	 */
    +	public GivenNameType getGivenName() {
    +		return givenName;
    +	}
     
    -    /**
    -     * Sets the value of the givenName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public void setGivenName(GivenNameType value) {
    -        this.givenName = value;
    -    }
    +	/**
    +	 * Sets the value of the givenName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link GivenNameType }
    +	 * 
    +	 */
    +	public void setGivenName(GivenNameType value) {
    +		this.givenName = value;
    +	}
     
    -    /**
    -     * Gets the value of the capacity property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCapacity() {
    -        return capacity;
    -    }
    +	/**
    +	 * Gets the value of the capacity property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCapacity() {
    +		return capacity;
    +	}
     
    -    /**
    -     * Sets the value of the capacity property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCapacity(String value) {
    -        this.capacity = value;
    -    }
    +	/**
    +	 * Sets the value of the capacity property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCapacity(String value) {
    +		this.capacity = value;
    +	}
     
    -    /**
    -     * Gets the value of the awardingInstitutionID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAwardingInstitutionID() {
    -        return awardingInstitutionID;
    -    }
    +	/**
    +	 * Gets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAwardingInstitutionID() {
    +		return awardingInstitutionID;
    +	}
     
    -    /**
    -     * Sets the value of the awardingInstitutionID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAwardingInstitutionID(String value) {
    -        this.awardingInstitutionID = value;
    -    }
    +	/**
    +	 * Sets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAwardingInstitutionID(String value) {
    +		this.awardingInstitutionID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java
    index af9007a1b..f92a005d3 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Official stamp or seal of the institution
      * 
    - * 

    Java class for OfficialStampType complex type. + *

    + * Java class for OfficialStampType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="OfficialStampType">
    @@ -38,62 +38,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "OfficialStampType", propOrder = {
    -    "description"
    -})
    +@XmlType(name = "OfficialStampType", propOrder = { "description" })
     public class OfficialStampType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlAttribute(name = "awardingInstitutionID", required = true)
    -    protected String awardingInstitutionID;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlAttribute(name = "awardingInstitutionID", required = true)
    +	protected String awardingInstitutionID;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the awardingInstitutionID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAwardingInstitutionID() {
    -        return awardingInstitutionID;
    -    }
    +	/**
    +	 * Gets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAwardingInstitutionID() {
    +		return awardingInstitutionID;
    +	}
     
    -    /**
    -     * Sets the value of the awardingInstitutionID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAwardingInstitutionID(String value) {
    -        this.awardingInstitutionID = value;
    -    }
    +	/**
    +	 * Sets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAwardingInstitutionID(String value) {
    +		this.awardingInstitutionID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java
    index 392e8d412..c77b684c3 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.util.ArrayList;
    @@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Officials certifying
      * 
    - * 

    Java class for OfficialsCertifyingType complex type. + *

    + * Java class for OfficialsCertifyingType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="OfficialsCertifyingType">
    @@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "OfficialsCertifyingType", propOrder = {
    -    "officialCertifying"
    -})
    +@XmlType(name = "OfficialsCertifyingType", propOrder = { "officialCertifying" })
     public class OfficialsCertifyingType {
     
    -    @XmlElement(name = "OfficialCertifying", required = true)
    -    protected List officialCertifying;
    +	@XmlElement(name = "OfficialCertifying", required = true)
    +	protected List officialCertifying;
     
    -    /**
    -     * Gets the value of the officialCertifying property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the officialCertifying property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getOfficialCertifying().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link OfficialCertifyingType } - * - * - */ - public List getOfficialCertifying() { - if (officialCertifying == null) { - officialCertifying = new ArrayList(); - } - return this.officialCertifying; - } + /** + * Gets the value of the officialCertifying property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the officialCertifying property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getOfficialCertifying().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link OfficialCertifyingType } + * + * + */ + public List getOfficialCertifying() { + if (officialCertifying == null) { + officialCertifying = new ArrayList(); + } + return this.officialCertifying; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java index a6e27914c..9c2ac3744 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlAccessType; @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** * Programme details * - *

    Java class for ProgrammeDetailsType complex type. + *

    + * Java class for ProgrammeDetailsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ProgrammeDetailsType">
    @@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ProgrammeDetailsType", propOrder = {
    -    "courseStructureDiagram",
    -    "coursesAttendedInOtherInstitutionInMobilityPrograms"
    -})
    +@XmlType(name = "ProgrammeDetailsType", propOrder = { "courseStructureDiagram", "coursesAttendedInOtherInstitutionInMobilityPrograms" })
     public class ProgrammeDetailsType {
     
    -    @XmlElement(name = "CourseStructureDiagram", required = true)
    -    protected CourseStructureDiagramType courseStructureDiagram;
    -    @XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
    -    protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
    +	@XmlElement(name = "CourseStructureDiagram", required = true)
    +	protected CourseStructureDiagramType courseStructureDiagram;
    +	@XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
    +	protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
     
    -    /**
    -     * Gets the value of the courseStructureDiagram property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseStructureDiagramType }
    -     *     
    -     */
    -    public CourseStructureDiagramType getCourseStructureDiagram() {
    -        return courseStructureDiagram;
    -    }
    +	/**
    +	 * Gets the value of the courseStructureDiagram property.
    +	 * 
    +	 * @return possible object is {@link CourseStructureDiagramType }
    +	 * 
    +	 */
    +	public CourseStructureDiagramType getCourseStructureDiagram() {
    +		return courseStructureDiagram;
    +	}
     
    -    /**
    -     * Sets the value of the courseStructureDiagram property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseStructureDiagramType }
    -     *     
    -     */
    -    public void setCourseStructureDiagram(CourseStructureDiagramType value) {
    -        this.courseStructureDiagram = value;
    -    }
    +	/**
    +	 * Sets the value of the courseStructureDiagram property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CourseStructureDiagramType }
    +	 * 
    +	 */
    +	public void setCourseStructureDiagram(CourseStructureDiagramType value) {
    +		this.courseStructureDiagram = value;
    +	}
     
    -    /**
    -     * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    -     *     
    -     */
    -    public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
    -        return coursesAttendedInOtherInstitutionInMobilityPrograms;
    -    }
    +	/**
    +	 * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    +	 * 
    +	 * @return possible object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    +	 * 
    +	 */
    +	public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
    +		return coursesAttendedInOtherInstitutionInMobilityPrograms;
    +	}
     
    -    /**
    -     * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    -     *     
    -     */
    -    public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
    -        this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
    -    }
    +	/**
    +	 * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    +	 * 
    +	 */
    +	public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
    +		this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java
    index e0f358aca..e21a8d821 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Programme requirements
      * 
    - * 

    Java class for ProgrammeRequirementsType complex type. + *

    + * Java class for ProgrammeRequirementsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ProgrammeRequirementsType">
    @@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ProgrammeRequirementsType", propOrder = {
    -    "requirements",
    -    "keyLearningOutcomes"
    -})
    +@XmlType(name = "ProgrammeRequirementsType", propOrder = { "requirements", "keyLearningOutcomes" })
     public class ProgrammeRequirementsType {
     
    -    @XmlElement(name = "Requirements", required = true)
    -    protected RichTextTagType requirements;
    -    @XmlElement(name = "KeyLearningOutcomes")
    -    protected RichTextTagType keyLearningOutcomes;
    +	@XmlElement(name = "Requirements", required = true)
    +	protected RichTextTagType requirements;
    +	@XmlElement(name = "KeyLearningOutcomes")
    +	protected RichTextTagType keyLearningOutcomes;
     
    -    /**
    -     * Gets the value of the requirements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getRequirements() {
    -        return requirements;
    -    }
    +	/**
    +	 * Gets the value of the requirements property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getRequirements() {
    +		return requirements;
    +	}
     
    -    /**
    -     * Sets the value of the requirements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setRequirements(RichTextTagType value) {
    -        this.requirements = value;
    -    }
    +	/**
    +	 * Sets the value of the requirements property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setRequirements(RichTextTagType value) {
    +		this.requirements = value;
    +	}
     
    -    /**
    -     * Gets the value of the keyLearningOutcomes property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getKeyLearningOutcomes() {
    -        return keyLearningOutcomes;
    -    }
    +	/**
    +	 * Gets the value of the keyLearningOutcomes property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getKeyLearningOutcomes() {
    +		return keyLearningOutcomes;
    +	}
     
    -    /**
    -     * Sets the value of the keyLearningOutcomes property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setKeyLearningOutcomes(RichTextTagType value) {
    -        this.keyLearningOutcomes = value;
    -    }
    +	/**
    +	 * Sets the value of the keyLearningOutcomes property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setKeyLearningOutcomes(RichTextTagType value) {
    +		this.keyLearningOutcomes = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java
    index 8700fcfca..4414ef05d 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Qualification
      * 
    - * 

    Java class for QualificationType complex type. + *

    + * Java class for QualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="QualificationType">
    @@ -40,115 +40,100 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "QualificationType", propOrder = {
    -    "name",
    -    "additionalInformation"
    -})
    +@XmlType(name = "QualificationType", propOrder = { "name", "additionalInformation" })
     public class QualificationType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    -    @XmlElement(name = "AdditionalInformation")
    -    protected RichTextTagType additionalInformation;
    -    @XmlAttribute(name = "localID")
    -    protected String localID;
    -    @XmlAttribute(name = "nationalID")
    -    protected String nationalID;
    +	@XmlElement(name = "Name", required = true)
    +	protected String name;
    +	@XmlElement(name = "AdditionalInformation")
    +	protected RichTextTagType additionalInformation;
    +	@XmlAttribute(name = "localID")
    +	protected String localID;
    +	@XmlAttribute(name = "nationalID")
    +	protected String nationalID;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    +	/**
    +	 * Gets the value of the name property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    +	/**
    +	 * Sets the value of the name property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setName(String value) {
    +		this.name = value;
    +	}
     
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    +	/**
    +	 * Gets the value of the additionalInformation property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getAdditionalInformation() {
    +		return additionalInformation;
    +	}
     
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAdditionalInformation(RichTextTagType value) {
    -        this.additionalInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the additionalInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setAdditionalInformation(RichTextTagType value) {
    +		this.additionalInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the localID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getLocalID() {
    -        return localID;
    -    }
    +	/**
    +	 * Gets the value of the localID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getLocalID() {
    +		return localID;
    +	}
     
    -    /**
    -     * Sets the value of the localID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setLocalID(String value) {
    -        this.localID = value;
    -    }
    +	/**
    +	 * Sets the value of the localID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setLocalID(String value) {
    +		this.localID = value;
    +	}
     
    -    /**
    -     * Gets the value of the nationalID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNationalID() {
    -        return nationalID;
    -    }
    +	/**
    +	 * Gets the value of the nationalID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNationalID() {
    +		return nationalID;
    +	}
     
    -    /**
    -     * Sets the value of the nationalID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNationalID(String value) {
    -        this.nationalID = value;
    -    }
    +	/**
    +	 * Sets the value of the nationalID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNationalID(String value) {
    +		this.nationalID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java
    index 18d44c09b..68c5ec627 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import java.io.Serializable;
    @@ -24,13 +23,14 @@ import javax.xml.bind.annotation.XmlSeeAlso;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
      * Rich text tag
      * 
    - * 

    Java class for RichTextTagType complex type. + *

    + * Java class for RichTextTagType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="RichTextTagType">
    @@ -59,143 +59,124 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "RichTextTagType", propOrder = {
    -    "content"
    -})
    -@XmlSeeAlso({
    -    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
    -    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.Level.class,
    -    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
    -    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
    -    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.LanguagesOfInstructionAndExaminationType.Language.class
    -})
    +@XmlType(name = "RichTextTagType", propOrder = { "content" })
    +@XmlSeeAlso({ eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
    +		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.Level.class,
    +		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
    +		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
    +		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.LanguagesOfInstructionAndExaminationType.Language.class })
     public class RichTextTagType {
     
    -    @XmlElementRefs({
    -        @XmlElementRef(name = "Underline", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "AttachedRef", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "BreakLine", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "Bold", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "Italic", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false)
    -    })
    -    @XmlMixed
    -    protected List content;
    -
    -    /**
    -     * Rich text tag Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link String } - * {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    -     *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class AttachedRef { - - @XmlValue - protected String value; - @XmlAttribute(name = "attachedID", required = true) - @XmlIDREF - @XmlSchemaType(name = "IDREF") - protected Object attachedID; - - /** - * Plain text constraint - * - * Non empty text - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the attachedID property. - * - * @return - * possible object is - * {@link Object } - * - */ - public Object getAttachedID() { - return attachedID; - } - - /** - * Sets the value of the attachedID property. - * - * @param value - * allowed object is - * {@link Object } - * - */ - public void setAttachedID(Object value) { - this.attachedID = value; - } - - } + @XmlElementRefs({ @XmlElementRef(name = "Underline", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false), + @XmlElementRef(name = "AttachedRef", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false), + @XmlElementRef(name = "BreakLine", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false), + @XmlElementRef(name = "Bold", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false), + @XmlElementRef(name = "Italic", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false) }) + @XmlMixed + protected List content; + + /** + * Rich text tag Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link String }{@code >} {@link String } {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef } + * {@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
    +	 *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class AttachedRef { + + @XmlValue + protected String value; + @XmlAttribute(name = "attachedID", required = true) + @XmlIDREF + @XmlSchemaType(name = "IDREF") + protected Object attachedID; + + /** + * Plain text constraint + * + * Non empty text + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the attachedID property. + * + * @return possible object is {@link Object } + * + */ + public Object getAttachedID() { + return attachedID; + } + + /** + * Sets the value of the attachedID property. + * + * @param value + * allowed object is {@link Object } + * + */ + public void setAttachedID(Object value) { + this.attachedID = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java index be97a835f..f9bb1708d 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for SourceGradeType. + *

    + * Java class for SourceGradeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="SourceGradeType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -33,44 +34,43 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum SourceGradeType {
     
    +	/**
    +	 * Recognized
    +	 * 
    +	 */
    +	@XmlEnumValue("Recognized")
    +	RECOGNIZED("Recognized"),
     
    -    /**
    -     * Recognized
    -     * 
    -     */
    -    @XmlEnumValue("Recognized")
    -    RECOGNIZED("Recognized"),
    -
    -    /**
    -     * Course unit attended in mobility programme
    -     * 
    -     */
    -    @XmlEnumValue("MobilityProgramme")
    -    MOBILITY_PROGRAMME("MobilityProgramme"),
    +	/**
    +	 * Course unit attended in mobility programme
    +	 * 
    +	 */
    +	@XmlEnumValue("MobilityProgramme")
    +	MOBILITY_PROGRAMME("MobilityProgramme"),
     
    -    /**
    -     * Another
    -     * 
    -     */
    -    @XmlEnumValue("Another")
    -    ANOTHER("Another");
    -    private final String value;
    +	/**
    +	 * Another
    +	 * 
    +	 */
    +	@XmlEnumValue("Another")
    +	ANOTHER("Another");
    +	private final String value;
     
    -    SourceGradeType(String v) {
    -        value = v;
    -    }
    +	SourceGradeType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static SourceGradeType fromValue(String v) {
    -        for (SourceGradeType c: SourceGradeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static SourceGradeType fromValue(String v) {
    +		for (SourceGradeType c : SourceGradeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java
    index 7d06458e0..4bb02cd12 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
      * Title conferred
      * 
    - * 

    Java class for TitleConferredType complex type. + *

    + * Java class for TitleConferredType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="TitleConferredType">
    @@ -36,36 +36,31 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "TitleConferredType", propOrder = {
    -    "name"
    -})
    +@XmlType(name = "TitleConferredType", propOrder = { "name" })
     public class TitleConferredType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    +	@XmlElement(name = "Name", required = true)
    +	protected String name;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    +	/**
    +	 * Gets the value of the name property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    +	/**
    +	 * Sets the value of the name property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setName(String value) {
    +		this.name = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java
    index 427159cb8..84b6707b7 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java
    @@ -7,3 +7,4 @@
     
     @javax.xml.bind.annotation.XmlSchema(namespace = "urn:crue:academic:xsd:language:diplomasupplement", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
     package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
    +
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java
    index 7877f8cee..14d28d64e 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for acTitleType complex type. + *

    + * Java class for acTitleType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="acTitleType">
    @@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "acTitleType", propOrder = {
    -    "titleNormalised",
    -    "aqaa"
    -})
    +@XmlType(name = "acTitleType", propOrder = { "titleNormalised", "aqaa" })
     public class AcTitleType {
     
    -    @XmlElement(required = true)
    -    protected String titleNormalised;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String titleNormalised;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the titleNormalised property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTitleNormalised() {
    -        return titleNormalised;
    -    }
    +	/**
    +	 * Gets the value of the titleNormalised property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getTitleNormalised() {
    +		return titleNormalised;
    +	}
     
    -    /**
    -     * Sets the value of the titleNormalised property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTitleNormalised(String value) {
    -        this.titleNormalised = value;
    -    }
    +	/**
    +	 * Sets the value of the titleNormalised property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setTitleNormalised(String value) {
    +		this.titleNormalised = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java
    index e2dd4e5e0..fe44adaac 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for AttributeStatusType. + *

    + * Java class for AttributeStatusType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="AttributeStatusType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum AttributeStatusType {
     
    -    @XmlEnumValue("Available")
    -    AVAILABLE("Available"),
    -    @XmlEnumValue("NotAvailable")
    -    NOT_AVAILABLE("NotAvailable"),
    -    @XmlEnumValue("Withheld")
    -    WITHHELD("Withheld");
    -    private final String value;
    -
    -    AttributeStatusType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static AttributeStatusType fromValue(String v) {
    -        for (AttributeStatusType c: AttributeStatusType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	@XmlEnumValue("Available")
    +	AVAILABLE("Available"), @XmlEnumValue("NotAvailable")
    +	NOT_AVAILABLE("NotAvailable"), @XmlEnumValue("Withheld")
    +	WITHHELD("Withheld");
    +	private final String value;
    +
    +	AttributeStatusType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static AttributeStatusType fromValue(String v) {
    +		for (AttributeStatusType c : AttributeStatusType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java
    index 2c2117c14..981884efa 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
     import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
     
    -
     /**
    - * 

    Java class for canonicalAddressType complex type. + *

    + * Java class for canonicalAddressType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="canonicalAddressType">
    @@ -43,222 +43,189 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "canonicalAddressType", propOrder = {
    -    "countryCodeAddress",
    -    "state",
    -    "municipalityCode",
    -    "town",
    -    "postalCode",
    -    "streetName",
    -    "streetNumber",
    -    "apartmentNumber"
    -})
    +@XmlType(name = "canonicalAddressType", propOrder = { "countryCodeAddress", "state", "municipalityCode", "town", "postalCode", "streetName", "streetNumber", "apartmentNumber" })
     public class CanonicalAddressType {
     
    -    @XmlElement(required = true)
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    protected String countryCodeAddress;
    -    protected String state;
    -    protected String municipalityCode;
    -    @XmlElement(required = true)
    -    protected String town;
    -    @XmlElement(required = true)
    -    protected String postalCode;
    -    @XmlElement(required = true)
    -    protected String streetName;
    -    protected String streetNumber;
    -    protected String apartmentNumber;
    -
    -    /**
    -     * Gets the value of the countryCodeAddress property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCountryCodeAddress() {
    -        return countryCodeAddress;
    -    }
    -
    -    /**
    -     * Sets the value of the countryCodeAddress property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCountryCodeAddress(String value) {
    -        this.countryCodeAddress = value;
    -    }
    -
    -    /**
    -     * Gets the value of the state property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getState() {
    -        return state;
    -    }
    -
    -    /**
    -     * Sets the value of the state property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setState(String value) {
    -        this.state = value;
    -    }
    -
    -    /**
    -     * Gets the value of the municipalityCode property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getMunicipalityCode() {
    -        return municipalityCode;
    -    }
    -
    -    /**
    -     * Sets the value of the municipalityCode property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setMunicipalityCode(String value) {
    -        this.municipalityCode = value;
    -    }
    -
    -    /**
    -     * Gets the value of the town property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTown() {
    -        return town;
    -    }
    -
    -    /**
    -     * Sets the value of the town property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTown(String value) {
    -        this.town = value;
    -    }
    -
    -    /**
    -     * Gets the value of the postalCode property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getPostalCode() {
    -        return postalCode;
    -    }
    -
    -    /**
    -     * Sets the value of the postalCode property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setPostalCode(String value) {
    -        this.postalCode = value;
    -    }
    -
    -    /**
    -     * Gets the value of the streetName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStreetName() {
    -        return streetName;
    -    }
    -
    -    /**
    -     * Sets the value of the streetName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStreetName(String value) {
    -        this.streetName = value;
    -    }
    -
    -    /**
    -     * Gets the value of the streetNumber property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStreetNumber() {
    -        return streetNumber;
    -    }
    -
    -    /**
    -     * Sets the value of the streetNumber property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStreetNumber(String value) {
    -        this.streetNumber = value;
    -    }
    -
    -    /**
    -     * Gets the value of the apartmentNumber property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getApartmentNumber() {
    -        return apartmentNumber;
    -    }
    -
    -    /**
    -     * Sets the value of the apartmentNumber property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setApartmentNumber(String value) {
    -        this.apartmentNumber = value;
    -    }
    +	@XmlElement(required = true)
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	protected String countryCodeAddress;
    +	protected String state;
    +	protected String municipalityCode;
    +	@XmlElement(required = true)
    +	protected String town;
    +	@XmlElement(required = true)
    +	protected String postalCode;
    +	@XmlElement(required = true)
    +	protected String streetName;
    +	protected String streetNumber;
    +	protected String apartmentNumber;
    +
    +	/**
    +	 * Gets the value of the countryCodeAddress property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCountryCodeAddress() {
    +		return countryCodeAddress;
    +	}
    +
    +	/**
    +	 * Sets the value of the countryCodeAddress property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCountryCodeAddress(String value) {
    +		this.countryCodeAddress = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the state property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getState() {
    +		return state;
    +	}
    +
    +	/**
    +	 * Sets the value of the state property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setState(String value) {
    +		this.state = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the municipalityCode property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getMunicipalityCode() {
    +		return municipalityCode;
    +	}
    +
    +	/**
    +	 * Sets the value of the municipalityCode property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setMunicipalityCode(String value) {
    +		this.municipalityCode = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the town property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getTown() {
    +		return town;
    +	}
    +
    +	/**
    +	 * Sets the value of the town property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setTown(String value) {
    +		this.town = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the postalCode property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getPostalCode() {
    +		return postalCode;
    +	}
    +
    +	/**
    +	 * Sets the value of the postalCode property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setPostalCode(String value) {
    +		this.postalCode = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the streetName property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getStreetName() {
    +		return streetName;
    +	}
    +
    +	/**
    +	 * Sets the value of the streetName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setStreetName(String value) {
    +		this.streetName = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the streetNumber property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getStreetNumber() {
    +		return streetNumber;
    +	}
    +
    +	/**
    +	 * Sets the value of the streetNumber property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setStreetNumber(String value) {
    +		this.streetNumber = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the apartmentNumber property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getApartmentNumber() {
    +		return apartmentNumber;
    +	}
    +
    +	/**
    +	 * Sets the value of the apartmentNumber property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setApartmentNumber(String value) {
    +		this.apartmentNumber = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java
    index 71f028cea..58e4bf02b 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import java.math.BigInteger;
    @@ -17,11 +16,12 @@ import javax.xml.bind.annotation.XmlType;
     import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.GeneralDiplomaType;
     import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.MultilingualGeneralDiplomaType;
     
    -
     /**
    - * 

    Java class for currentStudiesType complex type. + *

    + * Java class for currentStudiesType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="currentStudiesType">
    @@ -45,154 +45,135 @@ import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.ge
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "currentStudiesType", propOrder = {
    -    "multilingualGeneralDiploma",
    -    "generalDiploma",
    -    "yearOfStudy",
    -    "isEligibleForInternship",
    -    "aqaa",
    -    "any"
    -})
    +@XmlType(name = "currentStudiesType", propOrder = { "multilingualGeneralDiploma", "generalDiploma", "yearOfStudy", "isEligibleForInternship", "aqaa", "any" })
     public class CurrentStudiesType {
     
    -    @XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    -    protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
    -    @XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    -    protected GeneralDiplomaType generalDiploma;
    -    @XmlElement(required = true)
    -    protected BigInteger yearOfStudy;
    -    protected boolean isEligibleForInternship;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    -    @XmlAnyElement(lax = true)
    -    protected Object any;
    -
    -    /**
    -     * Gets the value of the multilingualGeneralDiploma property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MultilingualGeneralDiplomaType }
    -     *     
    -     */
    -    public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
    -        return multilingualGeneralDiploma;
    -    }
    -
    -    /**
    -     * Sets the value of the multilingualGeneralDiploma property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MultilingualGeneralDiplomaType }
    -     *     
    -     */
    -    public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
    -        this.multilingualGeneralDiploma = value;
    -    }
    -
    -    /**
    -     * Gets the value of the generalDiploma property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GeneralDiplomaType }
    -     *     
    -     */
    -    public GeneralDiplomaType getGeneralDiploma() {
    -        return generalDiploma;
    -    }
    -
    -    /**
    -     * Sets the value of the generalDiploma property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GeneralDiplomaType }
    -     *     
    -     */
    -    public void setGeneralDiploma(GeneralDiplomaType value) {
    -        this.generalDiploma = value;
    -    }
    -
    -    /**
    -     * Gets the value of the yearOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigInteger }
    -     *     
    -     */
    -    public BigInteger getYearOfStudy() {
    -        return yearOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the yearOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigInteger }
    -     *     
    -     */
    -    public void setYearOfStudy(BigInteger value) {
    -        this.yearOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the isEligibleForInternship property.
    -     * 
    -     */
    -    public boolean isIsEligibleForInternship() {
    -        return isEligibleForInternship;
    -    }
    -
    -    /**
    -     * Sets the value of the isEligibleForInternship property.
    -     * 
    -     */
    -    public void setIsEligibleForInternship(boolean value) {
    -        this.isEligibleForInternship = value;
    -    }
    -
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    -
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    -
    -    /**
    -     * Gets the value of the any property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link Object }
    -     *     
    -     */
    -    public Object getAny() {
    -        return any;
    -    }
    -
    -    /**
    -     * Sets the value of the any property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link Object }
    -     *     
    -     */
    -    public void setAny(Object value) {
    -        this.any = value;
    -    }
    +	@XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    +	protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
    +	@XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    +	protected GeneralDiplomaType generalDiploma;
    +	@XmlElement(required = true)
    +	protected BigInteger yearOfStudy;
    +	protected boolean isEligibleForInternship;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
    +	@XmlAnyElement(lax = true)
    +	protected Object any;
    +
    +	/**
    +	 * Gets the value of the multilingualGeneralDiploma property.
    +	 * 
    +	 * @return possible object is {@link MultilingualGeneralDiplomaType }
    +	 * 
    +	 */
    +	public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
    +		return multilingualGeneralDiploma;
    +	}
    +
    +	/**
    +	 * Sets the value of the multilingualGeneralDiploma property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MultilingualGeneralDiplomaType }
    +	 * 
    +	 */
    +	public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
    +		this.multilingualGeneralDiploma = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the generalDiploma property.
    +	 * 
    +	 * @return possible object is {@link GeneralDiplomaType }
    +	 * 
    +	 */
    +	public GeneralDiplomaType getGeneralDiploma() {
    +		return generalDiploma;
    +	}
    +
    +	/**
    +	 * Sets the value of the generalDiploma property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link GeneralDiplomaType }
    +	 * 
    +	 */
    +	public void setGeneralDiploma(GeneralDiplomaType value) {
    +		this.generalDiploma = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the yearOfStudy property.
    +	 * 
    +	 * @return possible object is {@link BigInteger }
    +	 * 
    +	 */
    +	public BigInteger getYearOfStudy() {
    +		return yearOfStudy;
    +	}
    +
    +	/**
    +	 * Sets the value of the yearOfStudy property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link BigInteger }
    +	 * 
    +	 */
    +	public void setYearOfStudy(BigInteger value) {
    +		this.yearOfStudy = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the isEligibleForInternship property.
    +	 * 
    +	 */
    +	public boolean isIsEligibleForInternship() {
    +		return isEligibleForInternship;
    +	}
    +
    +	/**
    +	 * Sets the value of the isEligibleForInternship property.
    +	 * 
    +	 */
    +	public void setIsEligibleForInternship(boolean value) {
    +		this.isEligibleForInternship = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
    +
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the any property.
    +	 * 
    +	 * @return possible object is {@link Object }
    +	 * 
    +	 */
    +	public Object getAny() {
    +		return any;
    +	}
    +
    +	/**
    +	 * Sets the value of the any property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link Object }
    +	 * 
    +	 */
    +	public void setAny(Object value) {
    +		this.any = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java
    index 584a2e771..c02ffc01f 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -17,11 +16,12 @@ import eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupple
     import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.GeneralDiplomaType;
     import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.MultilingualGeneralDiplomaType;
     
    -
     /**
    - * 

    Java class for diplomaSupplementType complex type. + *

    + * Java class for diplomaSupplementType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="diplomaSupplementType">
    @@ -45,163 +45,141 @@ import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.ge
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "diplomaSupplementType", propOrder = {
    -    "multilingualDiplomaSupplement",
    -    "diplomaSupplement",
    -    "multilingualGeneralDiploma",
    -    "generalDiploma",
    -    "aqaa",
    -    "any"
    -})
    +@XmlType(name = "diplomaSupplementType", propOrder = { "multilingualDiplomaSupplement", "diplomaSupplement", "multilingualGeneralDiploma", "generalDiploma", "aqaa", "any" })
     public class DiplomaSupplementType {
     
    -    @XmlElement(name = "MultilingualDiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
    -    protected MultilingualDiplomaSupplementType multilingualDiplomaSupplement;
    -    @XmlElement(name = "DiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
    -    protected eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType diplomaSupplement;
    -    @XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    -    protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
    -    @XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    -    protected GeneralDiplomaType generalDiploma;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    -    @XmlAnyElement(lax = true)
    -    protected Object any;
    -
    -    /**
    -     * Gets the value of the multilingualDiplomaSupplement property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MultilingualDiplomaSupplementType }
    -     *     
    -     */
    -    public MultilingualDiplomaSupplementType getMultilingualDiplomaSupplement() {
    -        return multilingualDiplomaSupplement;
    -    }
    -
    -    /**
    -     * Sets the value of the multilingualDiplomaSupplement property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MultilingualDiplomaSupplementType }
    -     *     
    -     */
    -    public void setMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) {
    -        this.multilingualDiplomaSupplement = value;
    -    }
    -
    -    /**
    -     * Gets the value of the diplomaSupplement property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
    -     *     
    -     */
    -    public eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType getDiplomaSupplement() {
    -        return diplomaSupplement;
    -    }
    -
    -    /**
    -     * Sets the value of the diplomaSupplement property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
    -     *     
    -     */
    -    public void setDiplomaSupplement(eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType value) {
    -        this.diplomaSupplement = value;
    -    }
    -
    -    /**
    -     * Gets the value of the multilingualGeneralDiploma property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MultilingualGeneralDiplomaType }
    -     *     
    -     */
    -    public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
    -        return multilingualGeneralDiploma;
    -    }
    -
    -    /**
    -     * Sets the value of the multilingualGeneralDiploma property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MultilingualGeneralDiplomaType }
    -     *     
    -     */
    -    public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
    -        this.multilingualGeneralDiploma = value;
    -    }
    -
    -    /**
    -     * Gets the value of the generalDiploma property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GeneralDiplomaType }
    -     *     
    -     */
    -    public GeneralDiplomaType getGeneralDiploma() {
    -        return generalDiploma;
    -    }
    -
    -    /**
    -     * Sets the value of the generalDiploma property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GeneralDiplomaType }
    -     *     
    -     */
    -    public void setGeneralDiploma(GeneralDiplomaType value) {
    -        this.generalDiploma = value;
    -    }
    -
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    -
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    -
    -    /**
    -     * Gets the value of the any property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link Object }
    -     *     
    -     */
    -    public Object getAny() {
    -        return any;
    -    }
    -
    -    /**
    -     * Sets the value of the any property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link Object }
    -     *     
    -     */
    -    public void setAny(Object value) {
    -        this.any = value;
    -    }
    +	@XmlElement(name = "MultilingualDiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
    +	protected MultilingualDiplomaSupplementType multilingualDiplomaSupplement;
    +	@XmlElement(name = "DiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
    +	protected eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType diplomaSupplement;
    +	@XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    +	protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
    +	@XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
    +	protected GeneralDiplomaType generalDiploma;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
    +	@XmlAnyElement(lax = true)
    +	protected Object any;
    +
    +	/**
    +	 * Gets the value of the multilingualDiplomaSupplement property.
    +	 * 
    +	 * @return possible object is {@link MultilingualDiplomaSupplementType }
    +	 * 
    +	 */
    +	public MultilingualDiplomaSupplementType getMultilingualDiplomaSupplement() {
    +		return multilingualDiplomaSupplement;
    +	}
    +
    +	/**
    +	 * Sets the value of the multilingualDiplomaSupplement property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MultilingualDiplomaSupplementType }
    +	 * 
    +	 */
    +	public void setMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) {
    +		this.multilingualDiplomaSupplement = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the diplomaSupplement property.
    +	 * 
    +	 * @return possible object is {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
    +	 * 
    +	 */
    +	public eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType getDiplomaSupplement() {
    +		return diplomaSupplement;
    +	}
    +
    +	/**
    +	 * Sets the value of the diplomaSupplement property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
    +	 * 
    +	 */
    +	public void setDiplomaSupplement(eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType value) {
    +		this.diplomaSupplement = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the multilingualGeneralDiploma property.
    +	 * 
    +	 * @return possible object is {@link MultilingualGeneralDiplomaType }
    +	 * 
    +	 */
    +	public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
    +		return multilingualGeneralDiploma;
    +	}
    +
    +	/**
    +	 * Sets the value of the multilingualGeneralDiploma property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MultilingualGeneralDiplomaType }
    +	 * 
    +	 */
    +	public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
    +		this.multilingualGeneralDiploma = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the generalDiploma property.
    +	 * 
    +	 * @return possible object is {@link GeneralDiplomaType }
    +	 * 
    +	 */
    +	public GeneralDiplomaType getGeneralDiploma() {
    +		return generalDiploma;
    +	}
    +
    +	/**
    +	 * Sets the value of the generalDiploma property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link GeneralDiplomaType }
    +	 * 
    +	 */
    +	public void setGeneralDiploma(GeneralDiplomaType value) {
    +		this.generalDiploma = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
    +
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the any property.
    +	 * 
    +	 * @return possible object is {@link Object }
    +	 * 
    +	 */
    +	public Object getAny() {
    +		return any;
    +	}
    +
    +	/**
    +	 * Sets the value of the any property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link Object }
    +	 * 
    +	 */
    +	public void setAny(Object value) {
    +		this.any = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java
    index b0fc4d245..dcb37d8f6 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for habilitation complex type. + *

    + * Java class for habilitation complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="habilitation">
    @@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "habilitation", propOrder = {
    -    "ability",
    -    "aqaa"
    -})
    +@XmlType(name = "habilitation", propOrder = { "ability", "aqaa" })
     public class Habilitation {
     
    -    @XmlElement(required = true)
    -    protected String ability;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String ability;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the ability property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAbility() {
    -        return ability;
    -    }
    +	/**
    +	 * Gets the value of the ability property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAbility() {
    +		return ability;
    +	}
     
    -    /**
    -     * Sets the value of the ability property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAbility(String value) {
    -        this.ability = value;
    -    }
    +	/**
    +	 * Sets the value of the ability property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAbility(String value) {
    +		this.ability = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java
    index 92d600244..736d68b61 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for habilitationType complex type. + *

    + * Java class for habilitationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="habilitationType">
    @@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "habilitationType", propOrder = {
    -    "ability",
    -    "aqaa"
    -})
    +@XmlType(name = "habilitationType", propOrder = { "ability", "aqaa" })
     public class HabilitationType {
     
    -    @XmlElement(required = true)
    -    protected String ability;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String ability;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the ability property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAbility() {
    -        return ability;
    -    }
    +	/**
    +	 * Gets the value of the ability property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAbility() {
    +		return ability;
    +	}
     
    -    /**
    -     * Sets the value of the ability property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAbility(String value) {
    -        this.ability = value;
    -    }
    +	/**
    +	 * Sets the value of the ability property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAbility(String value) {
    +		this.ability = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java
    index 6e4edc6e0..4130094a2 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for hasAccountInBankType complex type. + *

    + * Java class for hasAccountInBankType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="hasAccountInBankType">
    @@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "hasAccountInBankType", propOrder = {
    -    "bankName",
    -    "aqaa"
    -})
    +@XmlType(name = "hasAccountInBankType", propOrder = { "bankName", "aqaa" })
     public class HasAccountInBankType {
     
    -    @XmlElement(required = true)
    -    protected String bankName;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String bankName;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the bankName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getBankName() {
    -        return bankName;
    -    }
    +	/**
    +	 * Gets the value of the bankName property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getBankName() {
    +		return bankName;
    +	}
     
    -    /**
    -     * Sets the value of the bankName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setBankName(String value) {
    -        this.bankName = value;
    -    }
    +	/**
    +	 * Sets the value of the bankName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setBankName(String value) {
    +		this.bankName = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java
    index 789a527e4..c9e387823 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import java.math.BigInteger;
    @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for hasDegreeType complex type. + *

    + * Java class for hasDegreeType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="hasDegreeType">
    @@ -39,136 +39,118 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "hasDegreeType", propOrder = {
    -    "study",
    -    "level",
    -    "yearObtained",
    -    "nameOfInstitution",
    -    "aqaa"
    -})
    +@XmlType(name = "hasDegreeType", propOrder = { "study", "level", "yearObtained", "nameOfInstitution", "aqaa" })
     public class HasDegreeType {
     
    -    @XmlElement(required = true)
    -    protected String study;
    -    @XmlElement(required = true)
    -    protected String level;
    -    @XmlElement(required = true)
    -    protected BigInteger yearObtained;
    -    @XmlElement(required = true)
    -    protected String nameOfInstitution;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    -
    -    /**
    -     * Gets the value of the study property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStudy() {
    -        return study;
    -    }
    -
    -    /**
    -     * Sets the value of the study property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStudy(String value) {
    -        this.study = value;
    -    }
    -
    -    /**
    -     * Gets the value of the level property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getLevel() {
    -        return level;
    -    }
    -
    -    /**
    -     * Sets the value of the level property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setLevel(String value) {
    -        this.level = value;
    -    }
    -
    -    /**
    -     * Gets the value of the yearObtained property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigInteger }
    -     *     
    -     */
    -    public BigInteger getYearObtained() {
    -        return yearObtained;
    -    }
    -
    -    /**
    -     * Sets the value of the yearObtained property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigInteger }
    -     *     
    -     */
    -    public void setYearObtained(BigInteger value) {
    -        this.yearObtained = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nameOfInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNameOfInstitution() {
    -        return nameOfInstitution;
    -    }
    -
    -    /**
    -     * Sets the value of the nameOfInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNameOfInstitution(String value) {
    -        this.nameOfInstitution = value;
    -    }
    -
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    -
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	@XmlElement(required = true)
    +	protected String study;
    +	@XmlElement(required = true)
    +	protected String level;
    +	@XmlElement(required = true)
    +	protected BigInteger yearObtained;
    +	@XmlElement(required = true)
    +	protected String nameOfInstitution;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
    +
    +	/**
    +	 * Gets the value of the study property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getStudy() {
    +		return study;
    +	}
    +
    +	/**
    +	 * Sets the value of the study property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setStudy(String value) {
    +		this.study = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the level property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getLevel() {
    +		return level;
    +	}
    +
    +	/**
    +	 * Sets the value of the level property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setLevel(String value) {
    +		this.level = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the yearObtained property.
    +	 * 
    +	 * @return possible object is {@link BigInteger }
    +	 * 
    +	 */
    +	public BigInteger getYearObtained() {
    +		return yearObtained;
    +	}
    +
    +	/**
    +	 * Sets the value of the yearObtained property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link BigInteger }
    +	 * 
    +	 */
    +	public void setYearObtained(BigInteger value) {
    +		this.yearObtained = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the nameOfInstitution property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNameOfInstitution() {
    +		return nameOfInstitution;
    +	}
    +
    +	/**
    +	 * Sets the value of the nameOfInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNameOfInstitution(String value) {
    +		this.nameOfInstitution = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
    +
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java
    index fe4422b94..6ce45f90d 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for isAcademicStaffType complex type. + *

    + * Java class for isAcademicStaffType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="isAcademicStaffType">
    @@ -37,108 +37,94 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "isAcademicStaffType", propOrder = {
    -    "nameOfInstitution",
    -    "occupation",
    -    "knowledgeArea",
    -    "aqaa"
    -})
    +@XmlType(name = "isAcademicStaffType", propOrder = { "nameOfInstitution", "occupation", "knowledgeArea", "aqaa" })
     public class IsAcademicStaffType {
     
    -    @XmlElement(required = true)
    -    protected String nameOfInstitution;
    -    @XmlElement(required = true)
    -    protected String occupation;
    -    protected String knowledgeArea;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String nameOfInstitution;
    +	@XmlElement(required = true)
    +	protected String occupation;
    +	protected String knowledgeArea;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the nameOfInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNameOfInstitution() {
    -        return nameOfInstitution;
    -    }
    +	/**
    +	 * Gets the value of the nameOfInstitution property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNameOfInstitution() {
    +		return nameOfInstitution;
    +	}
     
    -    /**
    -     * Sets the value of the nameOfInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNameOfInstitution(String value) {
    -        this.nameOfInstitution = value;
    -    }
    +	/**
    +	 * Sets the value of the nameOfInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNameOfInstitution(String value) {
    +		this.nameOfInstitution = value;
    +	}
     
    -    /**
    -     * Gets the value of the occupation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getOccupation() {
    -        return occupation;
    -    }
    +	/**
    +	 * Gets the value of the occupation property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getOccupation() {
    +		return occupation;
    +	}
     
    -    /**
    -     * Sets the value of the occupation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setOccupation(String value) {
    -        this.occupation = value;
    -    }
    +	/**
    +	 * Sets the value of the occupation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setOccupation(String value) {
    +		this.occupation = value;
    +	}
     
    -    /**
    -     * Gets the value of the knowledgeArea property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getKnowledgeArea() {
    -        return knowledgeArea;
    -    }
    +	/**
    +	 * Gets the value of the knowledgeArea property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getKnowledgeArea() {
    +		return knowledgeArea;
    +	}
     
    -    /**
    -     * Sets the value of the knowledgeArea property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setKnowledgeArea(String value) {
    -        this.knowledgeArea = value;
    -    }
    +	/**
    +	 * Sets the value of the knowledgeArea property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setKnowledgeArea(String value) {
    +		this.knowledgeArea = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java
    index 3cc073ed8..b48f6192f 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for isAdminStaffType complex type. + *

    + * Java class for isAdminStaffType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="isAdminStaffType">
    @@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "isAdminStaffType", propOrder = {
    -    "adminStaff",
    -    "aqaa"
    -})
    +@XmlType(name = "isAdminStaffType", propOrder = { "adminStaff", "aqaa" })
     public class IsAdminStaffType {
     
    -    @XmlElement(required = true)
    -    protected String adminStaff;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String adminStaff;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the adminStaff property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAdminStaff() {
    -        return adminStaff;
    -    }
    +	/**
    +	 * Gets the value of the adminStaff property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAdminStaff() {
    +		return adminStaff;
    +	}
     
    -    /**
    -     * Sets the value of the adminStaff property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAdminStaff(String value) {
    -        this.adminStaff = value;
    -    }
    +	/**
    +	 * Sets the value of the adminStaff property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAdminStaff(String value) {
    +		this.adminStaff = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java
    index d2151e30c..492acfbec 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for isCourseCoordinatorType complex type. + *

    + * Java class for isCourseCoordinatorType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="isCourseCoordinatorType">
    @@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "isCourseCoordinatorType", propOrder = {
    -    "courseCoodinator",
    -    "aqaa"
    -})
    +@XmlType(name = "isCourseCoordinatorType", propOrder = { "courseCoodinator", "aqaa" })
     public class IsCourseCoordinatorType {
     
    -    @XmlElement(required = true)
    -    protected String courseCoodinator;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String courseCoodinator;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the courseCoodinator property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCourseCoodinator() {
    -        return courseCoodinator;
    -    }
    +	/**
    +	 * Gets the value of the courseCoodinator property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCourseCoodinator() {
    +		return courseCoodinator;
    +	}
     
    -    /**
    -     * Sets the value of the courseCoodinator property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCourseCoodinator(String value) {
    -        this.courseCoodinator = value;
    -    }
    +	/**
    +	 * Sets the value of the courseCoodinator property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCourseCoodinator(String value) {
    +		this.courseCoodinator = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java
    index 711b7d68d..a448a7bbe 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.11.27 at 06:17:01 PM CET 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for isHealthCareProfessional_deprecatedType complex type. + *

    + * Java class for isHealthCareProfessional_deprecatedType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="isHealthCareProfessional_deprecatedType">
    @@ -37,109 +37,95 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "isHealthCareProfessional_deprecatedType", propOrder = {
    -    "nameOfOrganisation",
    -    "hcpType",
    -    "specialisation",
    -    "aqaa"
    -})
    +@XmlType(name = "isHealthCareProfessional_deprecatedType", propOrder = { "nameOfOrganisation", "hcpType", "specialisation", "aqaa" })
     public class IsHealthCareProfessionalDeprecatedType {
     
    -    @XmlElement(required = true)
    -    protected String nameOfOrganisation;
    -    @XmlElement(name = "HCPType", required = true)
    -    protected String hcpType;
    -    @XmlElement(required = true)
    -    protected String specialisation;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String nameOfOrganisation;
    +	@XmlElement(name = "HCPType", required = true)
    +	protected String hcpType;
    +	@XmlElement(required = true)
    +	protected String specialisation;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the nameOfOrganisation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNameOfOrganisation() {
    -        return nameOfOrganisation;
    -    }
    +	/**
    +	 * Gets the value of the nameOfOrganisation property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNameOfOrganisation() {
    +		return nameOfOrganisation;
    +	}
     
    -    /**
    -     * Sets the value of the nameOfOrganisation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNameOfOrganisation(String value) {
    -        this.nameOfOrganisation = value;
    -    }
    +	/**
    +	 * Sets the value of the nameOfOrganisation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNameOfOrganisation(String value) {
    +		this.nameOfOrganisation = value;
    +	}
     
    -    /**
    -     * Gets the value of the hcpType property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getHCPType() {
    -        return hcpType;
    -    }
    +	/**
    +	 * Gets the value of the hcpType property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getHCPType() {
    +		return hcpType;
    +	}
     
    -    /**
    -     * Sets the value of the hcpType property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setHCPType(String value) {
    -        this.hcpType = value;
    -    }
    +	/**
    +	 * Sets the value of the hcpType property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setHCPType(String value) {
    +		this.hcpType = value;
    +	}
     
    -    /**
    -     * Gets the value of the specialisation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getSpecialisation() {
    -        return specialisation;
    -    }
    +	/**
    +	 * Gets the value of the specialisation property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getSpecialisation() {
    +		return specialisation;
    +	}
     
    -    /**
    -     * Sets the value of the specialisation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setSpecialisation(String value) {
    -        this.specialisation = value;
    -    }
    +	/**
    +	 * Sets the value of the specialisation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setSpecialisation(String value) {
    +		this.specialisation = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java
    index be11e4ee8..02379d8b0 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.11.27 at 06:17:01 PM CET 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for isHealthCareProfessionalType complex type. + *

    + * Java class for isHealthCareProfessionalType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="isHealthCareProfessionalType">
    @@ -60,109 +60,95 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "isHealthCareProfessionalType", propOrder = {
    -    "typeOfHCP",
    -    "nameOfOrganisation",
    -    "typeOfOrganisation",
    -    "aqaa"
    -})
    +@XmlType(name = "isHealthCareProfessionalType", propOrder = { "typeOfHCP", "nameOfOrganisation", "typeOfOrganisation", "aqaa" })
     public class IsHealthCareProfessionalType {
     
    -    @XmlElement(required = true)
    -    protected String typeOfHCP;
    -    @XmlElement(required = true)
    -    protected String nameOfOrganisation;
    -    @XmlElement(required = true)
    -    protected String typeOfOrganisation;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String typeOfHCP;
    +	@XmlElement(required = true)
    +	protected String nameOfOrganisation;
    +	@XmlElement(required = true)
    +	protected String typeOfOrganisation;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the typeOfHCP property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTypeOfHCP() {
    -        return typeOfHCP;
    -    }
    +	/**
    +	 * Gets the value of the typeOfHCP property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getTypeOfHCP() {
    +		return typeOfHCP;
    +	}
     
    -    /**
    -     * Sets the value of the typeOfHCP property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTypeOfHCP(String value) {
    -        this.typeOfHCP = value;
    -    }
    +	/**
    +	 * Sets the value of the typeOfHCP property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setTypeOfHCP(String value) {
    +		this.typeOfHCP = value;
    +	}
     
    -    /**
    -     * Gets the value of the nameOfOrganisation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNameOfOrganisation() {
    -        return nameOfOrganisation;
    -    }
    +	/**
    +	 * Gets the value of the nameOfOrganisation property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNameOfOrganisation() {
    +		return nameOfOrganisation;
    +	}
     
    -    /**
    -     * Sets the value of the nameOfOrganisation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNameOfOrganisation(String value) {
    -        this.nameOfOrganisation = value;
    -    }
    +	/**
    +	 * Sets the value of the nameOfOrganisation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNameOfOrganisation(String value) {
    +		this.nameOfOrganisation = value;
    +	}
     
    -    /**
    -     * Gets the value of the typeOfOrganisation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTypeOfOrganisation() {
    -        return typeOfOrganisation;
    -    }
    +	/**
    +	 * Gets the value of the typeOfOrganisation property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getTypeOfOrganisation() {
    +		return typeOfOrganisation;
    +	}
     
    -    /**
    -     * Sets the value of the typeOfOrganisation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTypeOfOrganisation(String value) {
    -        this.typeOfOrganisation = value;
    -    }
    +	/**
    +	 * Sets the value of the typeOfOrganisation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setTypeOfOrganisation(String value) {
    +		this.typeOfOrganisation = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java
    index e02ec9811..02fed8bc8 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for isStudentType complex type. + *

    + * Java class for isStudentType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="isStudentType">
    @@ -37,107 +37,93 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "isStudentType", propOrder = {
    -    "study",
    -    "nameOfInstitution",
    -    "course",
    -    "aqaa"
    -})
    +@XmlType(name = "isStudentType", propOrder = { "study", "nameOfInstitution", "course", "aqaa" })
     public class IsStudentType {
     
    -    protected String study;
    -    @XmlElement(required = true)
    -    protected String nameOfInstitution;
    -    protected String course;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	protected String study;
    +	@XmlElement(required = true)
    +	protected String nameOfInstitution;
    +	protected String course;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the study property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStudy() {
    -        return study;
    -    }
    +	/**
    +	 * Gets the value of the study property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getStudy() {
    +		return study;
    +	}
     
    -    /**
    -     * Sets the value of the study property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStudy(String value) {
    -        this.study = value;
    -    }
    +	/**
    +	 * Sets the value of the study property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setStudy(String value) {
    +		this.study = value;
    +	}
     
    -    /**
    -     * Gets the value of the nameOfInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNameOfInstitution() {
    -        return nameOfInstitution;
    -    }
    +	/**
    +	 * Gets the value of the nameOfInstitution property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNameOfInstitution() {
    +		return nameOfInstitution;
    +	}
     
    -    /**
    -     * Sets the value of the nameOfInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNameOfInstitution(String value) {
    -        this.nameOfInstitution = value;
    -    }
    +	/**
    +	 * Sets the value of the nameOfInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNameOfInstitution(String value) {
    +		this.nameOfInstitution = value;
    +	}
     
    -    /**
    -     * Gets the value of the course property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCourse() {
    -        return course;
    -    }
    +	/**
    +	 * Gets the value of the course property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCourse() {
    +		return course;
    +	}
     
    -    /**
    -     * Sets the value of the course property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCourse(String value) {
    -        this.course = value;
    -    }
    +	/**
    +	 * Sets the value of the course property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCourse(String value) {
    +		this.course = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java
    index 4a1262003..9de9d18c9 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for isTeacherOfType complex type. + *

    + * Java class for isTeacherOfType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="isTeacherOfType">
    @@ -37,109 +37,95 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "isTeacherOfType", propOrder = {
    -    "nameOfInstitution",
    -    "course",
    -    "role",
    -    "aqaa"
    -})
    +@XmlType(name = "isTeacherOfType", propOrder = { "nameOfInstitution", "course", "role", "aqaa" })
     public class IsTeacherOfType {
     
    -    @XmlElement(required = true)
    -    protected String nameOfInstitution;
    -    @XmlElement(required = true)
    -    protected String course;
    -    @XmlElement(required = true)
    -    protected String role;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String nameOfInstitution;
    +	@XmlElement(required = true)
    +	protected String course;
    +	@XmlElement(required = true)
    +	protected String role;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
     
    -    /**
    -     * Gets the value of the nameOfInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNameOfInstitution() {
    -        return nameOfInstitution;
    -    }
    +	/**
    +	 * Gets the value of the nameOfInstitution property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNameOfInstitution() {
    +		return nameOfInstitution;
    +	}
     
    -    /**
    -     * Sets the value of the nameOfInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNameOfInstitution(String value) {
    -        this.nameOfInstitution = value;
    -    }
    +	/**
    +	 * Sets the value of the nameOfInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNameOfInstitution(String value) {
    +		this.nameOfInstitution = value;
    +	}
     
    -    /**
    -     * Gets the value of the course property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCourse() {
    -        return course;
    -    }
    +	/**
    +	 * Gets the value of the course property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCourse() {
    +		return course;
    +	}
     
    -    /**
    -     * Sets the value of the course property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCourse(String value) {
    -        this.course = value;
    -    }
    +	/**
    +	 * Sets the value of the course property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCourse(String value) {
    +		this.course = value;
    +	}
     
    -    /**
    -     * Gets the value of the role property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getRole() {
    -        return role;
    -    }
    +	/**
    +	 * Gets the value of the role property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getRole() {
    +		return role;
    +	}
     
    -    /**
    -     * Sets the value of the role property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setRole(String value) {
    -        this.role = value;
    -    }
    +	/**
    +	 * Sets the value of the role property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setRole(String value) {
    +		this.role = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java
    index b3386cdb5..824e79c70 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.10.29 at 02:15:24 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for mandateContentType complex type. + *

    + * Java class for mandateContentType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="mandateContentType">
    @@ -43,267 +43,234 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "mandateContentType", propOrder = {
    -    "typePower",
    -    "typeOfPower",
    -    "timeRestriction",
    -    "transactionLimit",
    -    "isJoined",
    -    "isJoint",
    -    "isChained",
    -    "originalMandateType",
    -    "originalMandate",
    -    "aqaa"
    -})
    +@XmlType(name = "mandateContentType", propOrder = { "typePower", "typeOfPower", "timeRestriction", "transactionLimit", "isJoined", "isJoint", "isChained", "originalMandateType", "originalMandate",
    +		"aqaa" })
     public class MandateContentType {
     
    -    @XmlElement(required = true)
    -    protected String typePower;
    -    @XmlElement(required = true)
    -    protected String typeOfPower;
    -    @XmlElement(required = true)
    -    protected TimeRestrictionType timeRestriction;
    -    @XmlElement(required = true)
    -    protected String isJoined;
    -    @XmlElement(required = true)
    -    protected String isJoint;
    -    protected boolean isChained;
    -    @XmlElement(required = true)
    -    protected byte[] originalMandate;
    -    @XmlElement(required = true)
    -    protected String originalMandateType;
    -    @XmlElement(required = true)
    -    protected TransactionLimitRestrictionType transactionLimit;
    -    @XmlElement(name = "AQAA")
    -    protected int aqaa;
    +	@XmlElement(required = true)
    +	protected String typePower;
    +	@XmlElement(required = true)
    +	protected String typeOfPower;
    +	@XmlElement(required = true)
    +	protected TimeRestrictionType timeRestriction;
    +	@XmlElement(required = true)
    +	protected String isJoined;
    +	@XmlElement(required = true)
    +	protected String isJoint;
    +	protected boolean isChained;
    +	@XmlElement(required = true)
    +	protected byte[] originalMandate;
    +	@XmlElement(required = true)
    +	protected String originalMandateType;
    +	@XmlElement(required = true)
    +	protected TransactionLimitRestrictionType transactionLimit;
    +	@XmlElement(name = "AQAA")
    +	protected int aqaa;
    +
    +	/**
    +	 * Gets the value of the typePower property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getTypePower() {
    +		return typePower;
    +	}
    +
    +	/**
    +	 * Sets the value of the typePower property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setTypePower(String value) {
    +		this.typePower = value;
    +		this.typeOfPower = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the typeOfPower property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getTypeOfPower() {
    +		return typeOfPower;
    +	}
     
    -    /**
    -     * Gets the value of the typePower property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTypePower() {
    -        return typePower;
    -    }
    +	/**
    +	 * Sets the value of the typeOfPower property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setTypeOfPower(String value) {
    +		this.typeOfPower = value;
    +		this.typePower = value;
    +	}
     
    -    /**
    -     * Sets the value of the typePower property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTypePower(String value) {
    -        this.typePower = value;
    -        this.typeOfPower = value;
    -    }
    +	/**
    +	 * Gets the value of the timeRestriction property.
    +	 * 
    +	 * @return possible object is {@link TimeRestrictionType }
    +	 * 
    +	 */
    +	public TimeRestrictionType getTimeRestriction() {
    +		return timeRestriction;
    +	}
     
    -    /**
    -     * Gets the value of the typeOfPower property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTypeOfPower() {
    -        return typeOfPower;
    -    }
    +	/**
    +	 * Sets the value of the timeRestriction property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link TimeRestrictionType }
    +	 * 
    +	 */
    +	public void setTimeRestriction(TimeRestrictionType value) {
    +		this.timeRestriction = value;
    +	}
     
    -    /**
    -     * Sets the value of the typeOfPower property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTypeOfPower(String value) {
    -        this.typeOfPower = value;
    -        this.typePower = value;
    -    }
    +	/**
    +	 * Gets the value of the isJoined property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getIsJoined() {
    +		return isJoined;
    +	}
     
    -    /**
    -     * Gets the value of the timeRestriction property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link TimeRestrictionType }
    -     *     
    -     */
    -    public TimeRestrictionType getTimeRestriction() {
    -        return timeRestriction;
    -    }
    +	/**
    +	 * Sets the value of the isJoined property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setIsJoined(String value) {
    +		this.isJoined = value;
    +		this.isJoint = value;
    +	}
     
    -    /**
    -     * Sets the value of the timeRestriction property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link TimeRestrictionType }
    -     *     
    -     */
    -    public void setTimeRestriction(TimeRestrictionType value) {
    -        this.timeRestriction = value;
    -    }
    +	/**
    +	 * Gets the value of the isJoint property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getIsJoint() {
    +		return isJoint;
    +	}
     
    -    /**
    -     * Gets the value of the isJoined property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getIsJoined() {
    -        return isJoined;
    -    }
    +	/**
    +	 * Sets the value of the isJoint property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setIsJoint(String value) {
    +		this.isJoint = value;
    +		this.isJoined = value;
    +	}
     
    -    /**
    -     * Sets the value of the isJoined property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setIsJoined(String value) {
    -        this.isJoined = value;
    -        this.isJoint = value;
    -    }
    +	/**
    +	 * Gets the value of the isChained property.
    +	 * 
    +	 */
    +	public boolean isIsChained() {
    +		return isChained;
    +	}
     
    -    /**
    -     * Gets the value of the isJoint property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getIsJoint() {
    -        return isJoint;
    -    }
    +	/**
    +	 * Sets the value of the isChained property.
    +	 * 
    +	 */
    +	public void setIsChained(boolean value) {
    +		this.isChained = value;
    +	}
     
    -    /**
    -     * Sets the value of the isJoint property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setIsJoint(String value) {
    -        this.isJoint = value;
    -        this.isJoined = value;
    -    }
    +	public void setIschained(boolean value) {
    +		setIsChained(value);
    +	}
     
    -    /**
    -     * Gets the value of the isChained property.
    -     * 
    -     */
    -    public boolean isIsChained() {
    -        return isChained;
    -    }
    -    
    -    /**
    -     * Sets the value of the isChained property.
    -     * 
    -     */
    -    public void setIsChained(boolean value) {
    -        this.isChained = value;
    -    }
    -    
    -    public void setIschained(boolean value){
    -    	setIsChained(value);
    -    }
    -    /**
    -     * Gets the value of the originalMandate property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getOriginalMandate() {
    -        return originalMandate;
    -    }
    +	/**
    +	 * Gets the value of the originalMandate property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getOriginalMandate() {
    +		return originalMandate;
    +	}
     
    -    /**
    -     * Sets the value of the originalMandate property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setOriginalMandate(byte[] value) {
    -        this.originalMandate = value;
    -    }
    +	/**
    +	 * Sets the value of the originalMandate property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setOriginalMandate(byte[] value) {
    +		this.originalMandate = value;
    +	}
     
    -    /**
    -     * Gets the value of the originalMandateType property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getOriginalMandateType() {
    -        return originalMandateType;
    -    }
    +	/**
    +	 * Gets the value of the originalMandateType property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getOriginalMandateType() {
    +		return originalMandateType;
    +	}
     
    -    /**
    -     * Sets the value of the originalMandateType property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setOriginalMandateType(String value) {
    -        this.originalMandateType = value;
    -    }
    +	/**
    +	 * Sets the value of the originalMandateType property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setOriginalMandateType(String value) {
    +		this.originalMandateType = value;
    +	}
     
    -    /**
    -     * Gets the value of the transactionLimit property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link TransactionLimitRestrictionType }
    -     *     
    -     */
    -    public TransactionLimitRestrictionType getTransactionLimit() {
    -        return transactionLimit;
    -    }
    +	/**
    +	 * Gets the value of the transactionLimit property.
    +	 * 
    +	 * @return possible object is {@link TransactionLimitRestrictionType }
    +	 * 
    +	 */
    +	public TransactionLimitRestrictionType getTransactionLimit() {
    +		return transactionLimit;
    +	}
     
    -    /**
    -     * Sets the value of the transactionLimit property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link TransactionLimitRestrictionType }
    -     *     
    -     */
    -    public void setTransactionLimit(TransactionLimitRestrictionType value) {
    -        this.transactionLimit = value;
    -    }
    +	/**
    +	 * Sets the value of the transactionLimit property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link TransactionLimitRestrictionType }
    +	 * 
    +	 */
    +	public void setTransactionLimit(TransactionLimitRestrictionType value) {
    +		this.transactionLimit = value;
    +	}
     
    -    /**
    -     * Gets the value of the aqaa property.
    -     * 
    -     */
    -    public int getAQAA() {
    -        return aqaa;
    -    }
    +	/**
    +	 * Gets the value of the aqaa property.
    +	 * 
    +	 */
    +	public int getAQAA() {
    +		return aqaa;
    +	}
     
    -    /**
    -     * Sets the value of the aqaa property.
    -     * 
    -     */
    -    public void setAQAA(int value) {
    -        this.aqaa = value;
    -    }
    +	/**
    +	 * Sets the value of the aqaa property.
    +	 * 
    +	 */
    +	public void setAQAA(int value) {
    +		this.aqaa = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java
    index 5ac29e2df..94bc2fcff 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.10.09 at 10:11:43 AM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import java.util.ArrayList;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for mandateType complex type. + *

    + * Java class for mandateType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="mandateType">
    @@ -39,124 +39,108 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "mandateType", propOrder = {
    -    "represented",
    -    "representing",
    -    "representative",
    -    "mandateContent"
    -})
    +@XmlType(name = "mandateType", propOrder = { "represented", "representing", "representative", "mandateContent" })
     public class MandateType {
     
    -    @XmlElement(required = true)
    -    protected RepresentationPersonType represented;
    -    @XmlElement(required = true)
    -    protected RepresentationPersonType representing;
    -    @XmlElement(required = true)
    -    protected RepresentationPersonType representative;
    -    @XmlElement(required = true)
    -    protected List mandateContent;
    +	@XmlElement(required = true)
    +	protected RepresentationPersonType represented;
    +	@XmlElement(required = true)
    +	protected RepresentationPersonType representing;
    +	@XmlElement(required = true)
    +	protected RepresentationPersonType representative;
    +	@XmlElement(required = true)
    +	protected List mandateContent;
     
    -    /**
    -     * Gets the value of the represented property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RepresentationPersonType }
    -     *     
    -     */
    -    public RepresentationPersonType getRepresented() {
    -        return represented;
    -    }
    +	/**
    +	 * Gets the value of the represented property.
    +	 * 
    +	 * @return possible object is {@link RepresentationPersonType }
    +	 * 
    +	 */
    +	public RepresentationPersonType getRepresented() {
    +		return represented;
    +	}
     
    -    /**
    -     * Sets the value of the represented property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RepresentationPersonType }
    -     *     
    -     */
    -    public void setRepresented(RepresentationPersonType value) {
    -        this.represented = value;
    -    }
    +	/**
    +	 * Sets the value of the represented property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RepresentationPersonType }
    +	 * 
    +	 */
    +	public void setRepresented(RepresentationPersonType value) {
    +		this.represented = value;
    +	}
     
    -    /**
    -     * Gets the value of the representing property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RepresentationPersonType }
    -     *     
    -     */
    -    public RepresentationPersonType getRepresenting() {
    -        return representing;
    -    }
    +	/**
    +	 * Gets the value of the representing property.
    +	 * 
    +	 * @return possible object is {@link RepresentationPersonType }
    +	 * 
    +	 */
    +	public RepresentationPersonType getRepresenting() {
    +		return representing;
    +	}
     
    -    /**
    -     * Sets the value of the representing property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RepresentationPersonType }
    -     *     
    -     */
    -    public void setRepresenting(RepresentationPersonType value) {
    -        this.representing = value;
    -        this.representative = value;
    -    }
    +	/**
    +	 * Sets the value of the representing property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RepresentationPersonType }
    +	 * 
    +	 */
    +	public void setRepresenting(RepresentationPersonType value) {
    +		this.representing = value;
    +		this.representative = value;
    +	}
     
    -    /**
    -     * Gets the value of the representative property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RepresentationPersonType }
    -     *     
    -     */
    -    public RepresentationPersonType getRepresentative() {
    -        return representative;
    -    }
    +	/**
    +	 * Gets the value of the representative property.
    +	 * 
    +	 * @return possible object is {@link RepresentationPersonType }
    +	 * 
    +	 */
    +	public RepresentationPersonType getRepresentative() {
    +		return representative;
    +	}
     
    -    /**
    -     * Sets the value of the representative property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RepresentationPersonType }
    -     *     
    -     */
    -    public void setRepresentative(RepresentationPersonType value) {
    -        this.representative = value;
    -        this.representing = value;
    -    }
    +	/**
    +	 * Sets the value of the representative property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RepresentationPersonType }
    +	 * 
    +	 */
    +	public void setRepresentative(RepresentationPersonType value) {
    +		this.representative = value;
    +		this.representing = value;
    +	}
     
    -    /**
    -     * Gets the value of the mandateContent property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the mandateContent property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getMandateContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link MandateContentType } - * - * - */ - public List getMandateContent() { - if (mandateContent == null) { - mandateContent = new ArrayList(); - } - return this.mandateContent; - } + /** + * Gets the value of the mandateContent property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the mandateContent property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getMandateContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link MandateContentType } + * + * + */ + public List getMandateContent() { + if (mandateContent == null) { + mandateContent = new ArrayList(); + } + return this.mandateContent; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java index f1ea05d65..6eaa63c5a 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java @@ -5,7 +5,6 @@ // Generated on: 2014.11.27 at 06:25:14 PM CET // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion; import javax.xml.bind.JAXBElement; @@ -15,509 +14,501 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; - /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the eu.stork.names.tc.stork._1_0.assertion package. - *

    An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. + * This object contains factory methods for each Java content interface and Java element interface generated in the eu.stork.names.tc.stork._1_0.assertion package. + *

    + * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class. * */ @XmlRegistry public class ObjectFactory { - private final static QName _Habilitation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "habilitation"); - private final static QName _SpApplication_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spApplication"); - private final static QName _Specialisation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "specialisation"); - private final static QName _AQAA_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AQAA"); - private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel"); - private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff"); - private final static QName _MandateContent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandateContent"); - private final static QName _IsHealthCareProfessionalDeprecated_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional_deprecated"); - private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress"); - private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry"); - private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff"); - private final static QName _AttributeValue_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AttributeValue"); - private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "countryCodeAddress"); - private final static QName _HasAccountInBank_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasAccountInBank"); - private final static QName _CurrentStudiesSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "currentStudiesSupplement"); - private final static QName _Mandate_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandate"); - private final static QName _RequestedAttribute_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "RequestedAttribute"); - private final static QName _SpSector_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spSector"); - private final static QName _HasDegree_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasDegree"); - private final static QName _DiplomaSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "diplomaSupplement"); - private final static QName _IsStudent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isStudent"); - private final static QName _HCPType_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "HCPType"); - private final static QName _RepresentationPerson_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "representationPerson"); - private final static QName _CanonicalResidenceAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalResidenceAddress"); - private final static QName _AcTitle_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "acTitle"); - private final static QName _IsTeacherOf_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isTeacherOf"); - private final static QName _IsCourseCoordinator_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isCourseCoordinator"); - private final static QName _CitizenCountryCode_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "CitizenCountryCode"); - private final static QName _Study_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "study"); - private final static QName _IsHealthCareProfessional_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._1_0.assertion - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link CurrentStudiesType } - * - */ - public CurrentStudiesType createCurrentStudiesType() { - return new CurrentStudiesType(); - } - - /** - * Create an instance of {@link MandateType } - * - */ - public MandateType createMandateType() { - return new MandateType(); - } - - /** - * Create an instance of {@link RequestedAttributeType } - * - */ - public RequestedAttributeType createRequestedAttributeType() { - return new RequestedAttributeType(); - } - - /** - * Create an instance of {@link HasAccountInBankType } - * - */ - public HasAccountInBankType createHasAccountInBankType() { - return new HasAccountInBankType(); - } - - /** - * Create an instance of {@link IsHealthCareProfessionalType } - * - */ - public IsHealthCareProfessionalType createIsHealthCareProfessionalType() { - return new IsHealthCareProfessionalType(); - } - - /** - * Create an instance of {@link IsAdminStaffType } - * - */ - public IsAdminStaffType createIsAdminStaffType() { - return new IsAdminStaffType(); - } - - /** - * Create an instance of {@link CanonicalAddressType } - * - */ - public CanonicalAddressType createCanonicalAddressType() { - return new CanonicalAddressType(); - } - - /** - * Create an instance of {@link IsHealthCareProfessionalDeprecatedType } - * - */ - public IsHealthCareProfessionalDeprecatedType createIsHealthCareProfessionalDeprecatedType() { - return new IsHealthCareProfessionalDeprecatedType(); - } - - /** - * Create an instance of {@link MandateContentType } - * - */ - public MandateContentType createMandateContentType() { - return new MandateContentType(); - } - - /** - * Create an instance of {@link IsCourseCoordinatorType } - * - */ - public IsCourseCoordinatorType createIsCourseCoordinatorType() { - return new IsCourseCoordinatorType(); - } - - /** - * Create an instance of {@link IsAcademicStaffType } - * - */ - public IsAcademicStaffType createIsAcademicStaffType() { - return new IsAcademicStaffType(); - } - - /** - * Create an instance of {@link IsTeacherOfType } - * - */ - public IsTeacherOfType createIsTeacherOfType() { - return new IsTeacherOfType(); - } - - /** - * Create an instance of {@link AcTitleType } - * - */ - public AcTitleType createAcTitleType() { - return new AcTitleType(); - } - - /** - * Create an instance of {@link RepresentationPersonType } - * - */ - public RepresentationPersonType createRepresentationPersonType() { - return new RepresentationPersonType(); - } - - /** - * Create an instance of {@link IsStudentType } - * - */ - public IsStudentType createIsStudentType() { - return new IsStudentType(); - } - - /** - * Create an instance of {@link HasDegreeType } - * - */ - public HasDegreeType createHasDegreeType() { - return new HasDegreeType(); - } - - /** - * Create an instance of {@link DiplomaSupplementType } - * - */ - public DiplomaSupplementType createDiplomaSupplementType() { - return new DiplomaSupplementType(); - } - - /** - * Create an instance of {@link HabilitationType } - * - */ - public HabilitationType createHabilitationType() { - return new HabilitationType(); - } - - /** - * Create an instance of {@link TimeRestrictionType } - * - */ - public TimeRestrictionType createTimeRestrictionType() { - return new TimeRestrictionType(); - } - - /** - * Create an instance of {@link Habilitation } - * - */ - public Habilitation createHabilitation() { - return new Habilitation(); - } - - /** - * Create an instance of {@link TransactionLimitRestrictionType } - * - */ - public TransactionLimitRestrictionType createTransactionLimitRestrictionType() { - return new TransactionLimitRestrictionType(); - } - - /** - * Create an instance of {@link IsHCPType } - * - */ - //public IsHCPType createIsHCPType() { - // return new IsHCPType(); - //} - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "habilitation") - public JAXBElement createHabilitation(HabilitationType value) { - return new JAXBElement(_Habilitation_QNAME, HabilitationType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spApplication") - public JAXBElement createSpApplication(String value) { - return new JAXBElement(_SpApplication_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "specialisation") - public JAXBElement createSpecialisation(String value) { - return new JAXBElement(_Specialisation_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AQAA") - public JAXBElement createAQAA(Integer value) { - return new JAXBElement(_AQAA_QNAME, Integer.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "QualityAuthenticationAssuranceLevel") - public JAXBElement createQualityAuthenticationAssuranceLevel(Integer value) { - return new JAXBElement(_QualityAuthenticationAssuranceLevel_QNAME, Integer.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsAcademicStaffType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAcademicStaff") - public JAXBElement createIsAcademicStaff(IsAcademicStaffType value) { - return new JAXBElement(_IsAcademicStaff_QNAME, IsAcademicStaffType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link MandateContentType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandateContent") - public JAXBElement createMandateContent(MandateContentType value) { - return new JAXBElement(_MandateContent_QNAME, MandateContentType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalDeprecatedType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional_deprecated") - public JAXBElement createIsHealthCareProfessionalDeprecated(IsHealthCareProfessionalDeprecatedType value) { - return new JAXBElement(_IsHealthCareProfessionalDeprecated_QNAME, IsHealthCareProfessionalDeprecatedType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalRegisteredAddress") - public JAXBElement createCanonicalRegisteredAddress(CanonicalAddressType value) { - return new JAXBElement(_CanonicalRegisteredAddress_QNAME, CanonicalAddressType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spCountry") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement createSpCountry(String value) { - return new JAXBElement(_SpCountry_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsAdminStaffType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAdminStaff") - public JAXBElement createIsAdminStaff(IsAdminStaffType value) { - return new JAXBElement(_IsAdminStaff_QNAME, IsAdminStaffType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AttributeValue") - public JAXBElement createAttributeValue(Object value) { - return new JAXBElement(_AttributeValue_QNAME, Object.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "countryCodeAddress") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement createCountryCodeAddress(String value) { - return new JAXBElement(_CountryCodeAddress_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link HasAccountInBankType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasAccountInBank") - public JAXBElement createHasAccountInBank(HasAccountInBankType value) { - return new JAXBElement(_HasAccountInBank_QNAME, HasAccountInBankType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CurrentStudiesType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "currentStudiesSupplement") - public JAXBElement createCurrentStudiesSupplement(CurrentStudiesType value) { - return new JAXBElement(_CurrentStudiesSupplement_QNAME, CurrentStudiesType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate") - public JAXBElement createMandate(MandateType value) { - return new JAXBElement(_Mandate_QNAME, MandateType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "RequestedAttribute") - public JAXBElement createRequestedAttribute(RequestedAttributeType value) { - return new JAXBElement(_RequestedAttribute_QNAME, RequestedAttributeType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spSector") - public JAXBElement createSpSector(String value) { - return new JAXBElement(_SpSector_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link HasDegreeType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasDegree") - public JAXBElement createHasDegree(HasDegreeType value) { - return new JAXBElement(_HasDegree_QNAME, HasDegreeType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "diplomaSupplement") - public JAXBElement createDiplomaSupplement(DiplomaSupplementType value) { - return new JAXBElement(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsStudentType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isStudent") - public JAXBElement createIsStudent(IsStudentType value) { - return new JAXBElement(_IsStudent_QNAME, IsStudentType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "HCPType") - public JAXBElement createHCPType(String value) { - return new JAXBElement(_HCPType_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RepresentationPersonType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "representationPerson") - public JAXBElement createRepresentationPerson(RepresentationPersonType value) { - return new JAXBElement(_RepresentationPerson_QNAME, RepresentationPersonType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalResidenceAddress") - public JAXBElement createCanonicalResidenceAddress(CanonicalAddressType value) { - return new JAXBElement(_CanonicalResidenceAddress_QNAME, CanonicalAddressType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AcTitleType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "acTitle") - public JAXBElement createAcTitle(AcTitleType value) { - return new JAXBElement(_AcTitle_QNAME, AcTitleType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsTeacherOfType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isTeacherOf") - public JAXBElement createIsTeacherOf(IsTeacherOfType value) { - return new JAXBElement(_IsTeacherOf_QNAME, IsTeacherOfType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsCourseCoordinatorType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isCourseCoordinator") - public JAXBElement createIsCourseCoordinator(IsCourseCoordinatorType value) { - return new JAXBElement(_IsCourseCoordinator_QNAME, IsCourseCoordinatorType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "CitizenCountryCode") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - public JAXBElement createCitizenCountryCode(String value) { - return new JAXBElement(_CitizenCountryCode_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "study") - public JAXBElement createStudy(String value) { - return new JAXBElement(_Study_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional") - public JAXBElement createIsHealthCareProfessional(IsHealthCareProfessionalType value) { - return new JAXBElement(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalType.class, null, value); - } + private final static QName _Habilitation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "habilitation"); + private final static QName _SpApplication_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spApplication"); + private final static QName _Specialisation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "specialisation"); + private final static QName _AQAA_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AQAA"); + private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel"); + private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff"); + private final static QName _MandateContent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandateContent"); + private final static QName _IsHealthCareProfessionalDeprecated_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional_deprecated"); + private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress"); + private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry"); + private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff"); + private final static QName _AttributeValue_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AttributeValue"); + private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "countryCodeAddress"); + private final static QName _HasAccountInBank_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasAccountInBank"); + private final static QName _CurrentStudiesSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "currentStudiesSupplement"); + private final static QName _Mandate_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandate"); + private final static QName _RequestedAttribute_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "RequestedAttribute"); + private final static QName _SpSector_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spSector"); + private final static QName _HasDegree_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasDegree"); + private final static QName _DiplomaSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "diplomaSupplement"); + private final static QName _IsStudent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isStudent"); + private final static QName _HCPType_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "HCPType"); + private final static QName _RepresentationPerson_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "representationPerson"); + private final static QName _CanonicalResidenceAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalResidenceAddress"); + private final static QName _AcTitle_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "acTitle"); + private final static QName _IsTeacherOf_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isTeacherOf"); + private final static QName _IsCourseCoordinator_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isCourseCoordinator"); + private final static QName _CitizenCountryCode_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "CitizenCountryCode"); + private final static QName _Study_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "study"); + private final static QName _IsHealthCareProfessional_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._1_0.assertion + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link CurrentStudiesType } + * + */ + public CurrentStudiesType createCurrentStudiesType() { + return new CurrentStudiesType(); + } + + /** + * Create an instance of {@link MandateType } + * + */ + public MandateType createMandateType() { + return new MandateType(); + } + + /** + * Create an instance of {@link RequestedAttributeType } + * + */ + public RequestedAttributeType createRequestedAttributeType() { + return new RequestedAttributeType(); + } + + /** + * Create an instance of {@link HasAccountInBankType } + * + */ + public HasAccountInBankType createHasAccountInBankType() { + return new HasAccountInBankType(); + } + + /** + * Create an instance of {@link IsHealthCareProfessionalType } + * + */ + public IsHealthCareProfessionalType createIsHealthCareProfessionalType() { + return new IsHealthCareProfessionalType(); + } + + /** + * Create an instance of {@link IsAdminStaffType } + * + */ + public IsAdminStaffType createIsAdminStaffType() { + return new IsAdminStaffType(); + } + + /** + * Create an instance of {@link CanonicalAddressType } + * + */ + public CanonicalAddressType createCanonicalAddressType() { + return new CanonicalAddressType(); + } + + /** + * Create an instance of {@link IsHealthCareProfessionalDeprecatedType } + * + */ + public IsHealthCareProfessionalDeprecatedType createIsHealthCareProfessionalDeprecatedType() { + return new IsHealthCareProfessionalDeprecatedType(); + } + + /** + * Create an instance of {@link MandateContentType } + * + */ + public MandateContentType createMandateContentType() { + return new MandateContentType(); + } + + /** + * Create an instance of {@link IsCourseCoordinatorType } + * + */ + public IsCourseCoordinatorType createIsCourseCoordinatorType() { + return new IsCourseCoordinatorType(); + } + + /** + * Create an instance of {@link IsAcademicStaffType } + * + */ + public IsAcademicStaffType createIsAcademicStaffType() { + return new IsAcademicStaffType(); + } + + /** + * Create an instance of {@link IsTeacherOfType } + * + */ + public IsTeacherOfType createIsTeacherOfType() { + return new IsTeacherOfType(); + } + + /** + * Create an instance of {@link AcTitleType } + * + */ + public AcTitleType createAcTitleType() { + return new AcTitleType(); + } + + /** + * Create an instance of {@link RepresentationPersonType } + * + */ + public RepresentationPersonType createRepresentationPersonType() { + return new RepresentationPersonType(); + } + + /** + * Create an instance of {@link IsStudentType } + * + */ + public IsStudentType createIsStudentType() { + return new IsStudentType(); + } + + /** + * Create an instance of {@link HasDegreeType } + * + */ + public HasDegreeType createHasDegreeType() { + return new HasDegreeType(); + } + + /** + * Create an instance of {@link DiplomaSupplementType } + * + */ + public DiplomaSupplementType createDiplomaSupplementType() { + return new DiplomaSupplementType(); + } + + /** + * Create an instance of {@link HabilitationType } + * + */ + public HabilitationType createHabilitationType() { + return new HabilitationType(); + } + + /** + * Create an instance of {@link TimeRestrictionType } + * + */ + public TimeRestrictionType createTimeRestrictionType() { + return new TimeRestrictionType(); + } + + /** + * Create an instance of {@link Habilitation } + * + */ + public Habilitation createHabilitation() { + return new Habilitation(); + } + + /** + * Create an instance of {@link TransactionLimitRestrictionType } + * + */ + public TransactionLimitRestrictionType createTransactionLimitRestrictionType() { + return new TransactionLimitRestrictionType(); + } + + /** + * Create an instance of {@link IsHCPType } + * + */ + // public IsHCPType createIsHCPType() { + // return new IsHCPType(); + // } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "habilitation") + public JAXBElement createHabilitation(HabilitationType value) { + return new JAXBElement(_Habilitation_QNAME, HabilitationType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spApplication") + public JAXBElement createSpApplication(String value) { + return new JAXBElement(_SpApplication_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "specialisation") + public JAXBElement createSpecialisation(String value) { + return new JAXBElement(_Specialisation_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AQAA") + public JAXBElement createAQAA(Integer value) { + return new JAXBElement(_AQAA_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "QualityAuthenticationAssuranceLevel") + public JAXBElement createQualityAuthenticationAssuranceLevel(Integer value) { + return new JAXBElement(_QualityAuthenticationAssuranceLevel_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IsAcademicStaffType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAcademicStaff") + public JAXBElement createIsAcademicStaff(IsAcademicStaffType value) { + return new JAXBElement(_IsAcademicStaff_QNAME, IsAcademicStaffType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link MandateContentType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandateContent") + public JAXBElement createMandateContent(MandateContentType value) { + return new JAXBElement(_MandateContent_QNAME, MandateContentType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalDeprecatedType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional_deprecated") + public JAXBElement createIsHealthCareProfessionalDeprecated(IsHealthCareProfessionalDeprecatedType value) { + return new JAXBElement(_IsHealthCareProfessionalDeprecated_QNAME, IsHealthCareProfessionalDeprecatedType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalRegisteredAddress") + public JAXBElement createCanonicalRegisteredAddress(CanonicalAddressType value) { + return new JAXBElement(_CanonicalRegisteredAddress_QNAME, CanonicalAddressType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spCountry") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + public JAXBElement createSpCountry(String value) { + return new JAXBElement(_SpCountry_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IsAdminStaffType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAdminStaff") + public JAXBElement createIsAdminStaff(IsAdminStaffType value) { + return new JAXBElement(_IsAdminStaff_QNAME, IsAdminStaffType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AttributeValue") + public JAXBElement createAttributeValue(Object value) { + return new JAXBElement(_AttributeValue_QNAME, Object.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "countryCodeAddress") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + public JAXBElement createCountryCodeAddress(String value) { + return new JAXBElement(_CountryCodeAddress_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HasAccountInBankType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasAccountInBank") + public JAXBElement createHasAccountInBank(HasAccountInBankType value) { + return new JAXBElement(_HasAccountInBank_QNAME, HasAccountInBankType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CurrentStudiesType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "currentStudiesSupplement") + public JAXBElement createCurrentStudiesSupplement(CurrentStudiesType value) { + return new JAXBElement(_CurrentStudiesSupplement_QNAME, CurrentStudiesType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate") + public JAXBElement createMandate(MandateType value) { + return new JAXBElement(_Mandate_QNAME, MandateType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "RequestedAttribute") + public JAXBElement createRequestedAttribute(RequestedAttributeType value) { + return new JAXBElement(_RequestedAttribute_QNAME, RequestedAttributeType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spSector") + public JAXBElement createSpSector(String value) { + return new JAXBElement(_SpSector_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link HasDegreeType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasDegree") + public JAXBElement createHasDegree(HasDegreeType value) { + return new JAXBElement(_HasDegree_QNAME, HasDegreeType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "diplomaSupplement") + public JAXBElement createDiplomaSupplement(DiplomaSupplementType value) { + return new JAXBElement(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IsStudentType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isStudent") + public JAXBElement createIsStudent(IsStudentType value) { + return new JAXBElement(_IsStudent_QNAME, IsStudentType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "HCPType") + public JAXBElement createHCPType(String value) { + return new JAXBElement(_HCPType_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RepresentationPersonType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "representationPerson") + public JAXBElement createRepresentationPerson(RepresentationPersonType value) { + return new JAXBElement(_RepresentationPerson_QNAME, RepresentationPersonType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalResidenceAddress") + public JAXBElement createCanonicalResidenceAddress(CanonicalAddressType value) { + return new JAXBElement(_CanonicalResidenceAddress_QNAME, CanonicalAddressType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AcTitleType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "acTitle") + public JAXBElement createAcTitle(AcTitleType value) { + return new JAXBElement(_AcTitle_QNAME, AcTitleType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IsTeacherOfType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isTeacherOf") + public JAXBElement createIsTeacherOf(IsTeacherOfType value) { + return new JAXBElement(_IsTeacherOf_QNAME, IsTeacherOfType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IsCourseCoordinatorType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isCourseCoordinator") + public JAXBElement createIsCourseCoordinator(IsCourseCoordinatorType value) { + return new JAXBElement(_IsCourseCoordinator_QNAME, IsCourseCoordinatorType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "CitizenCountryCode") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + public JAXBElement createCitizenCountryCode(String value) { + return new JAXBElement(_CitizenCountryCode_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "study") + public JAXBElement createStudy(String value) { + return new JAXBElement(_Study_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional") + public JAXBElement createIsHealthCareProfessional(IsHealthCareProfessionalType value) { + return new JAXBElement(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalType.class, null, value); + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java index 776b36644..ddcb6bb19 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java @@ -5,7 +5,6 @@ // Generated on: 2014.10.09 at 10:11:43 AM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion; import javax.xml.bind.annotation.XmlAccessType; @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; - /** - *

    Java class for originalMandateType complex type. + *

    + * Java class for originalMandateType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="originalMandateType">
    @@ -33,60 +33,52 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "originalMandateType", propOrder = {
    -    "value"
    -})
    +@XmlType(name = "originalMandateType", propOrder = { "value" })
     public class OriginalMandateType {
     
    -    @XmlValue
    -    protected byte[] value;
    -    @XmlAttribute(name = "mimeType")
    -    protected String mimeType;
    +	@XmlValue
    +	protected byte[] value;
    +	@XmlAttribute(name = "mimeType")
    +	protected String mimeType;
     
    -    /**
    -     * Gets the value of the value property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getValue() {
    -        return value;
    -    }
    +	/**
    +	 * Gets the value of the value property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getValue() {
    +		return value;
    +	}
     
    -    /**
    -     * Sets the value of the value property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setValue(byte[] value) {
    -        this.value = value;
    -    }
    +	/**
    +	 * Sets the value of the value property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setValue(byte[] value) {
    +		this.value = value;
    +	}
     
    -    /**
    -     * Gets the value of the mimeType property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getMimeType() {
    -        return mimeType;
    -    }
    +	/**
    +	 * Gets the value of the mimeType property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getMimeType() {
    +		return mimeType;
    +	}
     
    -    /**
    -     * Sets the value of the mimeType property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setMimeType(String value) {
    -        this.mimeType = value;
    -    }
    +	/**
    +	 * Sets the value of the mimeType property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setMimeType(String value) {
    +		this.mimeType = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java
    index fd7aa460a..23046f431 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.10.29 at 02:15:24 PM GMT
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for representationPersonType complex type. + *

    + * Java class for representationPersonType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="representationPersonType">
    @@ -46,244 +46,208 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "representationPersonType", propOrder = {
    -    "eIdentifier",
    -    "givenName",
    -    "surname",
    -    "dateOfBirth",
    -    "elpIdentifier",
    -    "legalName",
    -    "textRegisteredAddress",
    -    "canonicalRegisteredAddress",
    -    "legalForm"
    -})
    +@XmlType(name = "representationPersonType", propOrder = { "eIdentifier", "givenName", "surname", "dateOfBirth", "elpIdentifier", "legalName", "textRegisteredAddress", "canonicalRegisteredAddress",
    +		"legalForm" })
     public class RepresentationPersonType {
     
    -    protected String eIdentifier;
    -    protected String givenName;
    -    protected String surname;
    -    protected String dateOfBirth;
    -    @XmlElement(name = "eLPIdentifier")
    -    protected String elpIdentifier;
    -    protected String legalName;
    -    protected String textRegisteredAddress;
    -    protected CanonicalAddressType canonicalRegisteredAddress;
    -    protected String legalForm;
    -
    -    /**
    -     * Gets the value of the eIdentifier property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getEIdentifier() {
    -        return eIdentifier;
    -    }
    -
    -    /**
    -     * Sets the value of the eIdentifier property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setEIdentifier(String value) {
    -        this.eIdentifier = value;
    -    }
    -
    -    /**
    -     * Gets the value of the givenName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getGivenName() {
    -        return givenName;
    -    }
    -
    -    /**
    -     * Sets the value of the givenName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setGivenName(String value) {
    -        this.givenName = value;
    -    }
    -
    -    /**
    -     * Gets the value of the surname property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getSurname() {
    -        return surname;
    -    }
    -
    -    /**
    -     * Sets the value of the surname property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setSurname(String value) {
    -        this.surname = value;
    -    }
    -
    -    /**
    -     * Gets the value of the dateOfBirth property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDateOfBirth() {
    -        return dateOfBirth;
    -    }
    -
    -    /**
    -     * Sets the value of the dateOfBirth property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDateOfBirth(String value) {
    -        this.dateOfBirth = value;
    -    }
    -
    -    /**
    -     * Gets the value of the elpIdentifier property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getELPIdentifier() {
    -        return elpIdentifier;
    -    }
    -
    -    /**
    -     * Sets the value of the elpIdentifier property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setELPIdentifier(String value) {
    -        this.elpIdentifier = value;
    -    }
    -
    -    /**
    -     * Gets the value of the legalName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getLegalName() {
    -        return legalName;
    -    }
    -
    -    /**
    -     * Sets the value of the legalName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setLegalName(String value) {
    -        this.legalName = value;
    -    }
    -
    -    /**
    -     * Gets the value of the textRegisteredAddress property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTextRegisteredAddress() {
    -        return textRegisteredAddress;
    -    }
    -
    -    /**
    -     * Sets the value of the textRegisteredAddress property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTextRegisteredAddress(String value) {
    -        this.textRegisteredAddress = value;
    -    }
    -
    -    /**
    -     * Gets the value of the canonicalRegisteredAddress property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CanonicalAddressType }
    -     *     
    -     */
    -    public CanonicalAddressType getCanonicalRegisteredAddress() {
    -        return canonicalRegisteredAddress;
    -    }
    -
    -    /**
    -     * Sets the value of the canonicalRegisteredAddress property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CanonicalAddressType }
    -     *     
    -     */
    -    public void setCanonicalRegisteredAddress(CanonicalAddressType value) {
    -        this.canonicalRegisteredAddress = value;
    -    }
    -
    -    /**
    -     * Gets the value of the legalForm property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getLegalForm() {
    -        return legalForm;
    -    }
    -
    -    /**
    -     * Sets the value of the legalForm property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setLegalForm(String value) {
    -        this.legalForm = value;
    -    }
    +	protected String eIdentifier;
    +	protected String givenName;
    +	protected String surname;
    +	protected String dateOfBirth;
    +	@XmlElement(name = "eLPIdentifier")
    +	protected String elpIdentifier;
    +	protected String legalName;
    +	protected String textRegisteredAddress;
    +	protected CanonicalAddressType canonicalRegisteredAddress;
    +	protected String legalForm;
    +
    +	/**
    +	 * Gets the value of the eIdentifier property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getEIdentifier() {
    +		return eIdentifier;
    +	}
    +
    +	/**
    +	 * Sets the value of the eIdentifier property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setEIdentifier(String value) {
    +		this.eIdentifier = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the givenName property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getGivenName() {
    +		return givenName;
    +	}
    +
    +	/**
    +	 * Sets the value of the givenName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setGivenName(String value) {
    +		this.givenName = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the surname property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getSurname() {
    +		return surname;
    +	}
    +
    +	/**
    +	 * Sets the value of the surname property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setSurname(String value) {
    +		this.surname = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the dateOfBirth property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDateOfBirth() {
    +		return dateOfBirth;
    +	}
    +
    +	/**
    +	 * Sets the value of the dateOfBirth property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDateOfBirth(String value) {
    +		this.dateOfBirth = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the elpIdentifier property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getELPIdentifier() {
    +		return elpIdentifier;
    +	}
    +
    +	/**
    +	 * Sets the value of the elpIdentifier property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setELPIdentifier(String value) {
    +		this.elpIdentifier = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the legalName property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getLegalName() {
    +		return legalName;
    +	}
    +
    +	/**
    +	 * Sets the value of the legalName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setLegalName(String value) {
    +		this.legalName = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the textRegisteredAddress property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getTextRegisteredAddress() {
    +		return textRegisteredAddress;
    +	}
    +
    +	/**
    +	 * Sets the value of the textRegisteredAddress property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setTextRegisteredAddress(String value) {
    +		this.textRegisteredAddress = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the canonicalRegisteredAddress property.
    +	 * 
    +	 * @return possible object is {@link CanonicalAddressType }
    +	 * 
    +	 */
    +	public CanonicalAddressType getCanonicalRegisteredAddress() {
    +		return canonicalRegisteredAddress;
    +	}
    +
    +	/**
    +	 * Sets the value of the canonicalRegisteredAddress property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CanonicalAddressType }
    +	 * 
    +	 */
    +	public void setCanonicalRegisteredAddress(CanonicalAddressType value) {
    +		this.canonicalRegisteredAddress = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the legalForm property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getLegalForm() {
    +		return legalForm;
    +	}
    +
    +	/**
    +	 * Sets the value of the legalForm property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setLegalForm(String value) {
    +		this.legalForm = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java
    index 4800a2cfc..88146c90d 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import java.util.ArrayList;
    @@ -21,11 +20,12 @@ import javax.xml.bind.annotation.XmlSchemaType;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.namespace.QName;
     
    -
     /**
    - * 

    Java class for RequestedAttributeType complex type. + *

    + * Java class for RequestedAttributeType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="RequestedAttributeType">
    @@ -47,166 +47,147 @@ import javax.xml.namespace.QName;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "RequestedAttributeType", propOrder = {
    -    "attributeValue"
    -})
    +@XmlType(name = "RequestedAttributeType", propOrder = { "attributeValue" })
     public class RequestedAttributeType {
     
    -    @XmlElement(name = "AttributeValue")
    -    protected List attributeValue;
    -    @XmlAttribute(name = "Name", required = true)
    -    protected String name;
    -    @XmlAttribute(name = "NameFormat", required = true)
    -    @XmlSchemaType(name = "anyURI")
    -    protected String nameFormat;
    -    @XmlAttribute(name = "FriendlyName")
    -    protected String friendlyName;
    -    @XmlAttribute(name = "isRequired")
    -    protected Boolean isRequired;
    -    @XmlAnyAttribute
    -    private Map otherAttributes = new HashMap();
    -
    -    /**
    -     * Gets the value of the attributeValue property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the attributeValue property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getAttributeValue().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * - * - */ - public List getAttributeValue() { - if (attributeValue == null) { - attributeValue = new ArrayList(); - } - return this.attributeValue; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the nameFormat property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNameFormat() { - return nameFormat; - } - - /** - * Sets the value of the nameFormat property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNameFormat(String value) { - this.nameFormat = value; - } - - /** - * Gets the value of the friendlyName property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFriendlyName() { - return friendlyName; - } - - /** - * Sets the value of the friendlyName property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFriendlyName(String value) { - this.friendlyName = value; - } - - /** - * Gets the value of the isRequired property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsRequired() { - return isRequired; - } - - /** - * Sets the value of the isRequired property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsRequired(Boolean value) { - this.isRequired = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

    - * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } + @XmlElement(name = "AttributeValue") + protected List attributeValue; + @XmlAttribute(name = "Name", required = true) + protected String name; + @XmlAttribute(name = "NameFormat", required = true) + @XmlSchemaType(name = "anyURI") + protected String nameFormat; + @XmlAttribute(name = "FriendlyName") + protected String friendlyName; + @XmlAttribute(name = "isRequired") + protected Boolean isRequired; + @XmlAnyAttribute + private Map otherAttributes = new HashMap(); + + /** + * Gets the value of the attributeValue property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the attributeValue property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getAttributeValue().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } + * + * + */ + public List getAttributeValue() { + if (attributeValue == null) { + attributeValue = new ArrayList(); + } + return this.attributeValue; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the nameFormat property. + * + * @return possible object is {@link String } + * + */ + public String getNameFormat() { + return nameFormat; + } + + /** + * Sets the value of the nameFormat property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setNameFormat(String value) { + this.nameFormat = value; + } + + /** + * Gets the value of the friendlyName property. + * + * @return possible object is {@link String } + * + */ + public String getFriendlyName() { + return friendlyName; + } + + /** + * Sets the value of the friendlyName property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setFriendlyName(String value) { + this.friendlyName = value; + } + + /** + * Gets the value of the isRequired property. + * + * @return possible object is {@link Boolean } + * + */ + public Boolean isIsRequired() { + return isRequired; + } + + /** + * Sets the value of the isRequired property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setIsRequired(Boolean value) { + this.isRequired = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + *

    + * the map is keyed by the name of the attribute and the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter. + * + * + * @return always non-null + */ + public Map getOtherAttributes() { + return otherAttributes; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java index 34cfb978a..2ae80c697 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java @@ -5,7 +5,6 @@ // Generated on: 2014.05.12 at 10:04:52 AM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion; import javax.xml.bind.annotation.XmlAccessType; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; - /** - *

    Java class for TimeRestrictionType complex type. + *

    + * Java class for TimeRestrictionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="TimeRestrictionType">
    @@ -37,65 +37,56 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "TimeRestrictionType", propOrder = {
    -    "validFrom",
    -    "validTo"
    -})
    +@XmlType(name = "TimeRestrictionType", propOrder = { "validFrom", "validTo" })
     public class TimeRestrictionType {
     
    -    @XmlElement(required = true)
    -    @XmlSchemaType(name = "date")
    -    protected XMLGregorianCalendar validFrom;
    -    @XmlElement(required = true)
    -    @XmlSchemaType(name = "date")
    -    protected XMLGregorianCalendar validTo;
    +	@XmlElement(required = true)
    +	@XmlSchemaType(name = "date")
    +	protected XMLGregorianCalendar validFrom;
    +	@XmlElement(required = true)
    +	@XmlSchemaType(name = "date")
    +	protected XMLGregorianCalendar validTo;
     
    -    /**
    -     * Gets the value of the validFrom property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getValidFrom() {
    -        return validFrom;
    -    }
    +	/**
    +	 * Gets the value of the validFrom property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getValidFrom() {
    +		return validFrom;
    +	}
     
    -    /**
    -     * Sets the value of the validFrom property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setValidFrom(XMLGregorianCalendar value) {
    -        this.validFrom = value;
    -    }
    +	/**
    +	 * Sets the value of the validFrom property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setValidFrom(XMLGregorianCalendar value) {
    +		this.validFrom = value;
    +	}
     
    -    /**
    -     * Gets the value of the validTo property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getValidTo() {
    -        return validTo;
    -    }
    +	/**
    +	 * Gets the value of the validTo property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getValidTo() {
    +		return validTo;
    +	}
     
    -    /**
    -     * Sets the value of the validTo property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setValidTo(XMLGregorianCalendar value) {
    -        this.validTo = value;
    -    }
    +	/**
    +	 * Sets the value of the validTo property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setValidTo(XMLGregorianCalendar value) {
    +		this.validTo = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java
    index b9db4ea0d..39a20c7c2 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.05.12 at 10:04:52 AM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
     
     import java.math.BigDecimal;
    @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for TransactionLimitRestrictionType complex type. + *

    + * Java class for TransactionLimitRestrictionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="TransactionLimitRestrictionType">
    @@ -36,63 +36,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "TransactionLimitRestrictionType", propOrder = {
    -    "amount",
    -    "currency"
    -})
    +@XmlType(name = "TransactionLimitRestrictionType", propOrder = { "amount", "currency" })
     public class TransactionLimitRestrictionType {
     
    -    @XmlElement(required = true)
    -    protected BigDecimal amount;
    -    @XmlElement(required = true)
    -    protected String currency;
    +	@XmlElement(required = true)
    +	protected BigDecimal amount;
    +	@XmlElement(required = true)
    +	protected String currency;
     
    -    /**
    -     * Gets the value of the amount property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getAmount() {
    -        return amount;
    -    }
    +	/**
    +	 * Gets the value of the amount property.
    +	 * 
    +	 * @return possible object is {@link BigDecimal }
    +	 * 
    +	 */
    +	public BigDecimal getAmount() {
    +		return amount;
    +	}
     
    -    /**
    -     * Sets the value of the amount property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setAmount(BigDecimal value) {
    -        this.amount = value;
    -    }
    +	/**
    +	 * Sets the value of the amount property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link BigDecimal }
    +	 * 
    +	 */
    +	public void setAmount(BigDecimal value) {
    +		this.amount = value;
    +	}
     
    -    /**
    -     * Gets the value of the currency property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCurrency() {
    -        return currency;
    -    }
    +	/**
    +	 * Gets the value of the currency property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCurrency() {
    +		return currency;
    +	}
     
    -    /**
    -     * Sets the value of the currency property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCurrency(String value) {
    -        this.currency = value;
    -    }
    +	/**
    +	 * Sets the value of the currency property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCurrency(String value) {
    +		this.currency = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java
    index e94518e03..075851135 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java
    @@ -7,3 +7,4 @@
     
     @javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
    +
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java
    index 6b26bd000..c636217ca 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for AdditionalInformationType complex type. + *

    + * Java class for AdditionalInformationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AdditionalInformationType">
    @@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AdditionalInformationType", propOrder = {
    -    "specificInformation",
    -    "otherSources"
    -})
    +@XmlType(name = "AdditionalInformationType", propOrder = { "specificInformation", "otherSources" })
     public class AdditionalInformationType {
     
    -    @XmlElement(name = "SpecificInformation")
    -    protected RichTextTagType specificInformation;
    -    @XmlElement(name = "OtherSources")
    -    protected RichTextTagType otherSources;
    +	@XmlElement(name = "SpecificInformation")
    +	protected RichTextTagType specificInformation;
    +	@XmlElement(name = "OtherSources")
    +	protected RichTextTagType otherSources;
     
    -    /**
    -     * Gets the value of the specificInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getSpecificInformation() {
    -        return specificInformation;
    -    }
    +	/**
    +	 * Gets the value of the specificInformation property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getSpecificInformation() {
    +		return specificInformation;
    +	}
     
    -    /**
    -     * Sets the value of the specificInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setSpecificInformation(RichTextTagType value) {
    -        this.specificInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the specificInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setSpecificInformation(RichTextTagType value) {
    +		this.specificInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the otherSources property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getOtherSources() {
    -        return otherSources;
    -    }
    +	/**
    +	 * Gets the value of the otherSources property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getOtherSources() {
    +		return otherSources;
    +	}
     
    -    /**
    -     * Sets the value of the otherSources property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setOtherSources(RichTextTagType value) {
    -        this.otherSources = value;
    -    }
    +	/**
    +	 * Sets the value of the otherSources property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setOtherSources(RichTextTagType value) {
    +		this.otherSources = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java
    index d7fae6b34..67ef6d2dc 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for AddressType complex type. + *

    + * Java class for AddressType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AddressType">
    @@ -40,149 +40,129 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AddressType", propOrder = {
    -    "line",
    -    "city",
    -    "stateOrRegion",
    -    "postalCode",
    -    "country"
    -})
    +@XmlType(name = "AddressType", propOrder = { "line", "city", "stateOrRegion", "postalCode", "country" })
     public class AddressType {
     
    -    @XmlElement(name = "Line", required = true)
    -    protected List line;
    -    @XmlElement(name = "City")
    -    protected String city;
    -    @XmlElement(name = "StateOrRegion")
    -    protected String stateOrRegion;
    -    @XmlElement(name = "PostalCode")
    -    protected String postalCode;
    -    @XmlElement(name = "Country")
    -    protected CountryTextCodeType country;
    -
    -    /**
    -     * Gets the value of the line property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the line property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getLine().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getLine() { - if (line == null) { - line = new ArrayList(); - } - return this.line; - } - - /** - * Gets the value of the city property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCity() { - return city; - } - - /** - * Sets the value of the city property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCity(String value) { - this.city = value; - } - - /** - * Gets the value of the stateOrRegion property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStateOrRegion() { - return stateOrRegion; - } - - /** - * Sets the value of the stateOrRegion property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStateOrRegion(String value) { - this.stateOrRegion = value; - } - - /** - * Gets the value of the postalCode property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPostalCode() { - return postalCode; - } - - /** - * Sets the value of the postalCode property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPostalCode(String value) { - this.postalCode = value; - } - - /** - * Gets the value of the country property. - * - * @return - * possible object is - * {@link CountryTextCodeType } - * - */ - public CountryTextCodeType getCountry() { - return country; - } - - /** - * Sets the value of the country property. - * - * @param value - * allowed object is - * {@link CountryTextCodeType } - * - */ - public void setCountry(CountryTextCodeType value) { - this.country = value; - } + @XmlElement(name = "Line", required = true) + protected List line; + @XmlElement(name = "City") + protected String city; + @XmlElement(name = "StateOrRegion") + protected String stateOrRegion; + @XmlElement(name = "PostalCode") + protected String postalCode; + @XmlElement(name = "Country") + protected CountryTextCodeType country; + + /** + * Gets the value of the line property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the line property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getLine().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getLine() { + if (line == null) { + line = new ArrayList(); + } + return this.line; + } + + /** + * Gets the value of the city property. + * + * @return possible object is {@link String } + * + */ + public String getCity() { + return city; + } + + /** + * Sets the value of the city property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setCity(String value) { + this.city = value; + } + + /** + * Gets the value of the stateOrRegion property. + * + * @return possible object is {@link String } + * + */ + public String getStateOrRegion() { + return stateOrRegion; + } + + /** + * Sets the value of the stateOrRegion property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setStateOrRegion(String value) { + this.stateOrRegion = value; + } + + /** + * Gets the value of the postalCode property. + * + * @return possible object is {@link String } + * + */ + public String getPostalCode() { + return postalCode; + } + + /** + * Sets the value of the postalCode property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setPostalCode(String value) { + this.postalCode = value; + } + + /** + * Gets the value of the country property. + * + * @return possible object is {@link CountryTextCodeType } + * + */ + public CountryTextCodeType getCountry() { + return country; + } + + /** + * Sets the value of the country property. + * + * @param value + * allowed object is {@link CountryTextCodeType } + * + */ + public void setCountry(CountryTextCodeType value) { + this.country = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java index f905dcdd5..f0114d912 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for AttachedFileDataType complex type. + *

    + * Java class for AttachedFileDataType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedFileDataType">
    @@ -36,88 +36,75 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedFileDataType", propOrder = {
    -    "description",
    -    "mime",
    -    "data"
    -})
    +@XmlType(name = "AttachedFileDataType", propOrder = { "description", "mime", "data" })
     public class AttachedFileDataType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected MimeType mime;
    -    @XmlElement(name = "Data", required = true)
    -    protected byte[] data;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected MimeType mime;
    +	@XmlElement(name = "Data", required = true)
    +	protected byte[] data;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public MimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link MimeType }
    +	 * 
    +	 */
    +	public MimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public void setMime(MimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MimeType }
    +	 * 
    +	 */
    +	public void setMime(MimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the data property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getData() {
    -        return data;
    -    }
    +	/**
    +	 * Gets the value of the data property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getData() {
    +		return data;
    +	}
     
    -    /**
    -     * Sets the value of the data property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setData(byte[] value) {
    -        this.data = value;
    -    }
    +	/**
    +	 * Sets the value of the data property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setData(byte[] value) {
    +		this.data = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java
    index 7bd89fef8..4e9bf3c4b 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for AttachedFileURLType complex type. + *

    + * Java class for AttachedFileURLType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedFileURLType">
    @@ -36,90 +36,77 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedFileURLType", propOrder = {
    -    "description",
    -    "mime",
    -    "url"
    -})
    +@XmlType(name = "AttachedFileURLType", propOrder = { "description", "mime", "url" })
     public class AttachedFileURLType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected MimeType mime;
    -    @XmlElement(name = "URL", required = true)
    -    protected String url;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected MimeType mime;
    +	@XmlElement(name = "URL", required = true)
    +	protected String url;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public MimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link MimeType }
    +	 * 
    +	 */
    +	public MimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MimeType }
    -     *     
    -     */
    -    public void setMime(MimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MimeType }
    +	 * 
    +	 */
    +	public void setMime(MimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the url property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getURL() {
    -        return url;
    -    }
    +	/**
    +	 * Gets the value of the url property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getURL() {
    +		return url;
    +	}
     
    -    /**
    -     * Sets the value of the url property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setURL(String value) {
    -        this.url = value;
    -    }
    +	/**
    +	 * Sets the value of the url property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setURL(String value) {
    +		this.url = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java
    index cf964d7d0..61be0a30a 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for AttachedImageDataType complex type. + *

    + * Java class for AttachedImageDataType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedImageDataType">
    @@ -36,88 +36,75 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedImageDataType", propOrder = {
    -    "description",
    -    "mime",
    -    "data"
    -})
    +@XmlType(name = "AttachedImageDataType", propOrder = { "description", "mime", "data" })
     public class AttachedImageDataType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected ImageMimeType mime;
    -    @XmlElement(name = "Data", required = true)
    -    protected byte[] data;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected ImageMimeType mime;
    +	@XmlElement(name = "Data", required = true)
    +	protected byte[] data;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public ImageMimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public ImageMimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public void setMime(ImageMimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public void setMime(ImageMimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the data property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getData() {
    -        return data;
    -    }
    +	/**
    +	 * Gets the value of the data property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getData() {
    +		return data;
    +	}
     
    -    /**
    -     * Sets the value of the data property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setData(byte[] value) {
    -        this.data = value;
    -    }
    +	/**
    +	 * Sets the value of the data property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setData(byte[] value) {
    +		this.data = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java
    index 945b715fe..e6c11edda 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for AttachedImageURLType complex type. + *

    + * Java class for AttachedImageURLType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedImageURLType">
    @@ -36,90 +36,77 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedImageURLType", propOrder = {
    -    "description",
    -    "mime",
    -    "url"
    -})
    +@XmlType(name = "AttachedImageURLType", propOrder = { "description", "mime", "url" })
     public class AttachedImageURLType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlElement(name = "Mime", required = true)
    -    protected ImageMimeType mime;
    -    @XmlElement(name = "URL", required = true)
    -    protected String url;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlElement(name = "Mime", required = true)
    +	protected ImageMimeType mime;
    +	@XmlElement(name = "URL", required = true)
    +	protected String url;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the mime property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public ImageMimeType getMime() {
    -        return mime;
    -    }
    +	/**
    +	 * Gets the value of the mime property.
    +	 * 
    +	 * @return possible object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public ImageMimeType getMime() {
    +		return mime;
    +	}
     
    -    /**
    -     * Sets the value of the mime property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ImageMimeType }
    -     *     
    -     */
    -    public void setMime(ImageMimeType value) {
    -        this.mime = value;
    -    }
    +	/**
    +	 * Sets the value of the mime property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link ImageMimeType }
    +	 * 
    +	 */
    +	public void setMime(ImageMimeType value) {
    +		this.mime = value;
    +	}
     
    -    /**
    -     * Gets the value of the url property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getURL() {
    -        return url;
    -    }
    +	/**
    +	 * Gets the value of the url property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getURL() {
    +		return url;
    +	}
     
    -    /**
    -     * Sets the value of the url property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setURL(String value) {
    -        this.url = value;
    -    }
    +	/**
    +	 * Sets the value of the url property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setURL(String value) {
    +		this.url = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java
    index 83cb26800..a4e64d560 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
     import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
     
    -
     /**
    - * 

    Java class for AttachedType complex type. + *

    + * Java class for AttachedType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachedType">
    @@ -43,146 +43,126 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachedType", propOrder = {
    -    "fileData",
    -    "fileURI",
    -    "imageData",
    -    "imageURI"
    -})
    +@XmlType(name = "AttachedType", propOrder = { "fileData", "fileURI", "imageData", "imageURI" })
     public class AttachedType {
     
    -    @XmlElement(name = "FileData")
    -    protected AttachedFileDataType fileData;
    -    @XmlElement(name = "FileURI")
    -    protected AttachedFileURLType fileURI;
    -    @XmlElement(name = "ImageData")
    -    protected AttachedImageDataType imageData;
    -    @XmlElement(name = "ImageURI")
    -    protected AttachedImageURLType imageURI;
    -    @XmlAttribute(name = "attachedID", required = true)
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String attachedID;
    -
    -    /**
    -     * Gets the value of the fileData property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedFileDataType }
    -     *     
    -     */
    -    public AttachedFileDataType getFileData() {
    -        return fileData;
    -    }
    -
    -    /**
    -     * Sets the value of the fileData property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedFileDataType }
    -     *     
    -     */
    -    public void setFileData(AttachedFileDataType value) {
    -        this.fileData = value;
    -    }
    -
    -    /**
    -     * Gets the value of the fileURI property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedFileURLType }
    -     *     
    -     */
    -    public AttachedFileURLType getFileURI() {
    -        return fileURI;
    -    }
    -
    -    /**
    -     * Sets the value of the fileURI property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedFileURLType }
    -     *     
    -     */
    -    public void setFileURI(AttachedFileURLType value) {
    -        this.fileURI = value;
    -    }
    -
    -    /**
    -     * Gets the value of the imageData property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedImageDataType }
    -     *     
    -     */
    -    public AttachedImageDataType getImageData() {
    -        return imageData;
    -    }
    -
    -    /**
    -     * Sets the value of the imageData property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedImageDataType }
    -     *     
    -     */
    -    public void setImageData(AttachedImageDataType value) {
    -        this.imageData = value;
    -    }
    -
    -    /**
    -     * Gets the value of the imageURI property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachedImageURLType }
    -     *     
    -     */
    -    public AttachedImageURLType getImageURI() {
    -        return imageURI;
    -    }
    -
    -    /**
    -     * Sets the value of the imageURI property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachedImageURLType }
    -     *     
    -     */
    -    public void setImageURI(AttachedImageURLType value) {
    -        this.imageURI = value;
    -    }
    -
    -    /**
    -     * Gets the value of the attachedID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAttachedID() {
    -        return attachedID;
    -    }
    -
    -    /**
    -     * Sets the value of the attachedID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAttachedID(String value) {
    -        this.attachedID = value;
    -    }
    +	@XmlElement(name = "FileData")
    +	protected AttachedFileDataType fileData;
    +	@XmlElement(name = "FileURI")
    +	protected AttachedFileURLType fileURI;
    +	@XmlElement(name = "ImageData")
    +	protected AttachedImageDataType imageData;
    +	@XmlElement(name = "ImageURI")
    +	protected AttachedImageURLType imageURI;
    +	@XmlAttribute(name = "attachedID", required = true)
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String attachedID;
    +
    +	/**
    +	 * Gets the value of the fileData property.
    +	 * 
    +	 * @return possible object is {@link AttachedFileDataType }
    +	 * 
    +	 */
    +	public AttachedFileDataType getFileData() {
    +		return fileData;
    +	}
    +
    +	/**
    +	 * Sets the value of the fileData property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedFileDataType }
    +	 * 
    +	 */
    +	public void setFileData(AttachedFileDataType value) {
    +		this.fileData = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the fileURI property.
    +	 * 
    +	 * @return possible object is {@link AttachedFileURLType }
    +	 * 
    +	 */
    +	public AttachedFileURLType getFileURI() {
    +		return fileURI;
    +	}
    +
    +	/**
    +	 * Sets the value of the fileURI property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedFileURLType }
    +	 * 
    +	 */
    +	public void setFileURI(AttachedFileURLType value) {
    +		this.fileURI = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the imageData property.
    +	 * 
    +	 * @return possible object is {@link AttachedImageDataType }
    +	 * 
    +	 */
    +	public AttachedImageDataType getImageData() {
    +		return imageData;
    +	}
    +
    +	/**
    +	 * Sets the value of the imageData property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedImageDataType }
    +	 * 
    +	 */
    +	public void setImageData(AttachedImageDataType value) {
    +		this.imageData = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the imageURI property.
    +	 * 
    +	 * @return possible object is {@link AttachedImageURLType }
    +	 * 
    +	 */
    +	public AttachedImageURLType getImageURI() {
    +		return imageURI;
    +	}
    +
    +	/**
    +	 * Sets the value of the imageURI property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachedImageURLType }
    +	 * 
    +	 */
    +	public void setImageURI(AttachedImageURLType value) {
    +		this.imageURI = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the attachedID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAttachedID() {
    +		return attachedID;
    +	}
    +
    +	/**
    +	 * Sets the value of the attachedID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAttachedID(String value) {
    +		this.attachedID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java
    index a8612ae63..abb61728a 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for AttachmentsType complex type. + *

    + * Java class for AttachmentsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="AttachmentsType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "AttachmentsType", propOrder = {
    -    "attached"
    -})
    +@XmlType(name = "AttachmentsType", propOrder = { "attached" })
     public class AttachmentsType {
     
    -    @XmlElement(name = "Attached", required = true)
    -    protected List attached;
    +	@XmlElement(name = "Attached", required = true)
    +	protected List attached;
     
    -    /**
    -     * Gets the value of the attached property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the attached property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getAttached().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link AttachedType } - * - * - */ - public List getAttached() { - if (attached == null) { - attached = new ArrayList(); - } - return this.attached; - } + /** + * Gets the value of the attached property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the attached property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getAttached().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link AttachedType } + * + * + */ + public List getAttached() { + if (attached == null) { + attached = new ArrayList(); + } + return this.attached; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java index c154e92c3..0ca2d1a02 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; - /** - *

    Java class for CertificationOfTheSupplementType complex type. + *

    + * Java class for CertificationOfTheSupplementType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CertificationOfTheSupplementType">
    @@ -37,90 +37,77 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CertificationOfTheSupplementType", propOrder = {
    -    "certificationDate",
    -    "officialsCertifying",
    -    "officialStamp"
    -})
    +@XmlType(name = "CertificationOfTheSupplementType", propOrder = { "certificationDate", "officialsCertifying", "officialStamp" })
     public class CertificationOfTheSupplementType {
     
    -    @XmlElement(name = "CertificationDate")
    -    protected XMLGregorianCalendar certificationDate;
    -    @XmlElement(name = "OfficialsCertifying")
    -    protected OfficialsCertifyingType officialsCertifying;
    -    @XmlElement(name = "OfficialStamp")
    -    protected OfficialStampType officialStamp;
    +	@XmlElement(name = "CertificationDate")
    +	protected XMLGregorianCalendar certificationDate;
    +	@XmlElement(name = "OfficialsCertifying")
    +	protected OfficialsCertifyingType officialsCertifying;
    +	@XmlElement(name = "OfficialStamp")
    +	protected OfficialStampType officialStamp;
     
    -    /**
    -     * Gets the value of the certificationDate property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getCertificationDate() {
    -        return certificationDate;
    -    }
    +	/**
    +	 * Gets the value of the certificationDate property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getCertificationDate() {
    +		return certificationDate;
    +	}
     
    -    /**
    -     * Sets the value of the certificationDate property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setCertificationDate(XMLGregorianCalendar value) {
    -        this.certificationDate = value;
    -    }
    +	/**
    +	 * Sets the value of the certificationDate property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setCertificationDate(XMLGregorianCalendar value) {
    +		this.certificationDate = value;
    +	}
     
    -    /**
    -     * Gets the value of the officialsCertifying property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link OfficialsCertifyingType }
    -     *     
    -     */
    -    public OfficialsCertifyingType getOfficialsCertifying() {
    -        return officialsCertifying;
    -    }
    +	/**
    +	 * Gets the value of the officialsCertifying property.
    +	 * 
    +	 * @return possible object is {@link OfficialsCertifyingType }
    +	 * 
    +	 */
    +	public OfficialsCertifyingType getOfficialsCertifying() {
    +		return officialsCertifying;
    +	}
     
    -    /**
    -     * Sets the value of the officialsCertifying property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link OfficialsCertifyingType }
    -     *     
    -     */
    -    public void setOfficialsCertifying(OfficialsCertifyingType value) {
    -        this.officialsCertifying = value;
    -    }
    +	/**
    +	 * Sets the value of the officialsCertifying property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link OfficialsCertifyingType }
    +	 * 
    +	 */
    +	public void setOfficialsCertifying(OfficialsCertifyingType value) {
    +		this.officialsCertifying = value;
    +	}
     
    -    /**
    -     * Gets the value of the officialStamp property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link OfficialStampType }
    -     *     
    -     */
    -    public OfficialStampType getOfficialStamp() {
    -        return officialStamp;
    -    }
    +	/**
    +	 * Gets the value of the officialStamp property.
    +	 * 
    +	 * @return possible object is {@link OfficialStampType }
    +	 * 
    +	 */
    +	public OfficialStampType getOfficialStamp() {
    +		return officialStamp;
    +	}
     
    -    /**
    -     * Sets the value of the officialStamp property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link OfficialStampType }
    -     *     
    -     */
    -    public void setOfficialStamp(OfficialStampType value) {
    -        this.officialStamp = value;
    -    }
    +	/**
    +	 * Sets the value of the officialStamp property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link OfficialStampType }
    +	 * 
    +	 */
    +	public void setOfficialStamp(OfficialStampType value) {
    +		this.officialStamp = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java
    index 3ed1697e7..155849e3f 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for ContactInformationType complex type. + *

    + * Java class for ContactInformationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ContactInformationType">
    @@ -39,132 +39,118 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ContactInformationType", propOrder = {
    -    "address",
    -    "phoneNumber",
    -    "email",
    -    "webSite"
    -})
    +@XmlType(name = "ContactInformationType", propOrder = { "address", "phoneNumber", "email", "webSite" })
     public class ContactInformationType {
     
    -    @XmlElement(name = "Address")
    -    protected AddressType address;
    -    @XmlElement(name = "PhoneNumber")
    -    protected List phoneNumber;
    -    @XmlElement(name = "Email")
    -    protected List email;
    -    @XmlElement(name = "WebSite")
    -    protected List webSite;
    +	@XmlElement(name = "Address")
    +	protected AddressType address;
    +	@XmlElement(name = "PhoneNumber")
    +	protected List phoneNumber;
    +	@XmlElement(name = "Email")
    +	protected List email;
    +	@XmlElement(name = "WebSite")
    +	protected List webSite;
     
    -    /**
    -     * Gets the value of the address property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AddressType }
    -     *     
    -     */
    -    public AddressType getAddress() {
    -        return address;
    -    }
    +	/**
    +	 * Gets the value of the address property.
    +	 * 
    +	 * @return possible object is {@link AddressType }
    +	 * 
    +	 */
    +	public AddressType getAddress() {
    +		return address;
    +	}
     
    -    /**
    -     * Sets the value of the address property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AddressType }
    -     *     
    -     */
    -    public void setAddress(AddressType value) {
    -        this.address = value;
    -    }
    +	/**
    +	 * Sets the value of the address property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AddressType }
    +	 * 
    +	 */
    +	public void setAddress(AddressType value) {
    +		this.address = value;
    +	}
     
    -    /**
    -     * Gets the value of the phoneNumber property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the phoneNumber property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getPhoneNumber().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getPhoneNumber() { - if (phoneNumber == null) { - phoneNumber = new ArrayList(); - } - return this.phoneNumber; - } + /** + * Gets the value of the phoneNumber property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the phoneNumber property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getPhoneNumber().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getPhoneNumber() { + if (phoneNumber == null) { + phoneNumber = new ArrayList(); + } + return this.phoneNumber; + } - /** - * Gets the value of the email property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the email property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getEmail().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getEmail() { - if (email == null) { - email = new ArrayList(); - } - return this.email; - } + /** + * Gets the value of the email property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the email property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getEmail().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getEmail() { + if (email == null) { + email = new ArrayList(); + } + return this.email; + } - /** - * Gets the value of the webSite property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the webSite property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getWebSite().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getWebSite() { - if (webSite == null) { - webSite = new ArrayList(); - } - return this.webSite; - } + /** + * Gets the value of the webSite property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the webSite property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getWebSite().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getWebSite() { + if (webSite == null) { + webSite = new ArrayList(); + } + return this.webSite; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java index bf4dd984b..25aa0d5d2 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; - /** - *

    Java class for CountryTextCodeType complex type. + *

    + * Java class for CountryTextCodeType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CountryTextCodeType">
    @@ -33,62 +33,54 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CountryTextCodeType", propOrder = {
    -    "value"
    -})
    +@XmlType(name = "CountryTextCodeType", propOrder = { "value" })
     public class CountryTextCodeType {
     
    -    @XmlValue
    -    protected String value;
    -    @XmlAttribute(name = "country")
    -    protected CountryType country;
    +	@XmlValue
    +	protected String value;
    +	@XmlAttribute(name = "country")
    +	protected CountryType country;
     
    -    /**
    -     * Gets the value of the value property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getValue() {
    -        return value;
    -    }
    +	/**
    +	 * Gets the value of the value property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getValue() {
    +		return value;
    +	}
     
    -    /**
    -     * Sets the value of the value property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setValue(String value) {
    -        this.value = value;
    -    }
    +	/**
    +	 * Sets the value of the value property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setValue(String value) {
    +		this.value = value;
    +	}
     
    -    /**
    -     * Gets the value of the country property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CountryType }
    -     *     
    -     */
    -    public CountryType getCountry() {
    -        return country;
    -    }
    +	/**
    +	 * Gets the value of the country property.
    +	 * 
    +	 * @return possible object is {@link CountryType }
    +	 * 
    +	 */
    +	public CountryType getCountry() {
    +		return country;
    +	}
     
    -    /**
    -     * Sets the value of the country property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CountryType }
    -     *     
    -     */
    -    public void setCountry(CountryType value) {
    -        this.country = value;
    -    }
    +	/**
    +	 * Sets the value of the country property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CountryType }
    +	 * 
    +	 */
    +	public void setCountry(CountryType value) {
    +		this.country = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java
    index b2fe16735..141788f5b 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java
    @@ -5,18 +5,19 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for CountryType. + *

    + * Java class for CountryType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="CountryType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -226,210 +227,14 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum CountryType {
     
    -    AD,
    -    AE,
    -    AF,
    -    AG,
    -    AL,
    -    AM,
    -    AO,
    -    AR,
    -    AT,
    -    AU,
    -    AZ,
    -    BA,
    -    BB,
    -    BD,
    -    BE,
    -    BF,
    -    BG,
    -    BH,
    -    BI,
    -    BJ,
    -    BN,
    -    BO,
    -    BR,
    -    BS,
    -    BT,
    -    BW,
    -    BY,
    -    BZ,
    -    CA,
    -    CD,
    -    CF,
    -    CG,
    -    CH,
    -    CI,
    -    CL,
    -    CM,
    -    CN,
    -    CO,
    -    CR,
    -    CU,
    -    CV,
    -    CY,
    -    CZ,
    -    DE,
    -    DJ,
    -    DK,
    -    DM,
    -    DO,
    -    DZ,
    -    EC,
    -    EE,
    -    EG,
    -    ER,
    -    ES,
    -    ET,
    -    FI,
    -    FJ,
    -    FM,
    -    FR,
    -    GA,
    -    GB,
    -    GD,
    -    GE,
    -    GH,
    -    GL,
    -    GM,
    -    GN,
    -    GQ,
    -    GR,
    -    GT,
    -    GW,
    -    GY,
    -    HN,
    -    HR,
    -    HT,
    -    HU,
    -    ID,
    -    IE,
    -    IL,
    -    IN,
    -    IQ,
    -    IR,
    -    IS,
    -    IT,
    -    JM,
    -    JO,
    -    JP,
    -    KE,
    -    KG,
    -    KH,
    -    KI,
    -    KM,
    -    KN,
    -    KP,
    -    KR,
    -    KW,
    -    KZ,
    -    LA,
    -    LB,
    -    LC,
    -    LI,
    -    LK,
    -    LR,
    -    LS,
    -    LT,
    -    LU,
    -    LV,
    -    LY,
    -    MA,
    -    MC,
    -    MD,
    -    ME,
    -    MG,
    -    MH,
    -    MK,
    -    ML,
    -    MM,
    -    MN,
    -    MR,
    -    MT,
    -    MU,
    -    MV,
    -    MW,
    -    MX,
    -    MY,
    -    MZ,
    -    NA,
    -    NE,
    -    NG,
    -    NI,
    -    NL,
    -    NO,
    -    NP,
    -    NR,
    -    NU,
    -    NZ,
    -    OM,
    -    PA,
    -    PE,
    -    PG,
    -    PH,
    -    PK,
    -    PL,
    -    PR,
    -    PS,
    -    PT,
    -    PW,
    -    PY,
    -    QA,
    -    RO,
    -    RS,
    -    RU,
    -    RW,
    -    SA,
    -    SB,
    -    SC,
    -    SD,
    -    SE,
    -    SG,
    -    SI,
    -    SK,
    -    SL,
    -    SM,
    -    SN,
    -    SO,
    -    SR,
    -    ST,
    -    SV,
    -    SY,
    -    SZ,
    -    TD,
    -    TG,
    -    TH,
    -    TJ,
    -    TL,
    -    TM,
    -    TN,
    -    TO,
    -    TR,
    -    TT,
    -    TV,
    -    TZ,
    -    UA,
    -    UG,
    -    US,
    -    UY,
    -    UZ,
    -    VA,
    -    VC,
    -    VE,
    -    VN,
    -    VU,
    -    WS,
    -    YE,
    -    ZA,
    -    ZM,
    -    ZW;
    +	AD, AE, AF, AG, AL, AM, AO, AR, AT, AU, AZ, BA, BB, BD, BE, BF, BG, BH, BI, BJ, BN, BO, BR, BS, BT, BW, BY, BZ, CA, CD, CF, CG, CH, CI, CL, CM, CN, CO, CR, CU, CV, CY, CZ, DE, DJ, DK, DM, DO, DZ, EC, EE, EG, ER, ES, ET, FI, FJ, FM, FR, GA, GB, GD, GE, GH, GL, GM, GN, GQ, GR, GT, GW, GY, HN, HR, HT, HU, ID, IE, IL, IN, IQ, IR, IS, IT, JM, JO, JP, KE, KG, KH, KI, KM, KN, KP, KR, KW, KZ, LA, LB, LC, LI, LK, LR, LS, LT, LU, LV, LY, MA, MC, MD, ME, MG, MH, MK, ML, MM, MN, MR, MT, MU, MV, MW, MX, MY, MZ, NA, NE, NG, NI, NL, NO, NP, NR, NU, NZ, OM, PA, PE, PG, PH, PK, PL, PR, PS, PT, PW, PY, QA, RO, RS, RU, RW, SA, SB, SC, SD, SE, SG, SI, SK, SL, SM, SN, SO, SR, ST, SV, SY, SZ, TD, TG, TH, TJ, TL, TM, TN, TO, TR, TT, TV, TZ, UA, UG, US, UY, UZ, VA, VC, VE, VN, VU, WS, YE, ZA, ZM, ZW;
     
    -    public String value() {
    -        return name();
    -    }
    +	public String value() {
    +		return name();
    +	}
     
    -    public static CountryType fromValue(String v) {
    -        return valueOf(v);
    -    }
    +	public static CountryType fromValue(String v) {
    +		return valueOf(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java
    index a73acb84a..619985a7e 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for CourseStructureDiagramType complex type. + *

    + * Java class for CourseStructureDiagramType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseStructureDiagramType">
    @@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseStructureDiagramType", propOrder = {
    -    "coursesGroups",
    -    "coursesUnits"
    -})
    +@XmlType(name = "CourseStructureDiagramType", propOrder = { "coursesGroups", "coursesUnits" })
     public class CourseStructureDiagramType {
     
    -    @XmlElement(name = "CoursesGroups")
    -    protected CoursesGroupsType coursesGroups;
    -    @XmlElement(name = "CoursesUnits")
    -    protected CoursesUnitsType coursesUnits;
    +	@XmlElement(name = "CoursesGroups")
    +	protected CoursesGroupsType coursesGroups;
    +	@XmlElement(name = "CoursesUnits")
    +	protected CoursesUnitsType coursesUnits;
     
    -    /**
    -     * Gets the value of the coursesGroups property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CoursesGroupsType }
    -     *     
    -     */
    -    public CoursesGroupsType getCoursesGroups() {
    -        return coursesGroups;
    -    }
    +	/**
    +	 * Gets the value of the coursesGroups property.
    +	 * 
    +	 * @return possible object is {@link CoursesGroupsType }
    +	 * 
    +	 */
    +	public CoursesGroupsType getCoursesGroups() {
    +		return coursesGroups;
    +	}
     
    -    /**
    -     * Sets the value of the coursesGroups property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CoursesGroupsType }
    -     *     
    -     */
    -    public void setCoursesGroups(CoursesGroupsType value) {
    -        this.coursesGroups = value;
    -    }
    +	/**
    +	 * Sets the value of the coursesGroups property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CoursesGroupsType }
    +	 * 
    +	 */
    +	public void setCoursesGroups(CoursesGroupsType value) {
    +		this.coursesGroups = value;
    +	}
     
    -    /**
    -     * Gets the value of the coursesUnits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CoursesUnitsType }
    -     *     
    -     */
    -    public CoursesUnitsType getCoursesUnits() {
    -        return coursesUnits;
    -    }
    +	/**
    +	 * Gets the value of the coursesUnits property.
    +	 * 
    +	 * @return possible object is {@link CoursesUnitsType }
    +	 * 
    +	 */
    +	public CoursesUnitsType getCoursesUnits() {
    +		return coursesUnits;
    +	}
     
    -    /**
    -     * Sets the value of the coursesUnits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CoursesUnitsType }
    -     *     
    -     */
    -    public void setCoursesUnits(CoursesUnitsType value) {
    -        this.coursesUnits = value;
    -    }
    +	/**
    +	 * Sets the value of the coursesUnits property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CoursesUnitsType }
    +	 * 
    +	 */
    +	public void setCoursesUnits(CoursesUnitsType value) {
    +		this.coursesUnits = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java
    index 1c2461526..c531ead90 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
    - * 

    Java class for CourseUnitLanguageOfInstructionType complex type. + *

    + * Java class for CourseUnitLanguageOfInstructionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitLanguageOfInstructionType">
    @@ -33,62 +33,54 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = {
    -    "value"
    -})
    +@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = { "value" })
     public class CourseUnitLanguageOfInstructionType {
     
    -    @XmlValue
    -    protected String value;
    -    @XmlAttribute(name = "language", required = true)
    -    protected LanguageType language;
    +	@XmlValue
    +	protected String value;
    +	@XmlAttribute(name = "language", required = true)
    +	protected LanguageType language;
     
    -    /**
    -     * Gets the value of the value property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getValue() {
    -        return value;
    -    }
    +	/**
    +	 * Gets the value of the value property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getValue() {
    +		return value;
    +	}
     
    -    /**
    -     * Sets the value of the value property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setValue(String value) {
    -        this.value = value;
    -    }
    +	/**
    +	 * Sets the value of the value property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setValue(String value) {
    +		this.value = value;
    +	}
     
    -    /**
    -     * Gets the value of the language property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LanguageType }
    -     *     
    -     */
    -    public LanguageType getLanguage() {
    -        return language;
    -    }
    +	/**
    +	 * Gets the value of the language property.
    +	 * 
    +	 * @return possible object is {@link LanguageType }
    +	 * 
    +	 */
    +	public LanguageType getLanguage() {
    +		return language;
    +	}
     
    -    /**
    -     * Sets the value of the language property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LanguageType }
    -     *     
    -     */
    -    public void setLanguage(LanguageType value) {
    -        this.language = value;
    -    }
    +	/**
    +	 * Sets the value of the language property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link LanguageType }
    +	 * 
    +	 */
    +	public void setLanguage(LanguageType value) {
    +		this.language = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java
    index d09ce1d75..5d90755d9 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for CourseUnitLanguagesOfInstructionType complex type. + *

    + * Java class for CourseUnitLanguagesOfInstructionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitLanguagesOfInstructionType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = {
    -    "language"
    -})
    +@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = { "language" })
     public class CourseUnitLanguagesOfInstructionType {
     
    -    @XmlElement(name = "Language", required = true)
    -    protected List language;
    +	@XmlElement(name = "Language", required = true)
    +	protected List language;
     
    -    /**
    -     * Gets the value of the language property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the language property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getLanguage().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CourseUnitLanguageOfInstructionType } - * - * - */ - public List getLanguage() { - if (language == null) { - language = new ArrayList(); - } - return this.language; - } + /** + * Gets the value of the language property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the language property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getLanguage().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CourseUnitLanguageOfInstructionType } + * + * + */ + public List getLanguage() { + if (language == null) { + language = new ArrayList(); + } + return this.language; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java index 0b8116a7f..25aaf29da 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CourseUnitStudentPerformanceType complex type. + *

    + * Java class for CourseUnitStudentPerformanceType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitStudentPerformanceType">
    @@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = {
    -    "localGrade",
    -    "ectsGrade"
    -})
    +@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = { "localGrade", "ectsGrade" })
     public class CourseUnitStudentPerformanceType {
     
    -    @XmlElement(name = "LocalGrade", required = true)
    -    protected LocalGradeType localGrade;
    -    @XmlElement(name = "ECTSGrade")
    -    protected ECTSGradingScaleType ectsGrade;
    +	@XmlElement(name = "LocalGrade", required = true)
    +	protected LocalGradeType localGrade;
    +	@XmlElement(name = "ECTSGrade")
    +	protected ECTSGradingScaleType ectsGrade;
     
    -    /**
    -     * Gets the value of the localGrade property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LocalGradeType }
    -     *     
    -     */
    -    public LocalGradeType getLocalGrade() {
    -        return localGrade;
    -    }
    +	/**
    +	 * Gets the value of the localGrade property.
    +	 * 
    +	 * @return possible object is {@link LocalGradeType }
    +	 * 
    +	 */
    +	public LocalGradeType getLocalGrade() {
    +		return localGrade;
    +	}
     
    -    /**
    -     * Sets the value of the localGrade property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LocalGradeType }
    -     *     
    -     */
    -    public void setLocalGrade(LocalGradeType value) {
    -        this.localGrade = value;
    -    }
    +	/**
    +	 * Sets the value of the localGrade property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link LocalGradeType }
    +	 * 
    +	 */
    +	public void setLocalGrade(LocalGradeType value) {
    +		this.localGrade = value;
    +	}
     
    -    /**
    -     * Gets the value of the ectsGrade property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ECTSGradingScaleType }
    -     *     
    -     */
    -    public ECTSGradingScaleType getECTSGrade() {
    -        return ectsGrade;
    -    }
    +	/**
    +	 * Gets the value of the ectsGrade property.
    +	 * 
    +	 * @return possible object is {@link ECTSGradingScaleType }
    +	 * 
    +	 */
    +	public ECTSGradingScaleType getECTSGrade() {
    +		return ectsGrade;
    +	}
     
    -    /**
    -     * Sets the value of the ectsGrade property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ECTSGradingScaleType }
    -     *     
    -     */
    -    public void setECTSGrade(ECTSGradingScaleType value) {
    -        this.ectsGrade = value;
    -    }
    +	/**
    +	 * Sets the value of the ectsGrade property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link ECTSGradingScaleType }
    +	 * 
    +	 */
    +	public void setECTSGrade(ECTSGradingScaleType value) {
    +		this.ectsGrade = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java
    index f9725c6fc..925f89d3a 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.math.BigDecimal;
    @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
    - * 

    Java class for CourseUnitType complex type. + *

    + * Java class for CourseUnitType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitType">
    @@ -96,1086 +96,950 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitType", propOrder = {
    -    "code",
    -    "scientificArea",
    -    "title",
    -    "theme",
    -    "type",
    -    "yearOfStudy",
    -    "level",
    -    "ectsCredits",
    -    "localCredits",
    -    "hours",
    -    "languagesOfInstruction",
    -    "modeOfDelivery",
    -    "workPlacements",
    -    "studentPerformance",
    -    "nameOfLecturers",
    -    "learningOutcomes",
    -    "prerequisitesAndCorequisites",
    -    "prerequisitesScholarshipLevel",
    -    "prerequisitesOtherTitles",
    -    "recomendedOptionalProgrammeComponents",
    -    "courseContents",
    -    "recomendedOrRequiredReading",
    -    "planedLearningActivitiesAndTeachingMethod",
    -    "assesmentMethodsAndCriteria",
    -    "observations"
    -})
    +@XmlType(name = "CourseUnitType", propOrder = { "code", "scientificArea", "title", "theme", "type", "yearOfStudy", "level", "ectsCredits", "localCredits", "hours", "languagesOfInstruction",
    +		"modeOfDelivery", "workPlacements", "studentPerformance", "nameOfLecturers", "learningOutcomes", "prerequisitesAndCorequisites", "prerequisitesScholarshipLevel", "prerequisitesOtherTitles",
    +		"recomendedOptionalProgrammeComponents", "courseContents", "recomendedOrRequiredReading", "planedLearningActivitiesAndTeachingMethod", "assesmentMethodsAndCriteria", "observations" })
     public class CourseUnitType {
     
    -    @XmlElement(name = "Code")
    -    protected String code;
    -    @XmlElement(name = "ScientificArea")
    -    protected String scientificArea;
    -    @XmlElement(name = "Title", required = true)
    -    protected String title;
    -    @XmlElement(name = "Theme")
    -    protected String theme;
    -    @XmlElement(name = "Type")
    -    protected CourseUnitType.Type type;
    -    @XmlElement(name = "YearOfStudy")
    -    protected CourseUnitType.YearOfStudy yearOfStudy;
    -    @XmlElement(name = "Level")
    -    protected CourseUnitType.Level level;
    -    @XmlElement(name = "ECTSCredits")
    -    protected BigDecimal ectsCredits;
    -    @XmlElement(name = "LocalCredits")
    -    protected BigDecimal localCredits;
    -    @XmlElement(name = "Hours")
    -    protected BigDecimal hours;
    -    @XmlElement(name = "LanguagesOfInstruction")
    -    protected CourseUnitLanguagesOfInstructionType languagesOfInstruction;
    -    @XmlElement(name = "ModeOfDelivery")
    -    protected CourseUnitType.ModeOfDelivery modeOfDelivery;
    -    @XmlElement(name = "WorkPlacements")
    -    protected CourseUnitWorkPlacementsType workPlacements;
    -    @XmlElement(name = "StudentPerformance")
    -    protected CourseUnitStudentPerformanceType studentPerformance;
    -    @XmlElement(name = "NameOfLecturers")
    -    protected RichTextTagType nameOfLecturers;
    -    @XmlElement(name = "LearningOutcomes")
    -    protected RichTextTagType learningOutcomes;
    -    @XmlElement(name = "PrerequisitesAndCorequisites")
    -    protected RichTextTagType prerequisitesAndCorequisites;
    -    @XmlElement(name = "PrerequisitesScholarshipLevel")
    -    protected RichTextTagType prerequisitesScholarshipLevel;
    -    @XmlElement(name = "PrerequisitesOtherTitles")
    -    protected RichTextTagType prerequisitesOtherTitles;
    -    @XmlElement(name = "RecomendedOptionalProgrammeComponents")
    -    protected RichTextTagType recomendedOptionalProgrammeComponents;
    -    @XmlElement(name = "CourseContents")
    -    protected RichTextTagType courseContents;
    -    @XmlElement(name = "RecomendedOrRequiredReading")
    -    protected RichTextTagType recomendedOrRequiredReading;
    -    @XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod")
    -    protected RichTextTagType planedLearningActivitiesAndTeachingMethod;
    -    @XmlElement(name = "AssesmentMethodsAndCriteria")
    -    protected RichTextTagType assesmentMethodsAndCriteria;
    -    @XmlElement(name = "Observations")
    -    protected RichTextTagType observations;
    -    @XmlAttribute(name = "groupID")
    -    protected String groupID;
    -    @XmlAttribute(name = "institutionAdministeringStudiesID")
    -    protected String institutionAdministeringStudiesID;
    -    @XmlAttribute(name = "isRequiredByTheProgramme")
    -    protected Boolean isRequiredByTheProgramme;
    -
    -    /**
    -     * Gets the value of the code property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCode() {
    -        return code;
    -    }
    -
    -    /**
    -     * Sets the value of the code property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCode(String value) {
    -        this.code = value;
    -    }
    -
    -    /**
    -     * Gets the value of the scientificArea property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getScientificArea() {
    -        return scientificArea;
    -    }
    -
    -    /**
    -     * Sets the value of the scientificArea property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setScientificArea(String value) {
    -        this.scientificArea = value;
    -    }
    -
    -    /**
    -     * Gets the value of the title property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTitle() {
    -        return title;
    -    }
    -
    -    /**
    -     * Sets the value of the title property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTitle(String value) {
    -        this.title = value;
    -    }
    -
    -    /**
    -     * Gets the value of the theme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getTheme() {
    -        return theme;
    -    }
    -
    -    /**
    -     * Sets the value of the theme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setTheme(String value) {
    -        this.theme = value;
    -    }
    -
    -    /**
    -     * Gets the value of the type property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.Type }
    -     *     
    -     */
    -    public CourseUnitType.Type getType() {
    -        return type;
    -    }
    -
    -    /**
    -     * Sets the value of the type property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.Type }
    -     *     
    -     */
    -    public void setType(CourseUnitType.Type value) {
    -        this.type = value;
    -    }
    -
    -    /**
    -     * Gets the value of the yearOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.YearOfStudy }
    -     *     
    -     */
    -    public CourseUnitType.YearOfStudy getYearOfStudy() {
    -        return yearOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the yearOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.YearOfStudy }
    -     *     
    -     */
    -    public void setYearOfStudy(CourseUnitType.YearOfStudy value) {
    -        this.yearOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the level property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.Level }
    -     *     
    -     */
    -    public CourseUnitType.Level getLevel() {
    -        return level;
    -    }
    -
    -    /**
    -     * Sets the value of the level property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.Level }
    -     *     
    -     */
    -    public void setLevel(CourseUnitType.Level value) {
    -        this.level = value;
    -    }
    -
    -    /**
    -     * Gets the value of the ectsCredits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getECTSCredits() {
    -        return ectsCredits;
    -    }
    -
    -    /**
    -     * Sets the value of the ectsCredits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setECTSCredits(BigDecimal value) {
    -        this.ectsCredits = value;
    -    }
    -
    -    /**
    -     * Gets the value of the localCredits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getLocalCredits() {
    -        return localCredits;
    -    }
    -
    -    /**
    -     * Sets the value of the localCredits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setLocalCredits(BigDecimal value) {
    -        this.localCredits = value;
    -    }
    -
    -    /**
    -     * Gets the value of the hours property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getHours() {
    -        return hours;
    -    }
    -
    -    /**
    -     * Sets the value of the hours property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setHours(BigDecimal value) {
    -        this.hours = value;
    -    }
    -
    -    /**
    -     * Gets the value of the languagesOfInstruction property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitLanguagesOfInstructionType }
    -     *     
    -     */
    -    public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() {
    -        return languagesOfInstruction;
    -    }
    -
    -    /**
    -     * Sets the value of the languagesOfInstruction property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitLanguagesOfInstructionType }
    -     *     
    -     */
    -    public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) {
    -        this.languagesOfInstruction = value;
    -    }
    -
    -    /**
    -     * Gets the value of the modeOfDelivery property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitType.ModeOfDelivery }
    -     *     
    -     */
    -    public CourseUnitType.ModeOfDelivery getModeOfDelivery() {
    -        return modeOfDelivery;
    -    }
    -
    -    /**
    -     * Sets the value of the modeOfDelivery property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitType.ModeOfDelivery }
    -     *     
    -     */
    -    public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) {
    -        this.modeOfDelivery = value;
    -    }
    -
    -    /**
    -     * Gets the value of the workPlacements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitWorkPlacementsType }
    -     *     
    -     */
    -    public CourseUnitWorkPlacementsType getWorkPlacements() {
    -        return workPlacements;
    -    }
    -
    -    /**
    -     * Sets the value of the workPlacements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitWorkPlacementsType }
    -     *     
    -     */
    -    public void setWorkPlacements(CourseUnitWorkPlacementsType value) {
    -        this.workPlacements = value;
    -    }
    -
    -    /**
    -     * Gets the value of the studentPerformance property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseUnitStudentPerformanceType }
    -     *     
    -     */
    -    public CourseUnitStudentPerformanceType getStudentPerformance() {
    -        return studentPerformance;
    -    }
    -
    -    /**
    -     * Sets the value of the studentPerformance property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseUnitStudentPerformanceType }
    -     *     
    -     */
    -    public void setStudentPerformance(CourseUnitStudentPerformanceType value) {
    -        this.studentPerformance = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nameOfLecturers property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getNameOfLecturers() {
    -        return nameOfLecturers;
    -    }
    -
    -    /**
    -     * Sets the value of the nameOfLecturers property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setNameOfLecturers(RichTextTagType value) {
    -        this.nameOfLecturers = value;
    -    }
    -
    -    /**
    -     * Gets the value of the learningOutcomes property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getLearningOutcomes() {
    -        return learningOutcomes;
    -    }
    -
    -    /**
    -     * Sets the value of the learningOutcomes property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setLearningOutcomes(RichTextTagType value) {
    -        this.learningOutcomes = value;
    -    }
    -
    -    /**
    -     * Gets the value of the prerequisitesAndCorequisites property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getPrerequisitesAndCorequisites() {
    -        return prerequisitesAndCorequisites;
    -    }
    -
    -    /**
    -     * Sets the value of the prerequisitesAndCorequisites property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setPrerequisitesAndCorequisites(RichTextTagType value) {
    -        this.prerequisitesAndCorequisites = value;
    -    }
    -
    -    /**
    -     * Gets the value of the prerequisitesScholarshipLevel property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getPrerequisitesScholarshipLevel() {
    -        return prerequisitesScholarshipLevel;
    -    }
    -
    -    /**
    -     * Sets the value of the prerequisitesScholarshipLevel property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setPrerequisitesScholarshipLevel(RichTextTagType value) {
    -        this.prerequisitesScholarshipLevel = value;
    -    }
    -
    -    /**
    -     * Gets the value of the prerequisitesOtherTitles property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getPrerequisitesOtherTitles() {
    -        return prerequisitesOtherTitles;
    -    }
    -
    -    /**
    -     * Sets the value of the prerequisitesOtherTitles property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setPrerequisitesOtherTitles(RichTextTagType value) {
    -        this.prerequisitesOtherTitles = value;
    -    }
    -
    -    /**
    -     * Gets the value of the recomendedOptionalProgrammeComponents property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getRecomendedOptionalProgrammeComponents() {
    -        return recomendedOptionalProgrammeComponents;
    -    }
    -
    -    /**
    -     * Sets the value of the recomendedOptionalProgrammeComponents property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) {
    -        this.recomendedOptionalProgrammeComponents = value;
    -    }
    -
    -    /**
    -     * Gets the value of the courseContents property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getCourseContents() {
    -        return courseContents;
    -    }
    -
    -    /**
    -     * Sets the value of the courseContents property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setCourseContents(RichTextTagType value) {
    -        this.courseContents = value;
    -    }
    -
    -    /**
    -     * Gets the value of the recomendedOrRequiredReading property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getRecomendedOrRequiredReading() {
    -        return recomendedOrRequiredReading;
    -    }
    -
    -    /**
    -     * Sets the value of the recomendedOrRequiredReading property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setRecomendedOrRequiredReading(RichTextTagType value) {
    -        this.recomendedOrRequiredReading = value;
    -    }
    -
    -    /**
    -     * Gets the value of the planedLearningActivitiesAndTeachingMethod property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() {
    -        return planedLearningActivitiesAndTeachingMethod;
    -    }
    -
    -    /**
    -     * Sets the value of the planedLearningActivitiesAndTeachingMethod property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) {
    -        this.planedLearningActivitiesAndTeachingMethod = value;
    -    }
    -
    -    /**
    -     * Gets the value of the assesmentMethodsAndCriteria property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAssesmentMethodsAndCriteria() {
    -        return assesmentMethodsAndCriteria;
    -    }
    -
    -    /**
    -     * Sets the value of the assesmentMethodsAndCriteria property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAssesmentMethodsAndCriteria(RichTextTagType value) {
    -        this.assesmentMethodsAndCriteria = value;
    -    }
    -
    -    /**
    -     * Gets the value of the observations property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getObservations() {
    -        return observations;
    -    }
    -
    -    /**
    -     * Sets the value of the observations property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setObservations(RichTextTagType value) {
    -        this.observations = value;
    -    }
    -
    -    /**
    -     * Gets the value of the groupID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getGroupID() {
    -        return groupID;
    -    }
    -
    -    /**
    -     * Sets the value of the groupID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setGroupID(String value) {
    -        this.groupID = value;
    -    }
    -
    -    /**
    -     * Gets the value of the institutionAdministeringStudiesID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getInstitutionAdministeringStudiesID() {
    -        if (institutionAdministeringStudiesID == null) {
    -            return "DEF-IAS";
    -        } else {
    -            return institutionAdministeringStudiesID;
    -        }
    -    }
    -
    -    /**
    -     * Sets the value of the institutionAdministeringStudiesID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setInstitutionAdministeringStudiesID(String value) {
    -        this.institutionAdministeringStudiesID = value;
    -    }
    -
    -    /**
    -     * Gets the value of the isRequiredByTheProgramme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public boolean isIsRequiredByTheProgramme() {
    -        if (isRequiredByTheProgramme == null) {
    -            return true;
    -        } else {
    -            return isRequiredByTheProgramme;
    -        }
    -    }
    -
    -    /**
    -     * Sets the value of the isRequiredByTheProgramme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public void setIsRequiredByTheProgramme(Boolean value) {
    -        this.isRequiredByTheProgramme = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Level { - - @XmlValue - protected String value; - @XmlAttribute(name = "eheaFramework") - protected EHEAFrameworkType eheaFramework; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the eheaFramework property. - * - * @return - * possible object is - * {@link EHEAFrameworkType } - * - */ - public EHEAFrameworkType getEheaFramework() { - return eheaFramework; - } - - /** - * Sets the value of the eheaFramework property. - * - * @param value - * allowed object is - * {@link EHEAFrameworkType } - * - */ - public void setEheaFramework(EHEAFrameworkType value) { - this.eheaFramework = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="modeOfDelivery" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfDeliveryType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class ModeOfDelivery { - - @XmlValue - protected String value; - @XmlAttribute(name = "modeOfDelivery") - protected ModeOfDeliveryType modeOfDelivery; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the modeOfDelivery property. - * - * @return - * possible object is - * {@link ModeOfDeliveryType } - * - */ - public ModeOfDeliveryType getModeOfDelivery() { - return modeOfDelivery; - } - - /** - * Sets the value of the modeOfDelivery property. - * - * @param value - * allowed object is - * {@link ModeOfDeliveryType } - * - */ - public void setModeOfDelivery(ModeOfDeliveryType value) { - this.modeOfDelivery = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="type" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitTypeType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Type { - - @XmlValue - protected String value; - @XmlAttribute(name = "type") - protected CourseUnitTypeType type; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link CourseUnitTypeType } - * - */ - public CourseUnitTypeType getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link CourseUnitTypeType } - * - */ - public void setType(CourseUnitTypeType value) { - this.type = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="year" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class YearOfStudy { - - @XmlValue - protected String value; - @XmlAttribute(name = "year") - protected BigDecimal year; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the year property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getYear() { - return year; - } - - /** - * Sets the value of the year property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setYear(BigDecimal value) { - this.year = value; - } - - } + @XmlElement(name = "Code") + protected String code; + @XmlElement(name = "ScientificArea") + protected String scientificArea; + @XmlElement(name = "Title", required = true) + protected String title; + @XmlElement(name = "Theme") + protected String theme; + @XmlElement(name = "Type") + protected CourseUnitType.Type type; + @XmlElement(name = "YearOfStudy") + protected CourseUnitType.YearOfStudy yearOfStudy; + @XmlElement(name = "Level") + protected CourseUnitType.Level level; + @XmlElement(name = "ECTSCredits") + protected BigDecimal ectsCredits; + @XmlElement(name = "LocalCredits") + protected BigDecimal localCredits; + @XmlElement(name = "Hours") + protected BigDecimal hours; + @XmlElement(name = "LanguagesOfInstruction") + protected CourseUnitLanguagesOfInstructionType languagesOfInstruction; + @XmlElement(name = "ModeOfDelivery") + protected CourseUnitType.ModeOfDelivery modeOfDelivery; + @XmlElement(name = "WorkPlacements") + protected CourseUnitWorkPlacementsType workPlacements; + @XmlElement(name = "StudentPerformance") + protected CourseUnitStudentPerformanceType studentPerformance; + @XmlElement(name = "NameOfLecturers") + protected RichTextTagType nameOfLecturers; + @XmlElement(name = "LearningOutcomes") + protected RichTextTagType learningOutcomes; + @XmlElement(name = "PrerequisitesAndCorequisites") + protected RichTextTagType prerequisitesAndCorequisites; + @XmlElement(name = "PrerequisitesScholarshipLevel") + protected RichTextTagType prerequisitesScholarshipLevel; + @XmlElement(name = "PrerequisitesOtherTitles") + protected RichTextTagType prerequisitesOtherTitles; + @XmlElement(name = "RecomendedOptionalProgrammeComponents") + protected RichTextTagType recomendedOptionalProgrammeComponents; + @XmlElement(name = "CourseContents") + protected RichTextTagType courseContents; + @XmlElement(name = "RecomendedOrRequiredReading") + protected RichTextTagType recomendedOrRequiredReading; + @XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod") + protected RichTextTagType planedLearningActivitiesAndTeachingMethod; + @XmlElement(name = "AssesmentMethodsAndCriteria") + protected RichTextTagType assesmentMethodsAndCriteria; + @XmlElement(name = "Observations") + protected RichTextTagType observations; + @XmlAttribute(name = "groupID") + protected String groupID; + @XmlAttribute(name = "institutionAdministeringStudiesID") + protected String institutionAdministeringStudiesID; + @XmlAttribute(name = "isRequiredByTheProgramme") + protected Boolean isRequiredByTheProgramme; + + /** + * Gets the value of the code property. + * + * @return possible object is {@link String } + * + */ + public String getCode() { + return code; + } + + /** + * Sets the value of the code property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setCode(String value) { + this.code = value; + } + + /** + * Gets the value of the scientificArea property. + * + * @return possible object is {@link String } + * + */ + public String getScientificArea() { + return scientificArea; + } + + /** + * Sets the value of the scientificArea property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setScientificArea(String value) { + this.scientificArea = value; + } + + /** + * Gets the value of the title property. + * + * @return possible object is {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + + /** + * Gets the value of the theme property. + * + * @return possible object is {@link String } + * + */ + public String getTheme() { + return theme; + } + + /** + * Sets the value of the theme property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setTheme(String value) { + this.theme = value; + } + + /** + * Gets the value of the type property. + * + * @return possible object is {@link CourseUnitType.Type } + * + */ + public CourseUnitType.Type getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is {@link CourseUnitType.Type } + * + */ + public void setType(CourseUnitType.Type value) { + this.type = value; + } + + /** + * Gets the value of the yearOfStudy property. + * + * @return possible object is {@link CourseUnitType.YearOfStudy } + * + */ + public CourseUnitType.YearOfStudy getYearOfStudy() { + return yearOfStudy; + } + + /** + * Sets the value of the yearOfStudy property. + * + * @param value + * allowed object is {@link CourseUnitType.YearOfStudy } + * + */ + public void setYearOfStudy(CourseUnitType.YearOfStudy value) { + this.yearOfStudy = value; + } + + /** + * Gets the value of the level property. + * + * @return possible object is {@link CourseUnitType.Level } + * + */ + public CourseUnitType.Level getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + * @param value + * allowed object is {@link CourseUnitType.Level } + * + */ + public void setLevel(CourseUnitType.Level value) { + this.level = value; + } + + /** + * Gets the value of the ectsCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getECTSCredits() { + return ectsCredits; + } + + /** + * Sets the value of the ectsCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setECTSCredits(BigDecimal value) { + this.ectsCredits = value; + } + + /** + * Gets the value of the localCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getLocalCredits() { + return localCredits; + } + + /** + * Sets the value of the localCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setLocalCredits(BigDecimal value) { + this.localCredits = value; + } + + /** + * Gets the value of the hours property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getHours() { + return hours; + } + + /** + * Sets the value of the hours property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setHours(BigDecimal value) { + this.hours = value; + } + + /** + * Gets the value of the languagesOfInstruction property. + * + * @return possible object is {@link CourseUnitLanguagesOfInstructionType } + * + */ + public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() { + return languagesOfInstruction; + } + + /** + * Sets the value of the languagesOfInstruction property. + * + * @param value + * allowed object is {@link CourseUnitLanguagesOfInstructionType } + * + */ + public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) { + this.languagesOfInstruction = value; + } + + /** + * Gets the value of the modeOfDelivery property. + * + * @return possible object is {@link CourseUnitType.ModeOfDelivery } + * + */ + public CourseUnitType.ModeOfDelivery getModeOfDelivery() { + return modeOfDelivery; + } + + /** + * Sets the value of the modeOfDelivery property. + * + * @param value + * allowed object is {@link CourseUnitType.ModeOfDelivery } + * + */ + public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) { + this.modeOfDelivery = value; + } + + /** + * Gets the value of the workPlacements property. + * + * @return possible object is {@link CourseUnitWorkPlacementsType } + * + */ + public CourseUnitWorkPlacementsType getWorkPlacements() { + return workPlacements; + } + + /** + * Sets the value of the workPlacements property. + * + * @param value + * allowed object is {@link CourseUnitWorkPlacementsType } + * + */ + public void setWorkPlacements(CourseUnitWorkPlacementsType value) { + this.workPlacements = value; + } + + /** + * Gets the value of the studentPerformance property. + * + * @return possible object is {@link CourseUnitStudentPerformanceType } + * + */ + public CourseUnitStudentPerformanceType getStudentPerformance() { + return studentPerformance; + } + + /** + * Sets the value of the studentPerformance property. + * + * @param value + * allowed object is {@link CourseUnitStudentPerformanceType } + * + */ + public void setStudentPerformance(CourseUnitStudentPerformanceType value) { + this.studentPerformance = value; + } + + /** + * Gets the value of the nameOfLecturers property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getNameOfLecturers() { + return nameOfLecturers; + } + + /** + * Sets the value of the nameOfLecturers property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setNameOfLecturers(RichTextTagType value) { + this.nameOfLecturers = value; + } + + /** + * Gets the value of the learningOutcomes property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getLearningOutcomes() { + return learningOutcomes; + } + + /** + * Sets the value of the learningOutcomes property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setLearningOutcomes(RichTextTagType value) { + this.learningOutcomes = value; + } + + /** + * Gets the value of the prerequisitesAndCorequisites property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getPrerequisitesAndCorequisites() { + return prerequisitesAndCorequisites; + } + + /** + * Sets the value of the prerequisitesAndCorequisites property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setPrerequisitesAndCorequisites(RichTextTagType value) { + this.prerequisitesAndCorequisites = value; + } + + /** + * Gets the value of the prerequisitesScholarshipLevel property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getPrerequisitesScholarshipLevel() { + return prerequisitesScholarshipLevel; + } + + /** + * Sets the value of the prerequisitesScholarshipLevel property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setPrerequisitesScholarshipLevel(RichTextTagType value) { + this.prerequisitesScholarshipLevel = value; + } + + /** + * Gets the value of the prerequisitesOtherTitles property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getPrerequisitesOtherTitles() { + return prerequisitesOtherTitles; + } + + /** + * Sets the value of the prerequisitesOtherTitles property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setPrerequisitesOtherTitles(RichTextTagType value) { + this.prerequisitesOtherTitles = value; + } + + /** + * Gets the value of the recomendedOptionalProgrammeComponents property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getRecomendedOptionalProgrammeComponents() { + return recomendedOptionalProgrammeComponents; + } + + /** + * Sets the value of the recomendedOptionalProgrammeComponents property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) { + this.recomendedOptionalProgrammeComponents = value; + } + + /** + * Gets the value of the courseContents property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getCourseContents() { + return courseContents; + } + + /** + * Sets the value of the courseContents property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setCourseContents(RichTextTagType value) { + this.courseContents = value; + } + + /** + * Gets the value of the recomendedOrRequiredReading property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getRecomendedOrRequiredReading() { + return recomendedOrRequiredReading; + } + + /** + * Sets the value of the recomendedOrRequiredReading property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setRecomendedOrRequiredReading(RichTextTagType value) { + this.recomendedOrRequiredReading = value; + } + + /** + * Gets the value of the planedLearningActivitiesAndTeachingMethod property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() { + return planedLearningActivitiesAndTeachingMethod; + } + + /** + * Sets the value of the planedLearningActivitiesAndTeachingMethod property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) { + this.planedLearningActivitiesAndTeachingMethod = value; + } + + /** + * Gets the value of the assesmentMethodsAndCriteria property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAssesmentMethodsAndCriteria() { + return assesmentMethodsAndCriteria; + } + + /** + * Sets the value of the assesmentMethodsAndCriteria property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAssesmentMethodsAndCriteria(RichTextTagType value) { + this.assesmentMethodsAndCriteria = value; + } + + /** + * Gets the value of the observations property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getObservations() { + return observations; + } + + /** + * Sets the value of the observations property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setObservations(RichTextTagType value) { + this.observations = value; + } + + /** + * Gets the value of the groupID property. + * + * @return possible object is {@link String } + * + */ + public String getGroupID() { + return groupID; + } + + /** + * Sets the value of the groupID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setGroupID(String value) { + this.groupID = value; + } + + /** + * Gets the value of the institutionAdministeringStudiesID property. + * + * @return possible object is {@link String } + * + */ + public String getInstitutionAdministeringStudiesID() { + if (institutionAdministeringStudiesID == null) { + return "DEF-IAS"; + } else { + return institutionAdministeringStudiesID; + } + } + + /** + * Sets the value of the institutionAdministeringStudiesID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setInstitutionAdministeringStudiesID(String value) { + this.institutionAdministeringStudiesID = value; + } + + /** + * Gets the value of the isRequiredByTheProgramme property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isIsRequiredByTheProgramme() { + if (isRequiredByTheProgramme == null) { + return true; + } else { + return isRequiredByTheProgramme; + } + } + + /** + * Sets the value of the isRequiredByTheProgramme property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setIsRequiredByTheProgramme(Boolean value) { + this.isRequiredByTheProgramme = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Level { + + @XmlValue + protected String value; + @XmlAttribute(name = "eheaFramework") + protected EHEAFrameworkType eheaFramework; + + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the eheaFramework property. + * + * @return possible object is {@link EHEAFrameworkType } + * + */ + public EHEAFrameworkType getEheaFramework() { + return eheaFramework; + } + + /** + * Sets the value of the eheaFramework property. + * + * @param value + * allowed object is {@link EHEAFrameworkType } + * + */ + public void setEheaFramework(EHEAFrameworkType value) { + this.eheaFramework = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="modeOfDelivery" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfDeliveryType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class ModeOfDelivery { + + @XmlValue + protected String value; + @XmlAttribute(name = "modeOfDelivery") + protected ModeOfDeliveryType modeOfDelivery; + + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the modeOfDelivery property. + * + * @return possible object is {@link ModeOfDeliveryType } + * + */ + public ModeOfDeliveryType getModeOfDelivery() { + return modeOfDelivery; + } + + /** + * Sets the value of the modeOfDelivery property. + * + * @param value + * allowed object is {@link ModeOfDeliveryType } + * + */ + public void setModeOfDelivery(ModeOfDeliveryType value) { + this.modeOfDelivery = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="type" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitTypeType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Type { + + @XmlValue + protected String value; + @XmlAttribute(name = "type") + protected CourseUnitTypeType type; + + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the type property. + * + * @return possible object is {@link CourseUnitTypeType } + * + */ + public CourseUnitTypeType getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is {@link CourseUnitTypeType } + * + */ + public void setType(CourseUnitTypeType value) { + this.type = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="year" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class YearOfStudy { + + @XmlValue + protected String value; + @XmlAttribute(name = "year") + protected BigDecimal year; + + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the year property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getYear() { + return year; + } + + /** + * Sets the value of the year property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setYear(BigDecimal value) { + this.year = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java index dae27bc84..33b5563df 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CourseUnitTypeType. + *

    + * Java class for CourseUnitTypeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="CourseUnitTypeType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -32,27 +33,26 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum CourseUnitTypeType {
     
    -    @XmlEnumValue("Compulsory")
    -    COMPULSORY("Compulsory"),
    -    @XmlEnumValue("Optional")
    -    OPTIONAL("Optional");
    -    private final String value;
    -
    -    CourseUnitTypeType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static CourseUnitTypeType fromValue(String v) {
    -        for (CourseUnitTypeType c: CourseUnitTypeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	@XmlEnumValue("Compulsory")
    +	COMPULSORY("Compulsory"), @XmlEnumValue("Optional")
    +	OPTIONAL("Optional");
    +	private final String value;
    +
    +	CourseUnitTypeType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static CourseUnitTypeType fromValue(String v) {
    +		for (CourseUnitTypeType c : CourseUnitTypeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java
    index 39eb67bc2..2694f4582 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.math.BigDecimal;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.datatype.XMLGregorianCalendar;
     
    -
     /**
    - * 

    Java class for CourseUnitWorkPlacementType complex type. + *

    + * Java class for CourseUnitWorkPlacementType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitWorkPlacementType">
    @@ -39,117 +39,100 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitWorkPlacementType", propOrder = {
    -    "collaboratingInstitution",
    -    "dateFrom",
    -    "dateTo",
    -    "trainingHours"
    -})
    +@XmlType(name = "CourseUnitWorkPlacementType", propOrder = { "collaboratingInstitution", "dateFrom", "dateTo", "trainingHours" })
     public class CourseUnitWorkPlacementType {
     
    -    @XmlElement(name = "CollaboratingInstitution", required = true)
    -    protected String collaboratingInstitution;
    -    @XmlElement(name = "DateFrom")
    -    protected XMLGregorianCalendar dateFrom;
    -    @XmlElement(name = "DateTo")
    -    protected XMLGregorianCalendar dateTo;
    -    @XmlElement(name = "TrainingHours")
    -    protected BigDecimal trainingHours;
    +	@XmlElement(name = "CollaboratingInstitution", required = true)
    +	protected String collaboratingInstitution;
    +	@XmlElement(name = "DateFrom")
    +	protected XMLGregorianCalendar dateFrom;
    +	@XmlElement(name = "DateTo")
    +	protected XMLGregorianCalendar dateTo;
    +	@XmlElement(name = "TrainingHours")
    +	protected BigDecimal trainingHours;
     
    -    /**
    -     * Gets the value of the collaboratingInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCollaboratingInstitution() {
    -        return collaboratingInstitution;
    -    }
    +	/**
    +	 * Gets the value of the collaboratingInstitution property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCollaboratingInstitution() {
    +		return collaboratingInstitution;
    +	}
     
    -    /**
    -     * Sets the value of the collaboratingInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCollaboratingInstitution(String value) {
    -        this.collaboratingInstitution = value;
    -    }
    +	/**
    +	 * Sets the value of the collaboratingInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCollaboratingInstitution(String value) {
    +		this.collaboratingInstitution = value;
    +	}
     
    -    /**
    -     * Gets the value of the dateFrom property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateFrom() {
    -        return dateFrom;
    -    }
    +	/**
    +	 * Gets the value of the dateFrom property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateFrom() {
    +		return dateFrom;
    +	}
     
    -    /**
    -     * Sets the value of the dateFrom property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateFrom(XMLGregorianCalendar value) {
    -        this.dateFrom = value;
    -    }
    +	/**
    +	 * Sets the value of the dateFrom property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateFrom(XMLGregorianCalendar value) {
    +		this.dateFrom = value;
    +	}
     
    -    /**
    -     * Gets the value of the dateTo property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateTo() {
    -        return dateTo;
    -    }
    +	/**
    +	 * Gets the value of the dateTo property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateTo() {
    +		return dateTo;
    +	}
     
    -    /**
    -     * Sets the value of the dateTo property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateTo(XMLGregorianCalendar value) {
    -        this.dateTo = value;
    -    }
    +	/**
    +	 * Sets the value of the dateTo property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateTo(XMLGregorianCalendar value) {
    +		this.dateTo = value;
    +	}
     
    -    /**
    -     * Gets the value of the trainingHours property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getTrainingHours() {
    -        return trainingHours;
    -    }
    +	/**
    +	 * Gets the value of the trainingHours property.
    +	 * 
    +	 * @return possible object is {@link BigDecimal }
    +	 * 
    +	 */
    +	public BigDecimal getTrainingHours() {
    +		return trainingHours;
    +	}
     
    -    /**
    -     * Sets the value of the trainingHours property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setTrainingHours(BigDecimal value) {
    -        this.trainingHours = value;
    -    }
    +	/**
    +	 * Sets the value of the trainingHours property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link BigDecimal }
    +	 * 
    +	 */
    +	public void setTrainingHours(BigDecimal value) {
    +		this.trainingHours = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java
    index 9dfb3d6b7..28468d0b9 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for CourseUnitWorkPlacementsType complex type. + *

    + * Java class for CourseUnitWorkPlacementsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CourseUnitWorkPlacementsType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = {
    -    "workPlacement"
    -})
    +@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = { "workPlacement" })
     public class CourseUnitWorkPlacementsType {
     
    -    @XmlElement(name = "WorkPlacement", required = true)
    -    protected List workPlacement;
    +	@XmlElement(name = "WorkPlacement", required = true)
    +	protected List workPlacement;
     
    -    /**
    -     * Gets the value of the workPlacement property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the workPlacement property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getWorkPlacement().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CourseUnitWorkPlacementType } - * - * - */ - public List getWorkPlacement() { - if (workPlacement == null) { - workPlacement = new ArrayList(); - } - return this.workPlacement; - } + /** + * Gets the value of the workPlacement property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the workPlacement property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getWorkPlacement().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CourseUnitWorkPlacementType } + * + * + */ + public List getWorkPlacement() { + if (workPlacement == null) { + workPlacement = new ArrayList(); + } + return this.workPlacement; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java index 01c42298c..6e588acfd 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type. + *

    + * Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = {
    -    "mobilityProgramme"
    -})
    +@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = { "mobilityProgramme" })
     public class CoursesAttendedInOtherInstitutionInMobilityProgramsType {
     
    -    @XmlElement(name = "MobilityProgramme", required = true)
    -    protected List mobilityProgramme;
    +	@XmlElement(name = "MobilityProgramme", required = true)
    +	protected List mobilityProgramme;
     
    -    /**
    -     * Gets the value of the mobilityProgramme property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the mobilityProgramme property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getMobilityProgramme().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link MobilityProgrammeType } - * - * - */ - public List getMobilityProgramme() { - if (mobilityProgramme == null) { - mobilityProgramme = new ArrayList(); - } - return this.mobilityProgramme; - } + /** + * Gets the value of the mobilityProgramme property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the mobilityProgramme property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getMobilityProgramme().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeType } + * + * + */ + public List getMobilityProgramme() { + if (mobilityProgramme == null) { + mobilityProgramme = new ArrayList(); + } + return this.mobilityProgramme; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java index 229b753ff..f754fce18 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CoursesGroupType complex type. + *

    + * Java class for CoursesGroupType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesGroupType">
    @@ -41,148 +41,129 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesGroupType", propOrder = {
    -    "name",
    -    "headerInformation",
    -    "coursesGroup",
    -    "footerInformation"
    -})
    +@XmlType(name = "CoursesGroupType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
     public class CoursesGroupType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    -    @XmlElement(name = "HeaderInformation")
    -    protected RichTextTagType headerInformation;
    -    @XmlElement(name = "CoursesGroup")
    -    protected List coursesGroup;
    -    @XmlElement(name = "FooterInformation")
    -    protected RichTextTagType footerInformation;
    -    @XmlAttribute(name = "groupID", required = true)
    -    protected String groupID;
    -
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    -
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    -
    -    /**
    -     * Gets the value of the headerInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getHeaderInformation() {
    -        return headerInformation;
    -    }
    -
    -    /**
    -     * Sets the value of the headerInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setHeaderInformation(RichTextTagType value) {
    -        this.headerInformation = value;
    -    }
    -
    -    /**
    -     * Gets the value of the coursesGroup property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the coursesGroup property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCoursesGroup().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CoursesGroupType } - * - * - */ - public List getCoursesGroup() { - if (coursesGroup == null) { - coursesGroup = new ArrayList(); - } - return this.coursesGroup; - } - - /** - * Gets the value of the footerInformation property. - * - * @return - * possible object is - * {@link RichTextTagType } - * - */ - public RichTextTagType getFooterInformation() { - return footerInformation; - } - - /** - * Sets the value of the footerInformation property. - * - * @param value - * allowed object is - * {@link RichTextTagType } - * - */ - public void setFooterInformation(RichTextTagType value) { - this.footerInformation = value; - } - - /** - * Gets the value of the groupID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getGroupID() { - return groupID; - } - - /** - * Sets the value of the groupID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setGroupID(String value) { - this.groupID = value; - } + @XmlElement(name = "Name", required = true) + protected String name; + @XmlElement(name = "HeaderInformation") + protected RichTextTagType headerInformation; + @XmlElement(name = "CoursesGroup") + protected List coursesGroup; + @XmlElement(name = "FooterInformation") + protected RichTextTagType footerInformation; + @XmlAttribute(name = "groupID", required = true) + protected String groupID; + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the headerInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getHeaderInformation() { + return headerInformation; + } + + /** + * Sets the value of the headerInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setHeaderInformation(RichTextTagType value) { + this.headerInformation = value; + } + + /** + * Gets the value of the coursesGroup property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the coursesGroup property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCoursesGroup().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CoursesGroupType } + * + * + */ + public List getCoursesGroup() { + if (coursesGroup == null) { + coursesGroup = new ArrayList(); + } + return this.coursesGroup; + } + + /** + * Gets the value of the footerInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getFooterInformation() { + return footerInformation; + } + + /** + * Sets the value of the footerInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setFooterInformation(RichTextTagType value) { + this.footerInformation = value; + } + + /** + * Gets the value of the groupID property. + * + * @return possible object is {@link String } + * + */ + public String getGroupID() { + return groupID; + } + + /** + * Sets the value of the groupID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setGroupID(String value) { + this.groupID = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java index 74b1bec06..00b5cff1e 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CoursesGroupsType complex type. + *

    + * Java class for CoursesGroupsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesGroupsType">
    @@ -39,122 +39,106 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesGroupsType", propOrder = {
    -    "name",
    -    "headerInformation",
    -    "coursesGroup",
    -    "footerInformation"
    -})
    +@XmlType(name = "CoursesGroupsType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
     public class CoursesGroupsType {
     
    -    @XmlElement(name = "Name")
    -    protected String name;
    -    @XmlElement(name = "HeaderInformation")
    -    protected RichTextTagType headerInformation;
    -    @XmlElement(name = "CoursesGroup")
    -    protected List coursesGroup;
    -    @XmlElement(name = "FooterInformation")
    -    protected RichTextTagType footerInformation;
    +	@XmlElement(name = "Name")
    +	protected String name;
    +	@XmlElement(name = "HeaderInformation")
    +	protected RichTextTagType headerInformation;
    +	@XmlElement(name = "CoursesGroup")
    +	protected List coursesGroup;
    +	@XmlElement(name = "FooterInformation")
    +	protected RichTextTagType footerInformation;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    +	/**
    +	 * Gets the value of the name property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    +	/**
    +	 * Sets the value of the name property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setName(String value) {
    +		this.name = value;
    +	}
     
    -    /**
    -     * Gets the value of the headerInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getHeaderInformation() {
    -        return headerInformation;
    -    }
    +	/**
    +	 * Gets the value of the headerInformation property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getHeaderInformation() {
    +		return headerInformation;
    +	}
     
    -    /**
    -     * Sets the value of the headerInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setHeaderInformation(RichTextTagType value) {
    -        this.headerInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the headerInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setHeaderInformation(RichTextTagType value) {
    +		this.headerInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the coursesGroup property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the coursesGroup property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCoursesGroup().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CoursesGroupType } - * - * - */ - public List getCoursesGroup() { - if (coursesGroup == null) { - coursesGroup = new ArrayList(); - } - return this.coursesGroup; - } + /** + * Gets the value of the coursesGroup property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the coursesGroup property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCoursesGroup().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CoursesGroupType } + * + * + */ + public List getCoursesGroup() { + if (coursesGroup == null) { + coursesGroup = new ArrayList(); + } + return this.coursesGroup; + } - /** - * Gets the value of the footerInformation property. - * - * @return - * possible object is - * {@link RichTextTagType } - * - */ - public RichTextTagType getFooterInformation() { - return footerInformation; - } + /** + * Gets the value of the footerInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getFooterInformation() { + return footerInformation; + } - /** - * Sets the value of the footerInformation property. - * - * @param value - * allowed object is - * {@link RichTextTagType } - * - */ - public void setFooterInformation(RichTextTagType value) { - this.footerInformation = value; - } + /** + * Sets the value of the footerInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setFooterInformation(RichTextTagType value) { + this.footerInformation = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java index d56b4bd10..5102810a9 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for CoursesUnitsType complex type. + *

    + * Java class for CoursesUnitsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CoursesUnitsType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CoursesUnitsType", propOrder = {
    -    "courseUnit"
    -})
    +@XmlType(name = "CoursesUnitsType", propOrder = { "courseUnit" })
     public class CoursesUnitsType {
     
    -    @XmlElement(name = "CourseUnit", required = true)
    -    protected List courseUnit;
    +	@XmlElement(name = "CourseUnit", required = true)
    +	protected List courseUnit;
     
    -    /**
    -     * Gets the value of the courseUnit property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the courseUnit property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCourseUnit().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link CourseUnitType } - * - * - */ - public List getCourseUnit() { - if (courseUnit == null) { - courseUnit = new ArrayList(); - } - return this.courseUnit; - } + /** + * Gets the value of the courseUnit property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the courseUnit property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCourseUnit().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link CourseUnitType } + * + * + */ + public List getCourseUnit() { + if (courseUnit == null) { + courseUnit = new ArrayList(); + } + return this.courseUnit; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java index a012c27a9..d126d7294 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java @@ -5,18 +5,19 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for ECTSGradingScaleType. + *

    + * Java class for ECTSGradingScaleType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ECTSGradingScaleType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -36,20 +37,14 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum ECTSGradingScaleType {
     
    -    A,
    -    B,
    -    C,
    -    D,
    -    E,
    -    FX,
    -    F;
    +	A, B, C, D, E, FX, F;
     
    -    public String value() {
    -        return name();
    -    }
    +	public String value() {
    +		return name();
    +	}
     
    -    public static ECTSGradingScaleType fromValue(String v) {
    -        return valueOf(v);
    -    }
    +	public static ECTSGradingScaleType fromValue(String v) {
    +		return valueOf(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java
    index 2f8d46c73..31b69e907 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for EHEAFrameworkType. + *

    + * Java class for EHEAFrameworkType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="EHEAFrameworkType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum EHEAFrameworkType {
     
    -    @XmlEnumValue("FirstCycle")
    -    FIRST_CYCLE("FirstCycle"),
    -    @XmlEnumValue("SecondCycle")
    -    SECOND_CYCLE("SecondCycle"),
    -    @XmlEnumValue("ThirdCycle")
    -    THIRD_CYCLE("ThirdCycle");
    -    private final String value;
    -
    -    EHEAFrameworkType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static EHEAFrameworkType fromValue(String v) {
    -        for (EHEAFrameworkType c: EHEAFrameworkType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	@XmlEnumValue("FirstCycle")
    +	FIRST_CYCLE("FirstCycle"), @XmlEnumValue("SecondCycle")
    +	SECOND_CYCLE("SecondCycle"), @XmlEnumValue("ThirdCycle")
    +	THIRD_CYCLE("ThirdCycle");
    +	private final String value;
    +
    +	EHEAFrameworkType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static EHEAFrameworkType fromValue(String v) {
    +		for (EHEAFrameworkType c : EHEAFrameworkType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java
    index 85daac00d..de8f10707 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlMixed;
     import javax.xml.bind.annotation.XmlType;
     import org.w3c.dom.Element;
     
    -
     /**
    - * 

    Java class for ExtensionContentType complex type. + *

    + * Java class for ExtensionContentType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ExtensionContentType">
    @@ -40,70 +40,61 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ExtensionContentType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "ExtensionContentType", propOrder = { "content" })
     public class ExtensionContentType {
     
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "id")
    -    protected String id;
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "id")
    +	protected String id;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java index a69798709..007ea7bfb 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for FamilyNameType complex type. + *

    + * Java class for FamilyNameType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="FamilyNameType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "FamilyNameType", propOrder = {
    -    "surname"
    -})
    +@XmlType(name = "FamilyNameType", propOrder = { "surname" })
     public class FamilyNameType {
     
    -    @XmlElement(name = "Surname", required = true)
    -    protected List surname;
    +	@XmlElement(name = "Surname", required = true)
    +	protected List surname;
     
    -    /**
    -     * Gets the value of the surname property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the surname property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSurname().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getSurname() { - if (surname == null) { - surname = new ArrayList(); - } - return this.surname; - } + /** + * Gets the value of the surname property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the surname property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSurname().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getSurname() { + if (surname == null) { + surname = new ArrayList(); + } + return this.surname; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java index 34a9a68b5..159810298 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for GenderType. + *

    + * Java class for GenderType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="GenderType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -32,27 +33,26 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum GenderType {
     
    -    @XmlEnumValue("Female")
    -    FEMALE("Female"),
    -    @XmlEnumValue("Male")
    -    MALE("Male");
    -    private final String value;
    -
    -    GenderType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static GenderType fromValue(String v) {
    -        for (GenderType c: GenderType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	@XmlEnumValue("Female")
    +	FEMALE("Female"), @XmlEnumValue("Male")
    +	MALE("Male");
    +	private final String value;
    +
    +	GenderType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static GenderType fromValue(String v) {
    +		for (GenderType c : GenderType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java
    index b59e1b6b1..4dd196d31 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -17,11 +16,12 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
     
    -
     /**
    - * 

    Java class for GeneralDiplomaType complex type. + *

    + * Java class for GeneralDiplomaType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="GeneralDiplomaType">
    @@ -50,360 +50,316 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "GeneralDiplomaType", propOrder = {
    -    "informationIdentifyingTheHolderOfTheQualification",
    -    "informationIdentifyingTheQualification",
    -    "informationOnTheLevelOfTheQualification",
    -    "informationOnTheContentsAndResultsGained",
    -    "informationOnTheFunctionOfTheQualification",
    -    "additionalInformation",
    -    "certificationOfTheSupplement",
    -    "informationOnTheNationalHigherEducationSystem",
    -    "attachments",
    -    "extensionContent",
    -    "signature"
    -})
    +@XmlType(name = "GeneralDiplomaType", propOrder = { "informationIdentifyingTheHolderOfTheQualification", "informationIdentifyingTheQualification", "informationOnTheLevelOfTheQualification",
    +		"informationOnTheContentsAndResultsGained", "informationOnTheFunctionOfTheQualification", "additionalInformation", "certificationOfTheSupplement",
    +		"informationOnTheNationalHigherEducationSystem", "attachments", "extensionContent", "signature" })
     public class GeneralDiplomaType {
     
    -    @XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
    -    protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
    -    @XmlElement(name = "InformationIdentifyingTheQualification", required = true)
    -    protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
    -    @XmlElement(name = "InformationOnTheLevelOfTheQualification")
    -    protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
    -    @XmlElement(name = "InformationOnTheContentsAndResultsGained")
    -    protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
    -    @XmlElement(name = "InformationOnTheFunctionOfTheQualification")
    -    protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
    -    @XmlElement(name = "AdditionalInformation")
    -    protected AdditionalInformationType additionalInformation;
    -    @XmlElement(name = "CertificationOfTheSupplement")
    -    protected CertificationOfTheSupplementType certificationOfTheSupplement;
    -    @XmlElement(name = "InformationOnTheNationalHigherEducationSystem")
    -    protected RichTextTagType informationOnTheNationalHigherEducationSystem;
    -    @XmlElement(name = "Attachments")
    -    protected AttachmentsType attachments;
    -    @XmlElement(name = "ExtensionContent")
    -    protected List extensionContent;
    -    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    -    protected List signature;
    -    @XmlAttribute(name = "language", required = true)
    -    protected LanguageType language;
    -    @XmlAttribute(name = "isTheOriginalLanguage", required = true)
    -    protected boolean isTheOriginalLanguage;
    +	@XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
    +	protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
    +	@XmlElement(name = "InformationIdentifyingTheQualification", required = true)
    +	protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
    +	@XmlElement(name = "InformationOnTheLevelOfTheQualification")
    +	protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
    +	@XmlElement(name = "InformationOnTheContentsAndResultsGained")
    +	protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
    +	@XmlElement(name = "InformationOnTheFunctionOfTheQualification")
    +	protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
    +	@XmlElement(name = "AdditionalInformation")
    +	protected AdditionalInformationType additionalInformation;
    +	@XmlElement(name = "CertificationOfTheSupplement")
    +	protected CertificationOfTheSupplementType certificationOfTheSupplement;
    +	@XmlElement(name = "InformationOnTheNationalHigherEducationSystem")
    +	protected RichTextTagType informationOnTheNationalHigherEducationSystem;
    +	@XmlElement(name = "Attachments")
    +	protected AttachmentsType attachments;
    +	@XmlElement(name = "ExtensionContent")
    +	protected List extensionContent;
    +	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    +	protected List signature;
    +	@XmlAttribute(name = "language", required = true)
    +	protected LanguageType language;
    +	@XmlAttribute(name = "isTheOriginalLanguage", required = true)
    +	protected boolean isTheOriginalLanguage;
     
    -    /**
    -     * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
    -     *     
    -     */
    -    public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
    -        return informationIdentifyingTheHolderOfTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
    +	 * 
    +	 */
    +	public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
    +		return informationIdentifyingTheHolderOfTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
    -     *     
    -     */
    -    public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
    -        this.informationIdentifyingTheHolderOfTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
    +		this.informationIdentifyingTheHolderOfTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationIdentifyingTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationIdentifyingTheQualificationType }
    -     *     
    -     */
    -    public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
    -        return informationIdentifyingTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationIdentifyingTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationIdentifyingTheQualificationType }
    +	 * 
    +	 */
    +	public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
    +		return informationIdentifyingTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationIdentifyingTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationIdentifyingTheQualificationType }
    -     *     
    -     */
    -    public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
    -        this.informationIdentifyingTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationIdentifyingTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationIdentifyingTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
    +		this.informationIdentifyingTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheLevelOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType }
    -     *     
    -     */
    -    public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
    -        return informationOnTheLevelOfTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheLevelOfTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType }
    +	 * 
    +	 */
    +	public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
    +		return informationOnTheLevelOfTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheLevelOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType }
    -     *     
    -     */
    -    public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
    -        this.informationOnTheLevelOfTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheLevelOfTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
    +		this.informationOnTheLevelOfTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheContentsAndResultsGained property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType }
    -     *     
    -     */
    -    public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
    -        return informationOnTheContentsAndResultsGained;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheContentsAndResultsGained property.
    +	 * 
    +	 * @return possible object is {@link InformationOnTheContentsAndResultsGainedType }
    +	 * 
    +	 */
    +	public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
    +		return informationOnTheContentsAndResultsGained;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheContentsAndResultsGained property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType }
    -     *     
    -     */
    -    public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
    -        this.informationOnTheContentsAndResultsGained = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheContentsAndResultsGained property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationOnTheContentsAndResultsGainedType }
    +	 * 
    +	 */
    +	public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
    +		this.informationOnTheContentsAndResultsGained = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheFunctionOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType }
    -     *     
    -     */
    -    public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
    -        return informationOnTheFunctionOfTheQualification;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheFunctionOfTheQualification property.
    +	 * 
    +	 * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType }
    +	 * 
    +	 */
    +	public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
    +		return informationOnTheFunctionOfTheQualification;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheFunctionOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType }
    -     *     
    -     */
    -    public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
    -        this.informationOnTheFunctionOfTheQualification = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheFunctionOfTheQualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationOnTheFunctionOfTheQualificationType }
    +	 * 
    +	 */
    +	public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
    +		this.informationOnTheFunctionOfTheQualification = value;
    +	}
     
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AdditionalInformationType }
    -     *     
    -     */
    -    public AdditionalInformationType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    +	/**
    +	 * Gets the value of the additionalInformation property.
    +	 * 
    +	 * @return possible object is {@link AdditionalInformationType }
    +	 * 
    +	 */
    +	public AdditionalInformationType getAdditionalInformation() {
    +		return additionalInformation;
    +	}
     
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AdditionalInformationType }
    -     *     
    -     */
    -    public void setAdditionalInformation(AdditionalInformationType value) {
    -        this.additionalInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the additionalInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AdditionalInformationType }
    +	 * 
    +	 */
    +	public void setAdditionalInformation(AdditionalInformationType value) {
    +		this.additionalInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the certificationOfTheSupplement property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CertificationOfTheSupplementType }
    -     *     
    -     */
    -    public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
    -        return certificationOfTheSupplement;
    -    }
    +	/**
    +	 * Gets the value of the certificationOfTheSupplement property.
    +	 * 
    +	 * @return possible object is {@link CertificationOfTheSupplementType }
    +	 * 
    +	 */
    +	public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
    +		return certificationOfTheSupplement;
    +	}
     
    -    /**
    -     * Sets the value of the certificationOfTheSupplement property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CertificationOfTheSupplementType }
    -     *     
    -     */
    -    public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
    -        this.certificationOfTheSupplement = value;
    -    }
    +	/**
    +	 * Sets the value of the certificationOfTheSupplement property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CertificationOfTheSupplementType }
    +	 * 
    +	 */
    +	public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
    +		this.certificationOfTheSupplement = value;
    +	}
     
    -    /**
    -     * Gets the value of the informationOnTheNationalHigherEducationSystem property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
    -        return informationOnTheNationalHigherEducationSystem;
    -    }
    +	/**
    +	 * Gets the value of the informationOnTheNationalHigherEducationSystem property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
    +		return informationOnTheNationalHigherEducationSystem;
    +	}
     
    -    /**
    -     * Sets the value of the informationOnTheNationalHigherEducationSystem property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
    -        this.informationOnTheNationalHigherEducationSystem = value;
    -    }
    +	/**
    +	 * Sets the value of the informationOnTheNationalHigherEducationSystem property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
    +		this.informationOnTheNationalHigherEducationSystem = value;
    +	}
     
    -    /**
    -     * Gets the value of the attachments property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link AttachmentsType }
    -     *     
    -     */
    -    public AttachmentsType getAttachments() {
    -        return attachments;
    -    }
    +	/**
    +	 * Gets the value of the attachments property.
    +	 * 
    +	 * @return possible object is {@link AttachmentsType }
    +	 * 
    +	 */
    +	public AttachmentsType getAttachments() {
    +		return attachments;
    +	}
     
    -    /**
    -     * Sets the value of the attachments property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link AttachmentsType }
    -     *     
    -     */
    -    public void setAttachments(AttachmentsType value) {
    -        this.attachments = value;
    -    }
    +	/**
    +	 * Sets the value of the attachments property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link AttachmentsType }
    +	 * 
    +	 */
    +	public void setAttachments(AttachmentsType value) {
    +		this.attachments = value;
    +	}
     
    -    /**
    -     * Gets the value of the extensionContent property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the extensionContent property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getExtensionContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link ExtensionContentType } - * - * - */ - public List getExtensionContent() { - if (extensionContent == null) { - extensionContent = new ArrayList(); - } - return this.extensionContent; - } + /** + * Gets the value of the extensionContent property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the extensionContent property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getExtensionContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link ExtensionContentType } + * + * + */ + public List getExtensionContent() { + if (extensionContent == null) { + extensionContent = new ArrayList(); + } + return this.extensionContent; + } - /** - * Gets the value of the signature property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the signature property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSignature().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link SignatureType } - * - * - */ - public List getSignature() { - if (signature == null) { - signature = new ArrayList(); - } - return this.signature; - } + /** + * Gets the value of the signature property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the signature property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSignature().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link SignatureType } + * + * + */ + public List getSignature() { + if (signature == null) { + signature = new ArrayList(); + } + return this.signature; + } - /** - * Gets the value of the language property. - * - * @return - * possible object is - * {@link LanguageType } - * - */ - public LanguageType getLanguage() { - return language; - } + /** + * Gets the value of the language property. + * + * @return possible object is {@link LanguageType } + * + */ + public LanguageType getLanguage() { + return language; + } - /** - * Sets the value of the language property. - * - * @param value - * allowed object is - * {@link LanguageType } - * - */ - public void setLanguage(LanguageType value) { - this.language = value; - } + /** + * Sets the value of the language property. + * + * @param value + * allowed object is {@link LanguageType } + * + */ + public void setLanguage(LanguageType value) { + this.language = value; + } - /** - * Gets the value of the isTheOriginalLanguage property. - * - */ - public boolean isIsTheOriginalLanguage() { - return isTheOriginalLanguage; - } + /** + * Gets the value of the isTheOriginalLanguage property. + * + */ + public boolean isIsTheOriginalLanguage() { + return isTheOriginalLanguage; + } - /** - * Sets the value of the isTheOriginalLanguage property. - * - */ - public void setIsTheOriginalLanguage(boolean value) { - this.isTheOriginalLanguage = value; - } + /** + * Sets the value of the isTheOriginalLanguage property. + * + */ + public void setIsTheOriginalLanguage(boolean value) { + this.isTheOriginalLanguage = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java index cc9b70e5b..3818b52e1 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for GivenNameType complex type. + *

    + * Java class for GivenNameType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="GivenNameType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "GivenNameType", propOrder = {
    -    "name"
    -})
    +@XmlType(name = "GivenNameType", propOrder = { "name" })
     public class GivenNameType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected List name;
    +	@XmlElement(name = "Name", required = true)
    +	protected List name;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the name property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getName().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getName() { - if (name == null) { - name = new ArrayList(); - } - return this.name; - } + /** + * Gets the value of the name property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the name property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getName().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } + * + * + */ + public List getName() { + if (name == null) { + name = new ArrayList(); + } + return this.name; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java index 9bb0de01d..471ff3a5f 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for GradingSchemeAndGradeDistributionGuidanceType complex type. + *

    + * Java class for GradingSchemeAndGradeDistributionGuidanceType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="GradingSchemeAndGradeDistributionGuidanceType">
    @@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = {
    -    "gradingScheme",
    -    "gradeDistributionGuidance"
    -})
    +@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = { "gradingScheme", "gradeDistributionGuidance" })
     public class GradingSchemeAndGradeDistributionGuidanceType {
     
    -    @XmlElement(name = "GradingScheme", required = true)
    -    protected RichTextTagType gradingScheme;
    -    @XmlElement(name = "GradeDistributionGuidance")
    -    protected RichTextTagType gradeDistributionGuidance;
    +	@XmlElement(name = "GradingScheme", required = true)
    +	protected RichTextTagType gradingScheme;
    +	@XmlElement(name = "GradeDistributionGuidance")
    +	protected RichTextTagType gradeDistributionGuidance;
     
    -    /**
    -     * Gets the value of the gradingScheme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getGradingScheme() {
    -        return gradingScheme;
    -    }
    +	/**
    +	 * Gets the value of the gradingScheme property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getGradingScheme() {
    +		return gradingScheme;
    +	}
     
    -    /**
    -     * Sets the value of the gradingScheme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setGradingScheme(RichTextTagType value) {
    -        this.gradingScheme = value;
    -    }
    +	/**
    +	 * Sets the value of the gradingScheme property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setGradingScheme(RichTextTagType value) {
    +		this.gradingScheme = value;
    +	}
     
    -    /**
    -     * Gets the value of the gradeDistributionGuidance property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getGradeDistributionGuidance() {
    -        return gradeDistributionGuidance;
    -    }
    +	/**
    +	 * Gets the value of the gradeDistributionGuidance property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getGradeDistributionGuidance() {
    +		return gradeDistributionGuidance;
    +	}
     
    -    /**
    -     * Sets the value of the gradeDistributionGuidance property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setGradeDistributionGuidance(RichTextTagType value) {
    -        this.gradeDistributionGuidance = value;
    -    }
    +	/**
    +	 * Sets the value of the gradeDistributionGuidance property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setGradeDistributionGuidance(RichTextTagType value) {
    +		this.gradeDistributionGuidance = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java
    index 8429a3229..22d889b67 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for ImageMimeType. + *

    + * Java class for ImageMimeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ImageMimeType">
      *   <restriction base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MimeType">
    @@ -35,33 +36,29 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum(MimeType.class)
     public enum ImageMimeType {
     
    -    @XmlEnumValue("image/gif")
    -    IMAGE_GIF(MimeType.IMAGE_GIF),
    -    @XmlEnumValue("image/jpeg")
    -    IMAGE_JPEG(MimeType.IMAGE_JPEG),
    -    @XmlEnumValue("image/pjpeg")
    -    IMAGE_PJPEG(MimeType.IMAGE_PJPEG),
    -    @XmlEnumValue("image/png")
    -    IMAGE_PNG(MimeType.IMAGE_PNG),
    -    @XmlEnumValue("image/tiff")
    -    IMAGE_TIFF(MimeType.IMAGE_TIFF);
    -    private final MimeType value;
    +	@XmlEnumValue("image/gif")
    +	IMAGE_GIF(MimeType.IMAGE_GIF), @XmlEnumValue("image/jpeg")
    +	IMAGE_JPEG(MimeType.IMAGE_JPEG), @XmlEnumValue("image/pjpeg")
    +	IMAGE_PJPEG(MimeType.IMAGE_PJPEG), @XmlEnumValue("image/png")
    +	IMAGE_PNG(MimeType.IMAGE_PNG), @XmlEnumValue("image/tiff")
    +	IMAGE_TIFF(MimeType.IMAGE_TIFF);
    +	private final MimeType value;
     
    -    ImageMimeType(MimeType v) {
    -        value = v;
    -    }
    +	ImageMimeType(MimeType v) {
    +		value = v;
    +	}
     
    -    public MimeType value() {
    -        return value;
    -    }
    +	public MimeType value() {
    +		return value;
    +	}
     
    -    public static ImageMimeType fromValue(MimeType v) {
    -        for (ImageMimeType c: ImageMimeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v.toString());
    -    }
    +	public static ImageMimeType fromValue(MimeType v) {
    +		for (ImageMimeType c : ImageMimeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v.toString());
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java
    index c9da2e078..3443104e3 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     import javax.xml.datatype.XMLGregorianCalendar;
     
    -
     /**
    - * 

    Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type. + *

    + * Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
    @@ -51,277 +51,242 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = {
    -    "familyName",
    -    "givenName",
    -    "dateOfBirth",
    -    "studentIdentificationNumber",
    -    "countryOfBirth",
    -    "placeOfBirth",
    -    "gender"
    -})
    +@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = { "familyName", "givenName", "dateOfBirth", "studentIdentificationNumber", "countryOfBirth", "placeOfBirth",
    +		"gender" })
     public class InformationIdentifyingTheHolderOfTheQualificationType {
     
    -    @XmlElement(name = "FamilyName", required = true)
    -    protected FamilyNameType familyName;
    -    @XmlElement(name = "GivenName", required = true)
    -    protected GivenNameType givenName;
    -    @XmlElement(name = "DateOfBirth")
    -    protected XMLGregorianCalendar dateOfBirth;
    -    @XmlElement(name = "StudentIdentificationNumber")
    -    protected String studentIdentificationNumber;
    -    @XmlElement(name = "CountryOfBirth")
    -    protected CountryTextCodeType countryOfBirth;
    -    @XmlElement(name = "PlaceOfBirth")
    -    protected String placeOfBirth;
    -    @XmlElement(name = "Gender")
    -    protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender;
    -
    -    /**
    -     * Gets the value of the familyName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public FamilyNameType getFamilyName() {
    -        return familyName;
    -    }
    +	@XmlElement(name = "FamilyName", required = true)
    +	protected FamilyNameType familyName;
    +	@XmlElement(name = "GivenName", required = true)
    +	protected GivenNameType givenName;
    +	@XmlElement(name = "DateOfBirth")
    +	protected XMLGregorianCalendar dateOfBirth;
    +	@XmlElement(name = "StudentIdentificationNumber")
    +	protected String studentIdentificationNumber;
    +	@XmlElement(name = "CountryOfBirth")
    +	protected CountryTextCodeType countryOfBirth;
    +	@XmlElement(name = "PlaceOfBirth")
    +	protected String placeOfBirth;
    +	@XmlElement(name = "Gender")
    +	protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender;
     
    -    /**
    -     * Sets the value of the familyName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public void setFamilyName(FamilyNameType value) {
    -        this.familyName = value;
    -    }
    +	/**
    +	 * Gets the value of the familyName property.
    +	 * 
    +	 * @return possible object is {@link FamilyNameType }
    +	 * 
    +	 */
    +	public FamilyNameType getFamilyName() {
    +		return familyName;
    +	}
     
    -    /**
    -     * Gets the value of the givenName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public GivenNameType getGivenName() {
    -        return givenName;
    -    }
    +	/**
    +	 * Sets the value of the familyName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link FamilyNameType }
    +	 * 
    +	 */
    +	public void setFamilyName(FamilyNameType value) {
    +		this.familyName = value;
    +	}
     
    -    /**
    -     * Sets the value of the givenName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public void setGivenName(GivenNameType value) {
    -        this.givenName = value;
    -    }
    +	/**
    +	 * Gets the value of the givenName property.
    +	 * 
    +	 * @return possible object is {@link GivenNameType }
    +	 * 
    +	 */
    +	public GivenNameType getGivenName() {
    +		return givenName;
    +	}
     
    -    /**
    -     * Gets the value of the dateOfBirth property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateOfBirth() {
    -        return dateOfBirth;
    -    }
    +	/**
    +	 * Sets the value of the givenName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link GivenNameType }
    +	 * 
    +	 */
    +	public void setGivenName(GivenNameType value) {
    +		this.givenName = value;
    +	}
     
    -    /**
    -     * Sets the value of the dateOfBirth property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateOfBirth(XMLGregorianCalendar value) {
    -        this.dateOfBirth = value;
    -    }
    +	/**
    +	 * Gets the value of the dateOfBirth property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateOfBirth() {
    +		return dateOfBirth;
    +	}
     
    -    /**
    -     * Gets the value of the studentIdentificationNumber property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStudentIdentificationNumber() {
    -        return studentIdentificationNumber;
    -    }
    +	/**
    +	 * Sets the value of the dateOfBirth property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateOfBirth(XMLGregorianCalendar value) {
    +		this.dateOfBirth = value;
    +	}
     
    -    /**
    -     * Sets the value of the studentIdentificationNumber property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStudentIdentificationNumber(String value) {
    -        this.studentIdentificationNumber = value;
    -    }
    +	/**
    +	 * Gets the value of the studentIdentificationNumber property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getStudentIdentificationNumber() {
    +		return studentIdentificationNumber;
    +	}
     
    -    /**
    -     * Gets the value of the countryOfBirth property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CountryTextCodeType }
    -     *     
    -     */
    -    public CountryTextCodeType getCountryOfBirth() {
    -        return countryOfBirth;
    -    }
    +	/**
    +	 * Sets the value of the studentIdentificationNumber property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setStudentIdentificationNumber(String value) {
    +		this.studentIdentificationNumber = value;
    +	}
     
    -    /**
    -     * Sets the value of the countryOfBirth property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CountryTextCodeType }
    -     *     
    -     */
    -    public void setCountryOfBirth(CountryTextCodeType value) {
    -        this.countryOfBirth = value;
    -    }
    +	/**
    +	 * Gets the value of the countryOfBirth property.
    +	 * 
    +	 * @return possible object is {@link CountryTextCodeType }
    +	 * 
    +	 */
    +	public CountryTextCodeType getCountryOfBirth() {
    +		return countryOfBirth;
    +	}
     
    -    /**
    -     * Gets the value of the placeOfBirth property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getPlaceOfBirth() {
    -        return placeOfBirth;
    -    }
    +	/**
    +	 * Sets the value of the countryOfBirth property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CountryTextCodeType }
    +	 * 
    +	 */
    +	public void setCountryOfBirth(CountryTextCodeType value) {
    +		this.countryOfBirth = value;
    +	}
     
    -    /**
    -     * Sets the value of the placeOfBirth property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setPlaceOfBirth(String value) {
    -        this.placeOfBirth = value;
    -    }
    +	/**
    +	 * Gets the value of the placeOfBirth property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getPlaceOfBirth() {
    +		return placeOfBirth;
    +	}
     
    -    /**
    -     * Gets the value of the gender property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
    -     *     
    -     */
    -    public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() {
    -        return gender;
    -    }
    +	/**
    +	 * Sets the value of the placeOfBirth property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setPlaceOfBirth(String value) {
    +		this.placeOfBirth = value;
    +	}
     
    -    /**
    -     * Sets the value of the gender property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
    -     *     
    -     */
    -    public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) {
    -        this.gender = value;
    -    }
    +	/**
    +	 * Gets the value of the gender property.
    +	 * 
    +	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
    +	 * 
    +	 */
    +	public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() {
    +		return gender;
    +	}
     
    +	/**
    +	 * Sets the value of the gender property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
    +	 * 
    +	 */
    +	public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) {
    +		this.gender = value;
    +	}
     
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="gender" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GenderType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Gender { + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="gender" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GenderType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Gender { - @XmlValue - protected String value; - @XmlAttribute(name = "gender", required = true) - protected GenderType gender; + @XmlValue + protected String value; + @XmlAttribute(name = "gender", required = true) + protected GenderType gender; - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } - /** - * Gets the value of the gender property. - * - * @return - * possible object is - * {@link GenderType } - * - */ - public GenderType getGender() { - return gender; - } + /** + * Gets the value of the gender property. + * + * @return possible object is {@link GenderType } + * + */ + public GenderType getGender() { + return gender; + } - /** - * Sets the value of the gender property. - * - * @param value - * allowed object is - * {@link GenderType } - * - */ - public void setGender(GenderType value) { - this.gender = value; - } + /** + * Sets the value of the gender property. + * + * @param value + * allowed object is {@link GenderType } + * + */ + public void setGender(GenderType value) { + this.gender = value; + } - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java index 21040122c..6e257e6df 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for InformationIdentifyingTheQualificationType complex type. + *

    + * Java class for InformationIdentifyingTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationIdentifyingTheQualificationType">
    @@ -39,171 +39,147 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = {
    -    "qualification",
    -    "titleConferred",
    -    "mainFieldsOfStudy",
    -    "nameAndStatusOfAwardingInstitution",
    -    "nameAndStatusOfInstitutionAdministeringStudies",
    -    "languagesOfInstructionAndExamination"
    -})
    +@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = { "qualification", "titleConferred", "mainFieldsOfStudy", "nameAndStatusOfAwardingInstitution",
    +		"nameAndStatusOfInstitutionAdministeringStudies", "languagesOfInstructionAndExamination" })
     public class InformationIdentifyingTheQualificationType {
     
    -    @XmlElement(name = "Qualification", required = true)
    -    protected QualificationType qualification;
    -    @XmlElement(name = "TitleConferred")
    -    protected TitleConferredType titleConferred;
    -    @XmlElement(name = "MainFieldsOfStudy")
    -    protected RichTextTagType mainFieldsOfStudy;
    -    @XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
    -    protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
    -    @XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
    -    protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
    -    @XmlElement(name = "LanguagesOfInstructionAndExamination")
    -    protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
    -
    -    /**
    -     * Gets the value of the qualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link QualificationType }
    -     *     
    -     */
    -    public QualificationType getQualification() {
    -        return qualification;
    -    }
    -
    -    /**
    -     * Sets the value of the qualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link QualificationType }
    -     *     
    -     */
    -    public void setQualification(QualificationType value) {
    -        this.qualification = value;
    -    }
    -
    -    /**
    -     * Gets the value of the titleConferred property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link TitleConferredType }
    -     *     
    -     */
    -    public TitleConferredType getTitleConferred() {
    -        return titleConferred;
    -    }
    -
    -    /**
    -     * Sets the value of the titleConferred property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link TitleConferredType }
    -     *     
    -     */
    -    public void setTitleConferred(TitleConferredType value) {
    -        this.titleConferred = value;
    -    }
    -
    -    /**
    -     * Gets the value of the mainFieldsOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getMainFieldsOfStudy() {
    -        return mainFieldsOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the mainFieldsOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setMainFieldsOfStudy(RichTextTagType value) {
    -        this.mainFieldsOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nameAndStatusOfAwardingInstitution property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link NameAndStatusOfAwardingInstitutionType }
    -     *     
    -     */
    -    public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
    -        return nameAndStatusOfAwardingInstitution;
    -    }
    -
    -    /**
    -     * Sets the value of the nameAndStatusOfAwardingInstitution property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link NameAndStatusOfAwardingInstitutionType }
    -     *     
    -     */
    -    public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
    -        this.nameAndStatusOfAwardingInstitution = value;
    -    }
    -
    -    /**
    -     * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    -     *     
    -     */
    -    public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
    -        return nameAndStatusOfInstitutionAdministeringStudies;
    -    }
    -
    -    /**
    -     * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    -     *     
    -     */
    -    public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
    -        this.nameAndStatusOfInstitutionAdministeringStudies = value;
    -    }
    -
    -    /**
    -     * Gets the value of the languagesOfInstructionAndExamination property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LanguagesOfInstructionAndExaminationType }
    -     *     
    -     */
    -    public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
    -        return languagesOfInstructionAndExamination;
    -    }
    -
    -    /**
    -     * Sets the value of the languagesOfInstructionAndExamination property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LanguagesOfInstructionAndExaminationType }
    -     *     
    -     */
    -    public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
    -        this.languagesOfInstructionAndExamination = value;
    -    }
    +	@XmlElement(name = "Qualification", required = true)
    +	protected QualificationType qualification;
    +	@XmlElement(name = "TitleConferred")
    +	protected TitleConferredType titleConferred;
    +	@XmlElement(name = "MainFieldsOfStudy")
    +	protected RichTextTagType mainFieldsOfStudy;
    +	@XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
    +	protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
    +	@XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
    +	protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
    +	@XmlElement(name = "LanguagesOfInstructionAndExamination")
    +	protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
    +
    +	/**
    +	 * Gets the value of the qualification property.
    +	 * 
    +	 * @return possible object is {@link QualificationType }
    +	 * 
    +	 */
    +	public QualificationType getQualification() {
    +		return qualification;
    +	}
    +
    +	/**
    +	 * Sets the value of the qualification property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link QualificationType }
    +	 * 
    +	 */
    +	public void setQualification(QualificationType value) {
    +		this.qualification = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the titleConferred property.
    +	 * 
    +	 * @return possible object is {@link TitleConferredType }
    +	 * 
    +	 */
    +	public TitleConferredType getTitleConferred() {
    +		return titleConferred;
    +	}
    +
    +	/**
    +	 * Sets the value of the titleConferred property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link TitleConferredType }
    +	 * 
    +	 */
    +	public void setTitleConferred(TitleConferredType value) {
    +		this.titleConferred = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the mainFieldsOfStudy property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getMainFieldsOfStudy() {
    +		return mainFieldsOfStudy;
    +	}
    +
    +	/**
    +	 * Sets the value of the mainFieldsOfStudy property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setMainFieldsOfStudy(RichTextTagType value) {
    +		this.mainFieldsOfStudy = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the nameAndStatusOfAwardingInstitution property.
    +	 * 
    +	 * @return possible object is {@link NameAndStatusOfAwardingInstitutionType }
    +	 * 
    +	 */
    +	public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
    +		return nameAndStatusOfAwardingInstitution;
    +	}
    +
    +	/**
    +	 * Sets the value of the nameAndStatusOfAwardingInstitution property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link NameAndStatusOfAwardingInstitutionType }
    +	 * 
    +	 */
    +	public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
    +		this.nameAndStatusOfAwardingInstitution = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    +	 * 
    +	 * @return possible object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    +	 * 
    +	 */
    +	public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
    +		return nameAndStatusOfInstitutionAdministeringStudies;
    +	}
    +
    +	/**
    +	 * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
    +	 * 
    +	 */
    +	public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
    +		this.nameAndStatusOfInstitutionAdministeringStudies = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the languagesOfInstructionAndExamination property.
    +	 * 
    +	 * @return possible object is {@link LanguagesOfInstructionAndExaminationType }
    +	 * 
    +	 */
    +	public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
    +		return languagesOfInstructionAndExamination;
    +	}
    +
    +	/**
    +	 * Sets the value of the languagesOfInstructionAndExamination property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link LanguagesOfInstructionAndExaminationType }
    +	 * 
    +	 */
    +	public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
    +		this.languagesOfInstructionAndExamination = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java
    index 9255189f9..be1d1c670 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for InformationOnTheContentsAndResultsGainedType complex type. + *

    + * Java class for InformationOnTheContentsAndResultsGainedType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationOnTheContentsAndResultsGainedType">
    @@ -47,197 +47,173 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = {
    -    "modeOfStudy",
    -    "programmeRequirements",
    -    "programmeDetails",
    -    "gradingSchemeAndGradeDistributionGuidance",
    -    "overallClassificationOfTheQualification"
    -})
    +@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = { "modeOfStudy", "programmeRequirements", "programmeDetails", "gradingSchemeAndGradeDistributionGuidance",
    +		"overallClassificationOfTheQualification" })
     public class InformationOnTheContentsAndResultsGainedType {
     
    -    @XmlElement(name = "ModeOfStudy")
    -    protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy;
    -    @XmlElement(name = "ProgrammeRequirements")
    -    protected ProgrammeRequirementsType programmeRequirements;
    -    @XmlElement(name = "ProgrammeDetails")
    -    protected ProgrammeDetailsType programmeDetails;
    -    @XmlElement(name = "GradingSchemeAndGradeDistributionGuidance")
    -    protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance;
    -    @XmlElement(name = "OverallClassificationOfTheQualification")
    -    protected RichTextTagType overallClassificationOfTheQualification;
    -
    -    /**
    -     * Gets the value of the modeOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
    -     *     
    -     */
    -    public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() {
    -        return modeOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the modeOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
    -     *     
    -     */
    -    public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) {
    -        this.modeOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the programmeRequirements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ProgrammeRequirementsType }
    -     *     
    -     */
    -    public ProgrammeRequirementsType getProgrammeRequirements() {
    -        return programmeRequirements;
    -    }
    -
    -    /**
    -     * Sets the value of the programmeRequirements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ProgrammeRequirementsType }
    -     *     
    -     */
    -    public void setProgrammeRequirements(ProgrammeRequirementsType value) {
    -        this.programmeRequirements = value;
    -    }
    -
    -    /**
    -     * Gets the value of the programmeDetails property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ProgrammeDetailsType }
    -     *     
    -     */
    -    public ProgrammeDetailsType getProgrammeDetails() {
    -        return programmeDetails;
    -    }
    -
    -    /**
    -     * Sets the value of the programmeDetails property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ProgrammeDetailsType }
    -     *     
    -     */
    -    public void setProgrammeDetails(ProgrammeDetailsType value) {
    -        this.programmeDetails = value;
    -    }
    -
    -    /**
    -     * Gets the value of the gradingSchemeAndGradeDistributionGuidance property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
    -     *     
    -     */
    -    public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() {
    -        return gradingSchemeAndGradeDistributionGuidance;
    -    }
    -
    -    /**
    -     * Sets the value of the gradingSchemeAndGradeDistributionGuidance property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
    -     *     
    -     */
    -    public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) {
    -        this.gradingSchemeAndGradeDistributionGuidance = value;
    -    }
    -
    -    /**
    -     * Gets the value of the overallClassificationOfTheQualification property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getOverallClassificationOfTheQualification() {
    -        return overallClassificationOfTheQualification;
    -    }
    -
    -    /**
    -     * Sets the value of the overallClassificationOfTheQualification property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setOverallClassificationOfTheQualification(RichTextTagType value) {
    -        this.overallClassificationOfTheQualification = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    -     *       <attribute name="modeOfStudy" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfStudyType" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class ModeOfStudy - extends RichTextTagType - { - - @XmlAttribute(name = "modeOfStudy") - protected ModeOfStudyType modeOfStudy; - - /** - * Gets the value of the modeOfStudy property. - * - * @return - * possible object is - * {@link ModeOfStudyType } - * - */ - public ModeOfStudyType getModeOfStudy() { - return modeOfStudy; - } - - /** - * Sets the value of the modeOfStudy property. - * - * @param value - * allowed object is - * {@link ModeOfStudyType } - * - */ - public void setModeOfStudy(ModeOfStudyType value) { - this.modeOfStudy = value; - } - - } + @XmlElement(name = "ModeOfStudy") + protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy; + @XmlElement(name = "ProgrammeRequirements") + protected ProgrammeRequirementsType programmeRequirements; + @XmlElement(name = "ProgrammeDetails") + protected ProgrammeDetailsType programmeDetails; + @XmlElement(name = "GradingSchemeAndGradeDistributionGuidance") + protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance; + @XmlElement(name = "OverallClassificationOfTheQualification") + protected RichTextTagType overallClassificationOfTheQualification; + + /** + * Gets the value of the modeOfStudy property. + * + * @return possible object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } + * + */ + public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() { + return modeOfStudy; + } + + /** + * Sets the value of the modeOfStudy property. + * + * @param value + * allowed object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } + * + */ + public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) { + this.modeOfStudy = value; + } + + /** + * Gets the value of the programmeRequirements property. + * + * @return possible object is {@link ProgrammeRequirementsType } + * + */ + public ProgrammeRequirementsType getProgrammeRequirements() { + return programmeRequirements; + } + + /** + * Sets the value of the programmeRequirements property. + * + * @param value + * allowed object is {@link ProgrammeRequirementsType } + * + */ + public void setProgrammeRequirements(ProgrammeRequirementsType value) { + this.programmeRequirements = value; + } + + /** + * Gets the value of the programmeDetails property. + * + * @return possible object is {@link ProgrammeDetailsType } + * + */ + public ProgrammeDetailsType getProgrammeDetails() { + return programmeDetails; + } + + /** + * Sets the value of the programmeDetails property. + * + * @param value + * allowed object is {@link ProgrammeDetailsType } + * + */ + public void setProgrammeDetails(ProgrammeDetailsType value) { + this.programmeDetails = value; + } + + /** + * Gets the value of the gradingSchemeAndGradeDistributionGuidance property. + * + * @return possible object is {@link GradingSchemeAndGradeDistributionGuidanceType } + * + */ + public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() { + return gradingSchemeAndGradeDistributionGuidance; + } + + /** + * Sets the value of the gradingSchemeAndGradeDistributionGuidance property. + * + * @param value + * allowed object is {@link GradingSchemeAndGradeDistributionGuidanceType } + * + */ + public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) { + this.gradingSchemeAndGradeDistributionGuidance = value; + } + + /** + * Gets the value of the overallClassificationOfTheQualification property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getOverallClassificationOfTheQualification() { + return overallClassificationOfTheQualification; + } + + /** + * Sets the value of the overallClassificationOfTheQualification property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setOverallClassificationOfTheQualification(RichTextTagType value) { + this.overallClassificationOfTheQualification = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    +	 *       <attribute name="modeOfStudy" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfStudyType" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class ModeOfStudy extends RichTextTagType { + + @XmlAttribute(name = "modeOfStudy") + protected ModeOfStudyType modeOfStudy; + + /** + * Gets the value of the modeOfStudy property. + * + * @return possible object is {@link ModeOfStudyType } + * + */ + public ModeOfStudyType getModeOfStudy() { + return modeOfStudy; + } + + /** + * Sets the value of the modeOfStudy property. + * + * @param value + * allowed object is {@link ModeOfStudyType } + * + */ + public void setModeOfStudy(ModeOfStudyType value) { + this.modeOfStudy = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java index 903eb2a35..87bb10c71 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for InformationOnTheFunctionOfTheQualificationType complex type. + *

    + * Java class for InformationOnTheFunctionOfTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationOnTheFunctionOfTheQualificationType">
    @@ -44,116 +44,103 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = {
    -    "accessToFurtherStudy",
    -    "professionalStatus"
    -})
    +@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = { "accessToFurtherStudy", "professionalStatus" })
     public class InformationOnTheFunctionOfTheQualificationType {
     
    -    @XmlElement(name = "AccessToFurtherStudy")
    -    protected RichTextTagType accessToFurtherStudy;
    -    @XmlElement(name = "ProfessionalStatus")
    -    protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus;
    -
    -    /**
    -     * Gets the value of the accessToFurtherStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAccessToFurtherStudy() {
    -        return accessToFurtherStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the accessToFurtherStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAccessToFurtherStudy(RichTextTagType value) {
    -        this.accessToFurtherStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the professionalStatus property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
    -     *     
    -     */
    -    public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() {
    -        return professionalStatus;
    -    }
    -
    -    /**
    -     * Sets the value of the professionalStatus property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
    -     *     
    -     */
    -    public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) {
    -        this.professionalStatus = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    -     *       <attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class ProfessionalStatus - extends RichTextTagType - { - - @XmlAttribute(name = "isRegulatedProfession") - protected Boolean isRegulatedProfession; - - /** - * Gets the value of the isRegulatedProfession property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsRegulatedProfession() { - return isRegulatedProfession; - } - - /** - * Sets the value of the isRegulatedProfession property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsRegulatedProfession(Boolean value) { - this.isRegulatedProfession = value; - } - - } + @XmlElement(name = "AccessToFurtherStudy") + protected RichTextTagType accessToFurtherStudy; + @XmlElement(name = "ProfessionalStatus") + protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus; + + /** + * Gets the value of the accessToFurtherStudy property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAccessToFurtherStudy() { + return accessToFurtherStudy; + } + + /** + * Sets the value of the accessToFurtherStudy property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAccessToFurtherStudy(RichTextTagType value) { + this.accessToFurtherStudy = value; + } + + /** + * Gets the value of the professionalStatus property. + * + * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } + * + */ + public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() { + return professionalStatus; + } + + /** + * Sets the value of the professionalStatus property. + * + * @param value + * allowed object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } + * + */ + public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) { + this.professionalStatus = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    +	 *       <attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class ProfessionalStatus extends RichTextTagType { + + @XmlAttribute(name = "isRegulatedProfession") + protected Boolean isRegulatedProfession; + + /** + * Gets the value of the isRegulatedProfession property. + * + * @return possible object is {@link Boolean } + * + */ + public Boolean isIsRegulatedProfession() { + return isRegulatedProfession; + } + + /** + * Sets the value of the isRegulatedProfession property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setIsRegulatedProfession(Boolean value) { + this.isRegulatedProfession = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java index 2119f23bb..c759fdf52 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.math.BigDecimal; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for InformationOnTheLevelOfTheQualificationType complex type. + *

    + * Java class for InformationOnTheLevelOfTheQualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InformationOnTheLevelOfTheQualificationType">
    @@ -59,331 +59,295 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = {
    -    "level",
    -    "officialLengthOfProgramme",
    -    "accessRequirements"
    -})
    +@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = { "level", "officialLengthOfProgramme", "accessRequirements" })
     public class InformationOnTheLevelOfTheQualificationType {
     
    -    @XmlElement(name = "Level", required = true)
    -    protected InformationOnTheLevelOfTheQualificationType.Level level;
    -    @XmlElement(name = "OfficialLengthOfProgramme", required = true)
    -    protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme;
    -    @XmlElement(name = "AccessRequirements")
    -    protected RichTextTagType accessRequirements;
    -
    -    /**
    -     * Gets the value of the level property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
    -     *     
    -     */
    -    public InformationOnTheLevelOfTheQualificationType.Level getLevel() {
    -        return level;
    -    }
    -
    -    /**
    -     * Sets the value of the level property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
    -     *     
    -     */
    -    public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) {
    -        this.level = value;
    -    }
    -
    -    /**
    -     * Gets the value of the officialLengthOfProgramme property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
    -     *     
    -     */
    -    public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() {
    -        return officialLengthOfProgramme;
    -    }
    -
    -    /**
    -     * Sets the value of the officialLengthOfProgramme property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
    -     *     
    -     */
    -    public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) {
    -        this.officialLengthOfProgramme = value;
    -    }
    -
    -    /**
    -     * Gets the value of the accessRequirements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAccessRequirements() {
    -        return accessRequirements;
    -    }
    -
    -    /**
    -     * Sets the value of the accessRequirements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAccessRequirements(RichTextTagType value) {
    -        this.accessRequirements = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    -     *       <attribute name="isced1997" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED1997Type" />
    -     *       <attribute name="isced2011" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED2011Type" />
    -     *       <attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
    -     *       <attribute name="nfq" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}NFQType" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Level - extends RichTextTagType - { - - @XmlAttribute(name = "isced1997") - protected String isced1997; - @XmlAttribute(name = "isced2011") - protected String isced2011; - @XmlAttribute(name = "eheaFramework") - protected EHEAFrameworkType eheaFramework; - @XmlAttribute(name = "nfq") - protected String nfq; - - /** - * Gets the value of the isced1997 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIsced1997() { - return isced1997; - } - - /** - * Sets the value of the isced1997 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIsced1997(String value) { - this.isced1997 = value; - } - - /** - * Gets the value of the isced2011 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getIsced2011() { - return isced2011; - } - - /** - * Sets the value of the isced2011 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setIsced2011(String value) { - this.isced2011 = value; - } - - /** - * Gets the value of the eheaFramework property. - * - * @return - * possible object is - * {@link EHEAFrameworkType } - * - */ - public EHEAFrameworkType getEheaFramework() { - return eheaFramework; - } - - /** - * Sets the value of the eheaFramework property. - * - * @param value - * allowed object is - * {@link EHEAFrameworkType } - * - */ - public void setEheaFramework(EHEAFrameworkType value) { - this.eheaFramework = value; - } - - /** - * Gets the value of the nfq property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getNfq() { - return nfq; - } - - /** - * Sets the value of the nfq property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setNfq(String value) { - this.nfq = value; - } - - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    -     *       <attribute name="ectsCredits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
    -     *       <attribute name="years" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
    -     *       <attribute name="semesters" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveIntegerType" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class OfficialLengthOfProgramme - extends RichTextTagType - { - - @XmlAttribute(name = "ectsCredits") - protected BigDecimal ectsCredits; - @XmlAttribute(name = "years") - protected BigDecimal years; - @XmlAttribute(name = "semesters") - protected Integer semesters; - - /** - * Gets the value of the ectsCredits property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getEctsCredits() { - return ectsCredits; - } - - /** - * Sets the value of the ectsCredits property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setEctsCredits(BigDecimal value) { - this.ectsCredits = value; - } - - /** - * Gets the value of the years property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getYears() { - return years; - } - - /** - * Sets the value of the years property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setYears(BigDecimal value) { - this.years = value; - } - - /** - * Gets the value of the semesters property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getSemesters() { - return semesters; - } - - /** - * Sets the value of the semesters property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setSemesters(Integer value) { - this.semesters = value; - } - - } + @XmlElement(name = "Level", required = true) + protected InformationOnTheLevelOfTheQualificationType.Level level; + @XmlElement(name = "OfficialLengthOfProgramme", required = true) + protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme; + @XmlElement(name = "AccessRequirements") + protected RichTextTagType accessRequirements; + + /** + * Gets the value of the level property. + * + * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.Level } + * + */ + public InformationOnTheLevelOfTheQualificationType.Level getLevel() { + return level; + } + + /** + * Sets the value of the level property. + * + * @param value + * allowed object is {@link InformationOnTheLevelOfTheQualificationType.Level } + * + */ + public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) { + this.level = value; + } + + /** + * Gets the value of the officialLengthOfProgramme property. + * + * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } + * + */ + public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() { + return officialLengthOfProgramme; + } + + /** + * Sets the value of the officialLengthOfProgramme property. + * + * @param value + * allowed object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } + * + */ + public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) { + this.officialLengthOfProgramme = value; + } + + /** + * Gets the value of the accessRequirements property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAccessRequirements() { + return accessRequirements; + } + + /** + * Sets the value of the accessRequirements property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAccessRequirements(RichTextTagType value) { + this.accessRequirements = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    +	 *       <attribute name="isced1997" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED1997Type" />
    +	 *       <attribute name="isced2011" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED2011Type" />
    +	 *       <attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
    +	 *       <attribute name="nfq" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}NFQType" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Level extends RichTextTagType { + + @XmlAttribute(name = "isced1997") + protected String isced1997; + @XmlAttribute(name = "isced2011") + protected String isced2011; + @XmlAttribute(name = "eheaFramework") + protected EHEAFrameworkType eheaFramework; + @XmlAttribute(name = "nfq") + protected String nfq; + + /** + * Gets the value of the isced1997 property. + * + * @return possible object is {@link String } + * + */ + public String getIsced1997() { + return isced1997; + } + + /** + * Sets the value of the isced1997 property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setIsced1997(String value) { + this.isced1997 = value; + } + + /** + * Gets the value of the isced2011 property. + * + * @return possible object is {@link String } + * + */ + public String getIsced2011() { + return isced2011; + } + + /** + * Sets the value of the isced2011 property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setIsced2011(String value) { + this.isced2011 = value; + } + + /** + * Gets the value of the eheaFramework property. + * + * @return possible object is {@link EHEAFrameworkType } + * + */ + public EHEAFrameworkType getEheaFramework() { + return eheaFramework; + } + + /** + * Sets the value of the eheaFramework property. + * + * @param value + * allowed object is {@link EHEAFrameworkType } + * + */ + public void setEheaFramework(EHEAFrameworkType value) { + this.eheaFramework = value; + } + + /** + * Gets the value of the nfq property. + * + * @return possible object is {@link String } + * + */ + public String getNfq() { + return nfq; + } + + /** + * Sets the value of the nfq property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setNfq(String value) { + this.nfq = value; + } + + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    +	 *       <attribute name="ectsCredits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
    +	 *       <attribute name="years" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
    +	 *       <attribute name="semesters" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveIntegerType" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class OfficialLengthOfProgramme extends RichTextTagType { + + @XmlAttribute(name = "ectsCredits") + protected BigDecimal ectsCredits; + @XmlAttribute(name = "years") + protected BigDecimal years; + @XmlAttribute(name = "semesters") + protected Integer semesters; + + /** + * Gets the value of the ectsCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getEctsCredits() { + return ectsCredits; + } + + /** + * Sets the value of the ectsCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setEctsCredits(BigDecimal value) { + this.ectsCredits = value; + } + + /** + * Gets the value of the years property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getYears() { + return years; + } + + /** + * Sets the value of the years property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setYears(BigDecimal value) { + this.years = value; + } + + /** + * Gets the value of the semesters property. + * + * @return possible object is {@link Integer } + * + */ + public Integer getSemesters() { + return semesters; + } + + /** + * Sets the value of the semesters property. + * + * @param value + * allowed object is {@link Integer } + * + */ + public void setSemesters(Integer value) { + this.semesters = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java index daab6ad3a..c6c27ca5f 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; - /** - *

    Java class for InstitutionType complex type. + *

    + * Java class for InstitutionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="InstitutionType">
    @@ -54,308 +54,268 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "InstitutionType", propOrder = {
    -    "name",
    -    "status",
    -    "country",
    -    "additionalInformation",
    -    "contactInformation",
    -    "attachedImageRef"
    -})
    -@XmlSeeAlso({
    -    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
    -    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class
    -})
    +@XmlType(name = "InstitutionType", propOrder = { "name", "status", "country", "additionalInformation", "contactInformation", "attachedImageRef" })
    +@XmlSeeAlso({ eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
    +		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class })
     public class InstitutionType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    -    @XmlElement(name = "Status")
    -    protected String status;
    -    @XmlElement(name = "Country")
    -    protected CountryTextCodeType country;
    -    @XmlElement(name = "AdditionalInformation")
    -    protected RichTextTagType additionalInformation;
    -    @XmlElement(name = "ContactInformation")
    -    protected ContactInformationType contactInformation;
    -    @XmlElement(name = "AttachedImageRef")
    -    protected InstitutionType.AttachedImageRef attachedImageRef;
    -    @XmlAttribute(name = "nationalID")
    -    protected String nationalID;
    -    @XmlAttribute(name = "erasmusID")
    -    protected String erasmusID;
    -
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    +	@XmlElement(name = "Name", required = true)
    +	protected String name;
    +	@XmlElement(name = "Status")
    +	protected String status;
    +	@XmlElement(name = "Country")
    +	protected CountryTextCodeType country;
    +	@XmlElement(name = "AdditionalInformation")
    +	protected RichTextTagType additionalInformation;
    +	@XmlElement(name = "ContactInformation")
    +	protected ContactInformationType contactInformation;
    +	@XmlElement(name = "AttachedImageRef")
    +	protected InstitutionType.AttachedImageRef attachedImageRef;
    +	@XmlAttribute(name = "nationalID")
    +	protected String nationalID;
    +	@XmlAttribute(name = "erasmusID")
    +	protected String erasmusID;
     
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    +	/**
    +	 * Gets the value of the name property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Gets the value of the status property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getStatus() {
    -        return status;
    -    }
    +	/**
    +	 * Sets the value of the name property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setName(String value) {
    +		this.name = value;
    +	}
     
    -    /**
    -     * Sets the value of the status property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setStatus(String value) {
    -        this.status = value;
    -    }
    +	/**
    +	 * Gets the value of the status property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getStatus() {
    +		return status;
    +	}
     
    -    /**
    -     * Gets the value of the country property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CountryTextCodeType }
    -     *     
    -     */
    -    public CountryTextCodeType getCountry() {
    -        return country;
    -    }
    +	/**
    +	 * Sets the value of the status property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setStatus(String value) {
    +		this.status = value;
    +	}
     
    -    /**
    -     * Sets the value of the country property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CountryTextCodeType }
    -     *     
    -     */
    -    public void setCountry(CountryTextCodeType value) {
    -        this.country = value;
    -    }
    +	/**
    +	 * Gets the value of the country property.
    +	 * 
    +	 * @return possible object is {@link CountryTextCodeType }
    +	 * 
    +	 */
    +	public CountryTextCodeType getCountry() {
    +		return country;
    +	}
     
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    +	/**
    +	 * Sets the value of the country property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CountryTextCodeType }
    +	 * 
    +	 */
    +	public void setCountry(CountryTextCodeType value) {
    +		this.country = value;
    +	}
     
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAdditionalInformation(RichTextTagType value) {
    -        this.additionalInformation = value;
    -    }
    +	/**
    +	 * Gets the value of the additionalInformation property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getAdditionalInformation() {
    +		return additionalInformation;
    +	}
     
    -    /**
    -     * Gets the value of the contactInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link ContactInformationType }
    -     *     
    -     */
    -    public ContactInformationType getContactInformation() {
    -        return contactInformation;
    -    }
    +	/**
    +	 * Sets the value of the additionalInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setAdditionalInformation(RichTextTagType value) {
    +		this.additionalInformation = value;
    +	}
     
    -    /**
    -     * Sets the value of the contactInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link ContactInformationType }
    -     *     
    -     */
    -    public void setContactInformation(ContactInformationType value) {
    -        this.contactInformation = value;
    -    }
    +	/**
    +	 * Gets the value of the contactInformation property.
    +	 * 
    +	 * @return possible object is {@link ContactInformationType }
    +	 * 
    +	 */
    +	public ContactInformationType getContactInformation() {
    +		return contactInformation;
    +	}
     
    -    /**
    -     * Gets the value of the attachedImageRef property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link InstitutionType.AttachedImageRef }
    -     *     
    -     */
    -    public InstitutionType.AttachedImageRef getAttachedImageRef() {
    -        return attachedImageRef;
    -    }
    +	/**
    +	 * Sets the value of the contactInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link ContactInformationType }
    +	 * 
    +	 */
    +	public void setContactInformation(ContactInformationType value) {
    +		this.contactInformation = value;
    +	}
     
    -    /**
    -     * Sets the value of the attachedImageRef property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link InstitutionType.AttachedImageRef }
    -     *     
    -     */
    -    public void setAttachedImageRef(InstitutionType.AttachedImageRef value) {
    -        this.attachedImageRef = value;
    -    }
    +	/**
    +	 * Gets the value of the attachedImageRef property.
    +	 * 
    +	 * @return possible object is {@link InstitutionType.AttachedImageRef }
    +	 * 
    +	 */
    +	public InstitutionType.AttachedImageRef getAttachedImageRef() {
    +		return attachedImageRef;
    +	}
     
    -    /**
    -     * Gets the value of the nationalID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNationalID() {
    -        return nationalID;
    -    }
    +	/**
    +	 * Sets the value of the attachedImageRef property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link InstitutionType.AttachedImageRef }
    +	 * 
    +	 */
    +	public void setAttachedImageRef(InstitutionType.AttachedImageRef value) {
    +		this.attachedImageRef = value;
    +	}
     
    -    /**
    -     * Sets the value of the nationalID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNationalID(String value) {
    -        this.nationalID = value;
    -    }
    +	/**
    +	 * Gets the value of the nationalID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNationalID() {
    +		return nationalID;
    +	}
     
    -    /**
    -     * Gets the value of the erasmusID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getErasmusID() {
    -        return erasmusID;
    -    }
    +	/**
    +	 * Sets the value of the nationalID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNationalID(String value) {
    +		this.nationalID = value;
    +	}
     
    -    /**
    -     * Sets the value of the erasmusID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setErasmusID(String value) {
    -        this.erasmusID = value;
    -    }
    +	/**
    +	 * Gets the value of the erasmusID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getErasmusID() {
    +		return erasmusID;
    +	}
     
    +	/**
    +	 * Sets the value of the erasmusID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setErasmusID(String value) {
    +		this.erasmusID = value;
    +	}
     
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class AttachedImageRef { + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class AttachedImageRef { - @XmlValue - protected String value; - @XmlAttribute(name = "attachedID", required = true) - @XmlIDREF - @XmlSchemaType(name = "IDREF") - protected Object attachedID; + @XmlValue + protected String value; + @XmlAttribute(name = "attachedID", required = true) + @XmlIDREF + @XmlSchemaType(name = "IDREF") + protected Object attachedID; - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } - /** - * Gets the value of the attachedID property. - * - * @return - * possible object is - * {@link Object } - * - */ - public Object getAttachedID() { - return attachedID; - } + /** + * Gets the value of the attachedID property. + * + * @return possible object is {@link Object } + * + */ + public Object getAttachedID() { + return attachedID; + } - /** - * Sets the value of the attachedID property. - * - * @param value - * allowed object is - * {@link Object } - * - */ - public void setAttachedID(Object value) { - this.attachedID = value; - } + /** + * Sets the value of the attachedID property. + * + * @param value + * allowed object is {@link Object } + * + */ + public void setAttachedID(Object value) { + this.attachedID = value; + } - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java index 2ddf61e53..8dcc5c546 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for LanguageType. + *

    + * Java class for LanguageType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="LanguageType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -128,219 +129,122 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum LanguageType {
     
    -    @XmlEnumValue("ab")
    -    AB("ab"),
    -    @XmlEnumValue("af")
    -    AF("af"),
    -    @XmlEnumValue("an")
    -    AN("an"),
    -    @XmlEnumValue("ar")
    -    AR("ar"),
    -    @XmlEnumValue("as")
    -    AS("as"),
    -    @XmlEnumValue("az")
    -    AZ("az"),
    -    @XmlEnumValue("be")
    -    BE("be"),
    -    @XmlEnumValue("bg")
    -    BG("bg"),
    -    @XmlEnumValue("bn")
    -    BN("bn"),
    -    @XmlEnumValue("bo")
    -    BO("bo"),
    -    @XmlEnumValue("br")
    -    BR("br"),
    -    @XmlEnumValue("bs")
    -    BS("bs"),
    -    @XmlEnumValue("ca")
    -    CA("ca"),
    -    @XmlEnumValue("ce")
    -    CE("ce"),
    -    @XmlEnumValue("co")
    -    CO("co"),
    -    @XmlEnumValue("cs")
    -    CS("cs"),
    -    @XmlEnumValue("cy")
    -    CY("cy"),
    -    @XmlEnumValue("da")
    -    DA("da"),
    -    @XmlEnumValue("de")
    -    DE("de"),
    -    @XmlEnumValue("el")
    -    EL("el"),
    -    @XmlEnumValue("en")
    -    EN("en"),
    -    @XmlEnumValue("es")
    -    ES("es"),
    -    @XmlEnumValue("et")
    -    ET("et"),
    -    @XmlEnumValue("eu")
    -    EU("eu"),
    -    @XmlEnumValue("fa")
    -    FA("fa"),
    -    @XmlEnumValue("fi")
    -    FI("fi"),
    -    @XmlEnumValue("fj")
    -    FJ("fj"),
    -    @XmlEnumValue("fo")
    -    FO("fo"),
    -    @XmlEnumValue("fr")
    -    FR("fr"),
    -    @XmlEnumValue("fy")
    -    FY("fy"),
    -    @XmlEnumValue("ga")
    -    GA("ga"),
    -    @XmlEnumValue("gd")
    -    GD("gd"),
    -    @XmlEnumValue("gl")
    -    GL("gl"),
    -    @XmlEnumValue("gv")
    -    GV("gv"),
    -    @XmlEnumValue("grc")
    -    GRC("grc"),
    -    @XmlEnumValue("gsw")
    -    GSW("gsw"),
    -    @XmlEnumValue("he")
    -    HE("he"),
    -    @XmlEnumValue("hi")
    -    HI("hi"),
    -    @XmlEnumValue("hr")
    -    HR("hr"),
    -    @XmlEnumValue("ht")
    -    HT("ht"),
    -    @XmlEnumValue("hu")
    -    HU("hu"),
    -    @XmlEnumValue("hy")
    -    HY("hy"),
    -    @XmlEnumValue("id")
    -    ID("id"),
    -    @XmlEnumValue("is")
    -    IS("is"),
    -    @XmlEnumValue("it")
    -    IT("it"),
    -    @XmlEnumValue("ja")
    -    JA("ja"),
    -    @XmlEnumValue("jv")
    -    JV("jv"),
    -    @XmlEnumValue("ka")
    -    KA("ka"),
    -    @XmlEnumValue("kg")
    -    KG("kg"),
    -    @XmlEnumValue("ko")
    -    KO("ko"),
    -    @XmlEnumValue("ku")
    -    KU("ku"),
    -    @XmlEnumValue("kw")
    -    KW("kw"),
    -    @XmlEnumValue("ky")
    -    KY("ky"),
    -    @XmlEnumValue("lb")
    -    LB("lb"),
    -    @XmlEnumValue("li")
    -    LI("li"),
    -    @XmlEnumValue("ln")
    -    LN("ln"),
    -    @XmlEnumValue("lt")
    -    LT("lt"),
    -    @XmlEnumValue("lv")
    -    LV("lv"),
    -    @XmlEnumValue("mg")
    -    MG("mg"),
    -    @XmlEnumValue("mk")
    -    MK("mk"),
    -    @XmlEnumValue("mn")
    -    MN("mn"),
    -    @XmlEnumValue("mo")
    -    MO("mo"),
    -    @XmlEnumValue("ms")
    -    MS("ms"),
    -    @XmlEnumValue("mt")
    -    MT("mt"),
    -    @XmlEnumValue("my")
    -    MY("my"),
    -    @XmlEnumValue("nb")
    -    NB("nb"),
    -    @XmlEnumValue("ne")
    -    NE("ne"),
    -    @XmlEnumValue("nl")
    -    NL("nl"),
    -    @XmlEnumValue("nn")
    -    NN("nn"),
    -    @XmlEnumValue("no")
    -    NO("no"),
    -    @XmlEnumValue("pl")
    -    PL("pl"),
    -    @XmlEnumValue("pt")
    -    PT("pt"),
    -    @XmlEnumValue("rm")
    -    RM("rm"),
    -    @XmlEnumValue("ro")
    -    RO("ro"),
    -    @XmlEnumValue("ru")
    -    RU("ru"),
    -    @XmlEnumValue("sc")
    -    SC("sc"),
    -    @XmlEnumValue("se")
    -    SE("se"),
    -    @XmlEnumValue("sk")
    -    SK("sk"),
    -    @XmlEnumValue("sl")
    -    SL("sl"),
    -    @XmlEnumValue("so")
    -    SO("so"),
    -    @XmlEnumValue("sq")
    -    SQ("sq"),
    -    @XmlEnumValue("sr")
    -    SR("sr"),
    -    @XmlEnumValue("sv")
    -    SV("sv"),
    -    @XmlEnumValue("sw")
    -    SW("sw"),
    -    @XmlEnumValue("tk")
    -    TK("tk"),
    -    @XmlEnumValue("tr")
    -    TR("tr"),
    -    @XmlEnumValue("ty")
    -    TY("ty"),
    -    @XmlEnumValue("uk")
    -    UK("uk"),
    -    @XmlEnumValue("ur")
    -    UR("ur"),
    -    @XmlEnumValue("uz")
    -    UZ("uz"),
    -    @XmlEnumValue("vi")
    -    VI("vi"),
    -    @XmlEnumValue("yi")
    -    YI("yi"),
    -    @XmlEnumValue("zh")
    -    ZH("zh"),
    -    @XmlEnumValue("cu")
    -    CU("cu"),
    -    @XmlEnumValue("eo")
    -    EO("eo"),
    -    @XmlEnumValue("la")
    -    LA("la"),
    -    @XmlEnumValue("oc")
    -    OC("oc"),
    -    @XmlEnumValue("vo")
    -    VO("vo");
    -    private final String value;
    +	@XmlEnumValue("ab")
    +	AB("ab"), @XmlEnumValue("af")
    +	AF("af"), @XmlEnumValue("an")
    +	AN("an"), @XmlEnumValue("ar")
    +	AR("ar"), @XmlEnumValue("as")
    +	AS("as"), @XmlEnumValue("az")
    +	AZ("az"), @XmlEnumValue("be")
    +	BE("be"), @XmlEnumValue("bg")
    +	BG("bg"), @XmlEnumValue("bn")
    +	BN("bn"), @XmlEnumValue("bo")
    +	BO("bo"), @XmlEnumValue("br")
    +	BR("br"), @XmlEnumValue("bs")
    +	BS("bs"), @XmlEnumValue("ca")
    +	CA("ca"), @XmlEnumValue("ce")
    +	CE("ce"), @XmlEnumValue("co")
    +	CO("co"), @XmlEnumValue("cs")
    +	CS("cs"), @XmlEnumValue("cy")
    +	CY("cy"), @XmlEnumValue("da")
    +	DA("da"), @XmlEnumValue("de")
    +	DE("de"), @XmlEnumValue("el")
    +	EL("el"), @XmlEnumValue("en")
    +	EN("en"), @XmlEnumValue("es")
    +	ES("es"), @XmlEnumValue("et")
    +	ET("et"), @XmlEnumValue("eu")
    +	EU("eu"), @XmlEnumValue("fa")
    +	FA("fa"), @XmlEnumValue("fi")
    +	FI("fi"), @XmlEnumValue("fj")
    +	FJ("fj"), @XmlEnumValue("fo")
    +	FO("fo"), @XmlEnumValue("fr")
    +	FR("fr"), @XmlEnumValue("fy")
    +	FY("fy"), @XmlEnumValue("ga")
    +	GA("ga"), @XmlEnumValue("gd")
    +	GD("gd"), @XmlEnumValue("gl")
    +	GL("gl"), @XmlEnumValue("gv")
    +	GV("gv"), @XmlEnumValue("grc")
    +	GRC("grc"), @XmlEnumValue("gsw")
    +	GSW("gsw"), @XmlEnumValue("he")
    +	HE("he"), @XmlEnumValue("hi")
    +	HI("hi"), @XmlEnumValue("hr")
    +	HR("hr"), @XmlEnumValue("ht")
    +	HT("ht"), @XmlEnumValue("hu")
    +	HU("hu"), @XmlEnumValue("hy")
    +	HY("hy"), @XmlEnumValue("id")
    +	ID("id"), @XmlEnumValue("is")
    +	IS("is"), @XmlEnumValue("it")
    +	IT("it"), @XmlEnumValue("ja")
    +	JA("ja"), @XmlEnumValue("jv")
    +	JV("jv"), @XmlEnumValue("ka")
    +	KA("ka"), @XmlEnumValue("kg")
    +	KG("kg"), @XmlEnumValue("ko")
    +	KO("ko"), @XmlEnumValue("ku")
    +	KU("ku"), @XmlEnumValue("kw")
    +	KW("kw"), @XmlEnumValue("ky")
    +	KY("ky"), @XmlEnumValue("lb")
    +	LB("lb"), @XmlEnumValue("li")
    +	LI("li"), @XmlEnumValue("ln")
    +	LN("ln"), @XmlEnumValue("lt")
    +	LT("lt"), @XmlEnumValue("lv")
    +	LV("lv"), @XmlEnumValue("mg")
    +	MG("mg"), @XmlEnumValue("mk")
    +	MK("mk"), @XmlEnumValue("mn")
    +	MN("mn"), @XmlEnumValue("mo")
    +	MO("mo"), @XmlEnumValue("ms")
    +	MS("ms"), @XmlEnumValue("mt")
    +	MT("mt"), @XmlEnumValue("my")
    +	MY("my"), @XmlEnumValue("nb")
    +	NB("nb"), @XmlEnumValue("ne")
    +	NE("ne"), @XmlEnumValue("nl")
    +	NL("nl"), @XmlEnumValue("nn")
    +	NN("nn"), @XmlEnumValue("no")
    +	NO("no"), @XmlEnumValue("pl")
    +	PL("pl"), @XmlEnumValue("pt")
    +	PT("pt"), @XmlEnumValue("rm")
    +	RM("rm"), @XmlEnumValue("ro")
    +	RO("ro"), @XmlEnumValue("ru")
    +	RU("ru"), @XmlEnumValue("sc")
    +	SC("sc"), @XmlEnumValue("se")
    +	SE("se"), @XmlEnumValue("sk")
    +	SK("sk"), @XmlEnumValue("sl")
    +	SL("sl"), @XmlEnumValue("so")
    +	SO("so"), @XmlEnumValue("sq")
    +	SQ("sq"), @XmlEnumValue("sr")
    +	SR("sr"), @XmlEnumValue("sv")
    +	SV("sv"), @XmlEnumValue("sw")
    +	SW("sw"), @XmlEnumValue("tk")
    +	TK("tk"), @XmlEnumValue("tr")
    +	TR("tr"), @XmlEnumValue("ty")
    +	TY("ty"), @XmlEnumValue("uk")
    +	UK("uk"), @XmlEnumValue("ur")
    +	UR("ur"), @XmlEnumValue("uz")
    +	UZ("uz"), @XmlEnumValue("vi")
    +	VI("vi"), @XmlEnumValue("yi")
    +	YI("yi"), @XmlEnumValue("zh")
    +	ZH("zh"), @XmlEnumValue("cu")
    +	CU("cu"), @XmlEnumValue("eo")
    +	EO("eo"), @XmlEnumValue("la")
    +	LA("la"), @XmlEnumValue("oc")
    +	OC("oc"), @XmlEnumValue("vo")
    +	VO("vo");
    +	private final String value;
     
    -    LanguageType(String v) {
    -        value = v;
    -    }
    +	LanguageType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static LanguageType fromValue(String v) {
    -        for (LanguageType c: LanguageType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static LanguageType fromValue(String v) {
    +		for (LanguageType c : LanguageType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java
    index 575d3b867..1bf2acba6 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.math.BigDecimal;
    @@ -17,11 +16,12 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for LanguagesOfInstructionAndExaminationType complex type. + *

    + * Java class for LanguagesOfInstructionAndExaminationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="LanguagesOfInstructionAndExaminationType">
    @@ -49,179 +49,162 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = {
    -    "language"
    -})
    +@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = { "language" })
     public class LanguagesOfInstructionAndExaminationType {
     
    -    @XmlElement(name = "Language", required = true)
    -    protected List language;
    -
    -    /**
    -     * Gets the value of the language property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the language property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getLanguage().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link LanguagesOfInstructionAndExaminationType.Language } - * - * - */ - public List getLanguage() { - if (language == null) { - language = new ArrayList(); - } - return this.language; - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    -     *       <attribute name="language" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
    -     *       <attribute name="percent" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PercentType" />
    -     *       <attribute name="instruction" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
    -     *       <attribute name="examination" type="{http://www.w3.org/2001/XMLSchema}boolean" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Language - extends RichTextTagType - { - - @XmlAttribute(name = "language", required = true) - protected LanguageType language; - @XmlAttribute(name = "percent") - protected BigDecimal percent; - @XmlAttribute(name = "instruction") - protected Boolean instruction; - @XmlAttribute(name = "examination") - protected Boolean examination; - - /** - * Gets the value of the language property. - * - * @return - * possible object is - * {@link LanguageType } - * - */ - public LanguageType getLanguage() { - return language; - } - - /** - * Sets the value of the language property. - * - * @param value - * allowed object is - * {@link LanguageType } - * - */ - public void setLanguage(LanguageType value) { - this.language = value; - } - - /** - * Gets the value of the percent property. - * - * @return - * possible object is - * {@link BigDecimal } - * - */ - public BigDecimal getPercent() { - return percent; - } - - /** - * Sets the value of the percent property. - * - * @param value - * allowed object is - * {@link BigDecimal } - * - */ - public void setPercent(BigDecimal value) { - this.percent = value; - } - - /** - * Gets the value of the instruction property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isInstruction() { - if (instruction == null) { - return true; - } else { - return instruction; - } - } - - /** - * Sets the value of the instruction property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setInstruction(Boolean value) { - this.instruction = value; - } - - /** - * Gets the value of the examination property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isExamination() { - return examination; - } - - /** - * Sets the value of the examination property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setExamination(Boolean value) { - this.examination = value; - } - - } + @XmlElement(name = "Language", required = true) + protected List language; + + /** + * Gets the value of the language property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the language property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getLanguage().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link LanguagesOfInstructionAndExaminationType.Language } + * + * + */ + public List getLanguage() { + if (language == null) { + language = new ArrayList(); + } + return this.language; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
    +	 *       <attribute name="language" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
    +	 *       <attribute name="percent" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PercentType" />
    +	 *       <attribute name="instruction" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
    +	 *       <attribute name="examination" type="{http://www.w3.org/2001/XMLSchema}boolean" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class Language extends RichTextTagType { + + @XmlAttribute(name = "language", required = true) + protected LanguageType language; + @XmlAttribute(name = "percent") + protected BigDecimal percent; + @XmlAttribute(name = "instruction") + protected Boolean instruction; + @XmlAttribute(name = "examination") + protected Boolean examination; + + /** + * Gets the value of the language property. + * + * @return possible object is {@link LanguageType } + * + */ + public LanguageType getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is {@link LanguageType } + * + */ + public void setLanguage(LanguageType value) { + this.language = value; + } + + /** + * Gets the value of the percent property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getPercent() { + return percent; + } + + /** + * Sets the value of the percent property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setPercent(BigDecimal value) { + this.percent = value; + } + + /** + * Gets the value of the instruction property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isInstruction() { + if (instruction == null) { + return true; + } else { + return instruction; + } + } + + /** + * Sets the value of the instruction property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setInstruction(Boolean value) { + this.instruction = value; + } + + /** + * Gets the value of the examination property. + * + * @return possible object is {@link Boolean } + * + */ + public Boolean isExamination() { + return examination; + } + + /** + * Sets the value of the examination property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setExamination(Boolean value) { + this.examination = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java index de3b86c98..24582dc94 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.datatype.XMLGregorianCalendar; - /** - *

    Java class for LocalGradeType complex type. + *

    + * Java class for LocalGradeType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="LocalGradeType">
    @@ -48,196 +48,172 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "LocalGradeType", propOrder = {
    -    "academicYear",
    -    "dateIssued",
    -    "grade",
    -    "source"
    -})
    +@XmlType(name = "LocalGradeType", propOrder = { "academicYear", "dateIssued", "grade", "source" })
     public class LocalGradeType {
     
    -    @XmlElement(name = "AcademicYear")
    -    protected String academicYear;
    -    @XmlElement(name = "DateIssued")
    -    protected XMLGregorianCalendar dateIssued;
    -    @XmlElement(name = "Grade", required = true)
    -    protected String grade;
    -    @XmlElement(name = "Source")
    -    protected LocalGradeType.Source source;
    -
    -    /**
    -     * Gets the value of the academicYear property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAcademicYear() {
    -        return academicYear;
    -    }
    -
    -    /**
    -     * Sets the value of the academicYear property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAcademicYear(String value) {
    -        this.academicYear = value;
    -    }
    -
    -    /**
    -     * Gets the value of the dateIssued property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateIssued() {
    -        return dateIssued;
    -    }
    -
    -    /**
    -     * Sets the value of the dateIssued property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateIssued(XMLGregorianCalendar value) {
    -        this.dateIssued = value;
    -    }
    -
    -    /**
    -     * Gets the value of the grade property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getGrade() {
    -        return grade;
    -    }
    -
    -    /**
    -     * Sets the value of the grade property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setGrade(String value) {
    -        this.grade = value;
    -    }
    -
    -    /**
    -     * Gets the value of the source property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link LocalGradeType.Source }
    -     *     
    -     */
    -    public LocalGradeType.Source getSource() {
    -        return source;
    -    }
    -
    -    /**
    -     * Sets the value of the source property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link LocalGradeType.Source }
    -     *     
    -     */
    -    public void setSource(LocalGradeType.Source value) {
    -        this.source = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="source" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}SourceGradeType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Source { - - @XmlValue - protected String value; - @XmlAttribute(name = "source") - protected SourceGradeType source; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the source property. - * - * @return - * possible object is - * {@link SourceGradeType } - * - */ - public SourceGradeType getSource() { - return source; - } - - /** - * Sets the value of the source property. - * - * @param value - * allowed object is - * {@link SourceGradeType } - * - */ - public void setSource(SourceGradeType value) { - this.source = value; - } - - } + @XmlElement(name = "AcademicYear") + protected String academicYear; + @XmlElement(name = "DateIssued") + protected XMLGregorianCalendar dateIssued; + @XmlElement(name = "Grade", required = true) + protected String grade; + @XmlElement(name = "Source") + protected LocalGradeType.Source source; + + /** + * Gets the value of the academicYear property. + * + * @return possible object is {@link String } + * + */ + public String getAcademicYear() { + return academicYear; + } + + /** + * Sets the value of the academicYear property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAcademicYear(String value) { + this.academicYear = value; + } + + /** + * Gets the value of the dateIssued property. + * + * @return possible object is {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getDateIssued() { + return dateIssued; + } + + /** + * Sets the value of the dateIssued property. + * + * @param value + * allowed object is {@link XMLGregorianCalendar } + * + */ + public void setDateIssued(XMLGregorianCalendar value) { + this.dateIssued = value; + } + + /** + * Gets the value of the grade property. + * + * @return possible object is {@link String } + * + */ + public String getGrade() { + return grade; + } + + /** + * Sets the value of the grade property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setGrade(String value) { + this.grade = value; + } + + /** + * Gets the value of the source property. + * + * @return possible object is {@link LocalGradeType.Source } + * + */ + public LocalGradeType.Source getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is {@link LocalGradeType.Source } + * + */ + public void setSource(LocalGradeType.Source value) { + this.source = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="source" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}SourceGradeType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Source { + + @XmlValue + protected String value; + @XmlAttribute(name = "source") + protected SourceGradeType source; + + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the source property. + * + * @return possible object is {@link SourceGradeType } + * + */ + public SourceGradeType getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is {@link SourceGradeType } + * + */ + public void setSource(SourceGradeType value) { + this.source = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java index 45a3bc403..c051cb2b4 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for MimeType. + *

    + * Java class for MimeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="MimeType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -37,37 +38,31 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum MimeType {
     
    -    @XmlEnumValue("image/gif")
    -    IMAGE_GIF("image/gif"),
    -    @XmlEnumValue("image/jpeg")
    -    IMAGE_JPEG("image/jpeg"),
    -    @XmlEnumValue("image/pjpeg")
    -    IMAGE_PJPEG("image/pjpeg"),
    -    @XmlEnumValue("image/png")
    -    IMAGE_PNG("image/png"),
    -    @XmlEnumValue("image/tiff")
    -    IMAGE_TIFF("image/tiff"),
    -    @XmlEnumValue("text/html")
    -    TEXT_HTML("text/html"),
    -    @XmlEnumValue("application/pdf")
    -    APPLICATION_PDF("application/pdf");
    -    private final String value;
    +	@XmlEnumValue("image/gif")
    +	IMAGE_GIF("image/gif"), @XmlEnumValue("image/jpeg")
    +	IMAGE_JPEG("image/jpeg"), @XmlEnumValue("image/pjpeg")
    +	IMAGE_PJPEG("image/pjpeg"), @XmlEnumValue("image/png")
    +	IMAGE_PNG("image/png"), @XmlEnumValue("image/tiff")
    +	IMAGE_TIFF("image/tiff"), @XmlEnumValue("text/html")
    +	TEXT_HTML("text/html"), @XmlEnumValue("application/pdf")
    +	APPLICATION_PDF("application/pdf");
    +	private final String value;
     
    -    MimeType(String v) {
    -        value = v;
    -    }
    +	MimeType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static MimeType fromValue(String v) {
    -        for (MimeType c: MimeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static MimeType fromValue(String v) {
    +		for (MimeType c : MimeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java
    index d254e5f4d..557473a0c 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.math.BigDecimal;
    @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
    - * 

    Java class for MobilityProgrammeCourseUnitType complex type. + *

    + * Java class for MobilityProgrammeCourseUnitType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MobilityProgrammeCourseUnitType">
    @@ -49,226 +49,199 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = {
    -    "code",
    -    "title",
    -    "ectsCredits",
    -    "additionalInformation"
    -})
    +@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = { "code", "title", "ectsCredits", "additionalInformation" })
     public class MobilityProgrammeCourseUnitType {
     
    -    @XmlElement(name = "Code")
    -    protected String code;
    -    @XmlElement(name = "Title", required = true)
    -    protected MobilityProgrammeCourseUnitType.Title title;
    -    @XmlElement(name = "ECTSCredits")
    -    protected BigDecimal ectsCredits;
    -    @XmlElement(name = "AdditionalInformation")
    -    protected RichTextTagType additionalInformation;
    -    @XmlAttribute(name = "isInTheLearningAgreement")
    -    protected Boolean isInTheLearningAgreement;
    -
    -    /**
    -     * Gets the value of the code property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCode() {
    -        return code;
    -    }
    -
    -    /**
    -     * Sets the value of the code property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCode(String value) {
    -        this.code = value;
    -    }
    -
    -    /**
    -     * Gets the value of the title property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MobilityProgrammeCourseUnitType.Title }
    -     *     
    -     */
    -    public MobilityProgrammeCourseUnitType.Title getTitle() {
    -        return title;
    -    }
    -
    -    /**
    -     * Sets the value of the title property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MobilityProgrammeCourseUnitType.Title }
    -     *     
    -     */
    -    public void setTitle(MobilityProgrammeCourseUnitType.Title value) {
    -        this.title = value;
    -    }
    -
    -    /**
    -     * Gets the value of the ectsCredits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public BigDecimal getECTSCredits() {
    -        return ectsCredits;
    -    }
    -
    -    /**
    -     * Sets the value of the ectsCredits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigDecimal }
    -     *     
    -     */
    -    public void setECTSCredits(BigDecimal value) {
    -        this.ectsCredits = value;
    -    }
    -
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    -
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAdditionalInformation(RichTextTagType value) {
    -        this.additionalInformation = value;
    -    }
    -
    -    /**
    -     * Gets the value of the isInTheLearningAgreement property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public boolean isIsInTheLearningAgreement() {
    -        if (isInTheLearningAgreement == null) {
    -            return true;
    -        } else {
    -            return isInTheLearningAgreement;
    -        }
    -    }
    -
    -    /**
    -     * Sets the value of the isInTheLearningAgreement property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link Boolean }
    -     *     
    -     */
    -    public void setIsInTheLearningAgreement(Boolean value) {
    -        this.isInTheLearningAgreement = value;
    -    }
    -
    -
    -    /**
    -     * 

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="language" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Title { - - @XmlValue - protected String value; - @XmlAttribute(name = "language") - protected LanguageType language; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the language property. - * - * @return - * possible object is - * {@link LanguageType } - * - */ - public LanguageType getLanguage() { - return language; - } - - /** - * Sets the value of the language property. - * - * @param value - * allowed object is - * {@link LanguageType } - * - */ - public void setLanguage(LanguageType value) { - this.language = value; - } - - } + @XmlElement(name = "Code") + protected String code; + @XmlElement(name = "Title", required = true) + protected MobilityProgrammeCourseUnitType.Title title; + @XmlElement(name = "ECTSCredits") + protected BigDecimal ectsCredits; + @XmlElement(name = "AdditionalInformation") + protected RichTextTagType additionalInformation; + @XmlAttribute(name = "isInTheLearningAgreement") + protected Boolean isInTheLearningAgreement; + + /** + * Gets the value of the code property. + * + * @return possible object is {@link String } + * + */ + public String getCode() { + return code; + } + + /** + * Sets the value of the code property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setCode(String value) { + this.code = value; + } + + /** + * Gets the value of the title property. + * + * @return possible object is {@link MobilityProgrammeCourseUnitType.Title } + * + */ + public MobilityProgrammeCourseUnitType.Title getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is {@link MobilityProgrammeCourseUnitType.Title } + * + */ + public void setTitle(MobilityProgrammeCourseUnitType.Title value) { + this.title = value; + } + + /** + * Gets the value of the ectsCredits property. + * + * @return possible object is {@link BigDecimal } + * + */ + public BigDecimal getECTSCredits() { + return ectsCredits; + } + + /** + * Sets the value of the ectsCredits property. + * + * @param value + * allowed object is {@link BigDecimal } + * + */ + public void setECTSCredits(BigDecimal value) { + this.ectsCredits = value; + } + + /** + * Gets the value of the additionalInformation property. + * + * @return possible object is {@link RichTextTagType } + * + */ + public RichTextTagType getAdditionalInformation() { + return additionalInformation; + } + + /** + * Sets the value of the additionalInformation property. + * + * @param value + * allowed object is {@link RichTextTagType } + * + */ + public void setAdditionalInformation(RichTextTagType value) { + this.additionalInformation = value; + } + + /** + * Gets the value of the isInTheLearningAgreement property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isIsInTheLearningAgreement() { + if (isInTheLearningAgreement == null) { + return true; + } else { + return isInTheLearningAgreement; + } + } + + /** + * Sets the value of the isInTheLearningAgreement property. + * + * @param value + * allowed object is {@link Boolean } + * + */ + public void setIsInTheLearningAgreement(Boolean value) { + this.isInTheLearningAgreement = value; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="language" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class Title { + + @XmlValue + protected String value; + @XmlAttribute(name = "language") + protected LanguageType language; + + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the language property. + * + * @return possible object is {@link LanguageType } + * + */ + public LanguageType getLanguage() { + return language; + } + + /** + * Sets the value of the language property. + * + * @param value + * allowed object is {@link LanguageType } + * + */ + public void setLanguage(LanguageType value) { + this.language = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java index 1cc243487..63a4d0ecf 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for MobilityProgrammeCoursesUnitsType complex type. + *

    + * Java class for MobilityProgrammeCoursesUnitsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MobilityProgrammeCoursesUnitsType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = {
    -    "courseUnit"
    -})
    +@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = { "courseUnit" })
     public class MobilityProgrammeCoursesUnitsType {
     
    -    @XmlElement(name = "CourseUnit", required = true)
    -    protected List courseUnit;
    +	@XmlElement(name = "CourseUnit", required = true)
    +	protected List courseUnit;
     
    -    /**
    -     * Gets the value of the courseUnit property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the courseUnit property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getCourseUnit().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link MobilityProgrammeCourseUnitType } - * - * - */ - public List getCourseUnit() { - if (courseUnit == null) { - courseUnit = new ArrayList(); - } - return this.courseUnit; - } + /** + * Gets the value of the courseUnit property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the courseUnit property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getCourseUnit().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeCourseUnitType } + * + * + */ + public List getCourseUnit() { + if (courseUnit == null) { + courseUnit = new ArrayList(); + } + return this.courseUnit; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java index 5ef23530a..dbb8bc284 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; - /** - *

    Java class for MobilityProgrammeType complex type. + *

    + * Java class for MobilityProgrammeType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MobilityProgrammeType">
    @@ -42,225 +42,192 @@ import javax.xml.datatype.XMLGregorianCalendar;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MobilityProgrammeType", propOrder = {
    -    "type",
    -    "fieldOfStudy",
    -    "country",
    -    "receivingInstitutionName",
    -    "academicYear",
    -    "dateFrom",
    -    "dateTo",
    -    "coursesUnits"
    -})
    +@XmlType(name = "MobilityProgrammeType", propOrder = { "type", "fieldOfStudy", "country", "receivingInstitutionName", "academicYear", "dateFrom", "dateTo", "coursesUnits" })
     public class MobilityProgrammeType {
     
    -    @XmlElement(name = "Type")
    -    protected String type;
    -    @XmlElement(name = "FieldOfStudy")
    -    protected String fieldOfStudy;
    -    @XmlElement(name = "Country", required = true)
    -    protected CountryTextCodeType country;
    -    @XmlElement(name = "ReceivingInstitutionName", required = true)
    -    protected String receivingInstitutionName;
    -    @XmlElement(name = "AcademicYear")
    -    protected String academicYear;
    -    @XmlElement(name = "DateFrom")
    -    protected XMLGregorianCalendar dateFrom;
    -    @XmlElement(name = "DateTo")
    -    protected XMLGregorianCalendar dateTo;
    -    @XmlElement(name = "CoursesUnits", required = true)
    -    protected MobilityProgrammeCoursesUnitsType coursesUnits;
    -
    -    /**
    -     * Gets the value of the type property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getType() {
    -        return type;
    -    }
    -
    -    /**
    -     * Sets the value of the type property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setType(String value) {
    -        this.type = value;
    -    }
    -
    -    /**
    -     * Gets the value of the fieldOfStudy property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getFieldOfStudy() {
    -        return fieldOfStudy;
    -    }
    -
    -    /**
    -     * Sets the value of the fieldOfStudy property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setFieldOfStudy(String value) {
    -        this.fieldOfStudy = value;
    -    }
    -
    -    /**
    -     * Gets the value of the country property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CountryTextCodeType }
    -     *     
    -     */
    -    public CountryTextCodeType getCountry() {
    -        return country;
    -    }
    -
    -    /**
    -     * Sets the value of the country property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CountryTextCodeType }
    -     *     
    -     */
    -    public void setCountry(CountryTextCodeType value) {
    -        this.country = value;
    -    }
    -
    -    /**
    -     * Gets the value of the receivingInstitutionName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getReceivingInstitutionName() {
    -        return receivingInstitutionName;
    -    }
    -
    -    /**
    -     * Sets the value of the receivingInstitutionName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setReceivingInstitutionName(String value) {
    -        this.receivingInstitutionName = value;
    -    }
    -
    -    /**
    -     * Gets the value of the academicYear property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAcademicYear() {
    -        return academicYear;
    -    }
    -
    -    /**
    -     * Sets the value of the academicYear property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAcademicYear(String value) {
    -        this.academicYear = value;
    -    }
    -
    -    /**
    -     * Gets the value of the dateFrom property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateFrom() {
    -        return dateFrom;
    -    }
    -
    -    /**
    -     * Sets the value of the dateFrom property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateFrom(XMLGregorianCalendar value) {
    -        this.dateFrom = value;
    -    }
    -
    -    /**
    -     * Gets the value of the dateTo property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public XMLGregorianCalendar getDateTo() {
    -        return dateTo;
    -    }
    -
    -    /**
    -     * Sets the value of the dateTo property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link XMLGregorianCalendar }
    -     *     
    -     */
    -    public void setDateTo(XMLGregorianCalendar value) {
    -        this.dateTo = value;
    -    }
    -
    -    /**
    -     * Gets the value of the coursesUnits property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link MobilityProgrammeCoursesUnitsType }
    -     *     
    -     */
    -    public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
    -        return coursesUnits;
    -    }
    -
    -    /**
    -     * Sets the value of the coursesUnits property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link MobilityProgrammeCoursesUnitsType }
    -     *     
    -     */
    -    public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
    -        this.coursesUnits = value;
    -    }
    +	@XmlElement(name = "Type")
    +	protected String type;
    +	@XmlElement(name = "FieldOfStudy")
    +	protected String fieldOfStudy;
    +	@XmlElement(name = "Country", required = true)
    +	protected CountryTextCodeType country;
    +	@XmlElement(name = "ReceivingInstitutionName", required = true)
    +	protected String receivingInstitutionName;
    +	@XmlElement(name = "AcademicYear")
    +	protected String academicYear;
    +	@XmlElement(name = "DateFrom")
    +	protected XMLGregorianCalendar dateFrom;
    +	@XmlElement(name = "DateTo")
    +	protected XMLGregorianCalendar dateTo;
    +	@XmlElement(name = "CoursesUnits", required = true)
    +	protected MobilityProgrammeCoursesUnitsType coursesUnits;
    +
    +	/**
    +	 * Gets the value of the type property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getType() {
    +		return type;
    +	}
    +
    +	/**
    +	 * Sets the value of the type property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setType(String value) {
    +		this.type = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the fieldOfStudy property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getFieldOfStudy() {
    +		return fieldOfStudy;
    +	}
    +
    +	/**
    +	 * Sets the value of the fieldOfStudy property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setFieldOfStudy(String value) {
    +		this.fieldOfStudy = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the country property.
    +	 * 
    +	 * @return possible object is {@link CountryTextCodeType }
    +	 * 
    +	 */
    +	public CountryTextCodeType getCountry() {
    +		return country;
    +	}
    +
    +	/**
    +	 * Sets the value of the country property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CountryTextCodeType }
    +	 * 
    +	 */
    +	public void setCountry(CountryTextCodeType value) {
    +		this.country = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the receivingInstitutionName property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getReceivingInstitutionName() {
    +		return receivingInstitutionName;
    +	}
    +
    +	/**
    +	 * Sets the value of the receivingInstitutionName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setReceivingInstitutionName(String value) {
    +		this.receivingInstitutionName = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the academicYear property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAcademicYear() {
    +		return academicYear;
    +	}
    +
    +	/**
    +	 * Sets the value of the academicYear property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAcademicYear(String value) {
    +		this.academicYear = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the dateFrom property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateFrom() {
    +		return dateFrom;
    +	}
    +
    +	/**
    +	 * Sets the value of the dateFrom property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateFrom(XMLGregorianCalendar value) {
    +		this.dateFrom = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the dateTo property.
    +	 * 
    +	 * @return possible object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public XMLGregorianCalendar getDateTo() {
    +		return dateTo;
    +	}
    +
    +	/**
    +	 * Sets the value of the dateTo property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link XMLGregorianCalendar }
    +	 * 
    +	 */
    +	public void setDateTo(XMLGregorianCalendar value) {
    +		this.dateTo = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the coursesUnits property.
    +	 * 
    +	 * @return possible object is {@link MobilityProgrammeCoursesUnitsType }
    +	 * 
    +	 */
    +	public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
    +		return coursesUnits;
    +	}
    +
    +	/**
    +	 * Sets the value of the coursesUnits property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link MobilityProgrammeCoursesUnitsType }
    +	 * 
    +	 */
    +	public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
    +		this.coursesUnits = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java
    index bfff6cbda..1eca1ed60 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for ModeOfDeliveryType. + *

    + * Java class for ModeOfDeliveryType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ModeOfDeliveryType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum ModeOfDeliveryType {
     
    -    @XmlEnumValue("FaceToFace")
    -    FACE_TO_FACE("FaceToFace"),
    -    @XmlEnumValue("DistanceLearning")
    -    DISTANCE_LEARNING("DistanceLearning"),
    -    @XmlEnumValue("Other")
    -    OTHER("Other");
    -    private final String value;
    -
    -    ModeOfDeliveryType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static ModeOfDeliveryType fromValue(String v) {
    -        for (ModeOfDeliveryType c: ModeOfDeliveryType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	@XmlEnumValue("FaceToFace")
    +	FACE_TO_FACE("FaceToFace"), @XmlEnumValue("DistanceLearning")
    +	DISTANCE_LEARNING("DistanceLearning"), @XmlEnumValue("Other")
    +	OTHER("Other");
    +	private final String value;
    +
    +	ModeOfDeliveryType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static ModeOfDeliveryType fromValue(String v) {
    +		for (ModeOfDeliveryType c : ModeOfDeliveryType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java
    index 4d9e43d8d..5a3b5a830 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java
    @@ -5,19 +5,20 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlEnum;
     import javax.xml.bind.annotation.XmlEnumValue;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for ModeOfStudyType. + *

    + * Java class for ModeOfStudyType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="ModeOfStudyType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -35,33 +36,29 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum ModeOfStudyType {
     
    -    @XmlEnumValue("FullTime")
    -    FULL_TIME("FullTime"),
    -    @XmlEnumValue("ParTime")
    -    PAR_TIME("ParTime"),
    -    @XmlEnumValue("Distance")
    -    DISTANCE("Distance"),
    -    @XmlEnumValue("eLearning")
    -    E_LEARNING("eLearning"),
    -    @XmlEnumValue("Another")
    -    ANOTHER("Another");
    -    private final String value;
    +	@XmlEnumValue("FullTime")
    +	FULL_TIME("FullTime"), @XmlEnumValue("ParTime")
    +	PAR_TIME("ParTime"), @XmlEnumValue("Distance")
    +	DISTANCE("Distance"), @XmlEnumValue("eLearning")
    +	E_LEARNING("eLearning"), @XmlEnumValue("Another")
    +	ANOTHER("Another");
    +	private final String value;
     
    -    ModeOfStudyType(String v) {
    -        value = v;
    -    }
    +	ModeOfStudyType(String v) {
    +		value = v;
    +	}
     
    -    public String value() {
    -        return value;
    -    }
    +	public String value() {
    +		return value;
    +	}
     
    -    public static ModeOfStudyType fromValue(String v) {
    -        for (ModeOfStudyType c: ModeOfStudyType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	public static ModeOfStudyType fromValue(String v) {
    +		for (ModeOfStudyType c : ModeOfStudyType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java
    index 7a3479a1f..7ffa2f2ea 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
     
    -
     /**
    - * 

    Java class for MultilingualGeneralDiplomaType complex type. + *

    + * Java class for MultilingualGeneralDiplomaType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="MultilingualGeneralDiplomaType">
    @@ -38,73 +38,66 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "MultilingualGeneralDiplomaType", propOrder = {
    -    "generalDiploma",
    -    "signature"
    -})
    +@XmlType(name = "MultilingualGeneralDiplomaType", propOrder = { "generalDiploma", "signature" })
     public class MultilingualGeneralDiplomaType {
     
    -    @XmlElement(name = "GeneralDiploma", required = true)
    -    protected List generalDiploma;
    -    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    -    protected List signature;
    +	@XmlElement(name = "GeneralDiploma", required = true)
    +	protected List generalDiploma;
    +	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
    +	protected List signature;
     
    -    /**
    -     * Gets the value of the generalDiploma property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the generalDiploma property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getGeneralDiploma().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link GeneralDiplomaType } - * - * - */ - public List getGeneralDiploma() { - if (generalDiploma == null) { - generalDiploma = new ArrayList(); - } - return this.generalDiploma; - } + /** + * Gets the value of the generalDiploma property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the generalDiploma property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getGeneralDiploma().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link GeneralDiplomaType } + * + * + */ + public List getGeneralDiploma() { + if (generalDiploma == null) { + generalDiploma = new ArrayList(); + } + return this.generalDiploma; + } - /** - * Gets the value of the signature property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the signature property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSignature().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link SignatureType } - * - * - */ - public List getSignature() { - if (signature == null) { - signature = new ArrayList(); - } - return this.signature; - } + /** + * Gets the value of the signature property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the signature property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSignature().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link SignatureType } + * + * + */ + public List getSignature() { + if (signature == null) { + signature = new ArrayList(); + } + return this.signature; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java index 8662aef80..201efce45 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for NameAndStatusOfAwardingInstitutionType complex type. + *

    + * Java class for NameAndStatusOfAwardingInstitutionType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="NameAndStatusOfAwardingInstitutionType">
    @@ -45,98 +45,90 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = {
    -    "awardingInstitution"
    -})
    +@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = { "awardingInstitution" })
     public class NameAndStatusOfAwardingInstitutionType {
     
    -    @XmlElement(name = "AwardingInstitution", required = true)
    -    protected List awardingInstitution;
    -
    -    /**
    -     * Gets the value of the awardingInstitution property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the awardingInstitution property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getAwardingInstitution().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } - * - * - */ - public List getAwardingInstitution() { - if (awardingInstitution == null) { - awardingInstitution = new ArrayList(); - } - return this.awardingInstitution; - } + @XmlElement(name = "AwardingInstitution", required = true) + protected List awardingInstitution; + /** + * Gets the value of the awardingInstitution property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the awardingInstitution property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getAwardingInstitution().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } + * + * + */ + public List getAwardingInstitution() { + if (awardingInstitution == null) { + awardingInstitution = new ArrayList(); + } + return this.awardingInstitution; + } - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
    -     *       <attribute name="awardingInstitutionID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAW" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class AwardingInstitution - extends InstitutionType - { + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
    +	 *       <attribute name="awardingInstitutionID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAW" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class AwardingInstitution extends InstitutionType { - @XmlAttribute(name = "awardingInstitutionID") - protected String awardingInstitutionID; + @XmlAttribute(name = "awardingInstitutionID") + protected String awardingInstitutionID; - /** - * Gets the value of the awardingInstitutionID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAwardingInstitutionID() { - if (awardingInstitutionID == null) { - return "DEF-IAW"; - } else { - return awardingInstitutionID; - } - } + /** + * Gets the value of the awardingInstitutionID property. + * + * @return possible object is {@link String } + * + */ + public String getAwardingInstitutionID() { + if (awardingInstitutionID == null) { + return "DEF-IAW"; + } else { + return awardingInstitutionID; + } + } - /** - * Sets the value of the awardingInstitutionID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAwardingInstitutionID(String value) { - this.awardingInstitutionID = value; - } + /** + * Sets the value of the awardingInstitutionID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAwardingInstitutionID(String value) { + this.awardingInstitutionID = value; + } - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java index 2ab19b491..c9e07208c 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import java.util.ArrayList; @@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type. + *

    + * Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
    @@ -45,98 +45,90 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = {
    -    "institutionAdministeringStudies"
    -})
    +@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = { "institutionAdministeringStudies" })
     public class NameAndStatusOfInstitutionAdministeringStudiesType {
     
    -    @XmlElement(name = "InstitutionAdministeringStudies", required = true)
    -    protected List institutionAdministeringStudies;
    -
    -    /**
    -     * Gets the value of the institutionAdministeringStudies property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the institutionAdministeringStudies property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getInstitutionAdministeringStudies().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } - * - * - */ - public List getInstitutionAdministeringStudies() { - if (institutionAdministeringStudies == null) { - institutionAdministeringStudies = new ArrayList(); - } - return this.institutionAdministeringStudies; - } + @XmlElement(name = "InstitutionAdministeringStudies", required = true) + protected List institutionAdministeringStudies; + /** + * Gets the value of the institutionAdministeringStudies property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the institutionAdministeringStudies property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getInstitutionAdministeringStudies().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } + * + * + */ + public List getInstitutionAdministeringStudies() { + if (institutionAdministeringStudies == null) { + institutionAdministeringStudies = new ArrayList(); + } + return this.institutionAdministeringStudies; + } - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <complexContent>
    -     *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
    -     *       <attribute name="institutionAdministeringStudiesID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAS" />
    -     *     </extension>
    -     *   </complexContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class InstitutionAdministeringStudies - extends InstitutionType - { + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <complexContent>
    +	 *     <extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
    +	 *       <attribute name="institutionAdministeringStudiesID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAS" />
    +	 *     </extension>
    +	 *   </complexContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "") + public static class InstitutionAdministeringStudies extends InstitutionType { - @XmlAttribute(name = "institutionAdministeringStudiesID") - protected String institutionAdministeringStudiesID; + @XmlAttribute(name = "institutionAdministeringStudiesID") + protected String institutionAdministeringStudiesID; - /** - * Gets the value of the institutionAdministeringStudiesID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getInstitutionAdministeringStudiesID() { - if (institutionAdministeringStudiesID == null) { - return "DEF-IAS"; - } else { - return institutionAdministeringStudiesID; - } - } + /** + * Gets the value of the institutionAdministeringStudiesID property. + * + * @return possible object is {@link String } + * + */ + public String getInstitutionAdministeringStudiesID() { + if (institutionAdministeringStudiesID == null) { + return "DEF-IAS"; + } else { + return institutionAdministeringStudiesID; + } + } - /** - * Sets the value of the institutionAdministeringStudiesID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setInstitutionAdministeringStudiesID(String value) { - this.institutionAdministeringStudiesID = value; - } + /** + * Sets the value of the institutionAdministeringStudiesID property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setInstitutionAdministeringStudiesID(String value) { + this.institutionAdministeringStudiesID = value; + } - } + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java index 699ca76c7..3e2bbe5c0 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.JAXBElement; @@ -13,620 +12,612 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; - /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the eu.stork.names.tc.stork._2_0.academic.generaldiploma package. - *

    An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. + * This object contains factory methods for each Java content interface and Java element interface generated in the eu.stork.names.tc.stork._2_0.academic.generaldiploma package. + *

    + * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class. * */ @XmlRegistry public class ObjectFactory { - private final static QName _MultilingualGeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "MultilingualGeneralDiploma"); - private final static QName _GeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "GeneralDiploma"); - private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "BreakLine"); - private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "AttachedRef"); - private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Italic"); - private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Underline"); - private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Bold"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._2_0.academic.generaldiploma - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link LanguagesOfInstructionAndExaminationType } - * - */ - public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() { - return new LanguagesOfInstructionAndExaminationType(); - } - - /** - * Create an instance of {@link RichTextTagType } - * - */ - public RichTextTagType createRichTextTagType() { - return new RichTextTagType(); - } - - /** - * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType } - * - */ - public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() { - return new NameAndStatusOfInstitutionAdministeringStudiesType(); - } - - /** - * Create an instance of {@link InstitutionType } - * - */ - public InstitutionType createInstitutionType() { - return new InstitutionType(); - } - - /** - * Create an instance of {@link MobilityProgrammeCourseUnitType } - * - */ - public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() { - return new MobilityProgrammeCourseUnitType(); - } - - /** - * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType } - * - */ - public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() { - return new InformationIdentifyingTheHolderOfTheQualificationType(); - } - - /** - * Create an instance of {@link CourseUnitType } - * - */ - public CourseUnitType createCourseUnitType() { - return new CourseUnitType(); - } - - /** - * Create an instance of {@link LocalGradeType } - * - */ - public LocalGradeType createLocalGradeType() { - return new LocalGradeType(); - } - - /** - * Create an instance of {@link InformationOnTheContentsAndResultsGainedType } - * - */ - public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() { - return new InformationOnTheContentsAndResultsGainedType(); - } - - /** - * Create an instance of {@link InformationOnTheLevelOfTheQualificationType } - * - */ - public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() { - return new InformationOnTheLevelOfTheQualificationType(); - } - - /** - * Create an instance of {@link NameAndStatusOfAwardingInstitutionType } - * - */ - public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() { - return new NameAndStatusOfAwardingInstitutionType(); - } - - /** - * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType } - * - */ - public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() { - return new InformationOnTheFunctionOfTheQualificationType(); - } - - /** - * Create an instance of {@link MultilingualGeneralDiplomaType } - * - */ - public MultilingualGeneralDiplomaType createMultilingualGeneralDiplomaType() { - return new MultilingualGeneralDiplomaType(); - } - - /** - * Create an instance of {@link GeneralDiplomaType } - * - */ - public GeneralDiplomaType createGeneralDiplomaType() { - return new GeneralDiplomaType(); - } - - /** - * Create an instance of {@link ExtensionContentType } - * - */ - public ExtensionContentType createExtensionContentType() { - return new ExtensionContentType(); - } - - /** - * Create an instance of {@link CountryTextCodeType } - * - */ - public CountryTextCodeType createCountryTextCodeType() { - return new CountryTextCodeType(); - } - - /** - * Create an instance of {@link AttachedImageURLType } - * - */ - public AttachedImageURLType createAttachedImageURLType() { - return new AttachedImageURLType(); - } - - /** - * Create an instance of {@link CourseStructureDiagramType } - * - */ - public CourseStructureDiagramType createCourseStructureDiagramType() { - return new CourseStructureDiagramType(); - } - - /** - * Create an instance of {@link CourseUnitWorkPlacementType } - * - */ - public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() { - return new CourseUnitWorkPlacementType(); - } - - /** - * Create an instance of {@link InformationIdentifyingTheQualificationType } - * - */ - public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() { - return new InformationIdentifyingTheQualificationType(); - } - - /** - * Create an instance of {@link MobilityProgrammeCoursesUnitsType } - * - */ - public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() { - return new MobilityProgrammeCoursesUnitsType(); - } - - /** - * Create an instance of {@link QualificationType } - * - */ - public QualificationType createQualificationType() { - return new QualificationType(); - } - - /** - * Create an instance of {@link CertificationOfTheSupplementType } - * - */ - public CertificationOfTheSupplementType createCertificationOfTheSupplementType() { - return new CertificationOfTheSupplementType(); - } - - /** - * Create an instance of {@link AttachedFileURLType } - * - */ - public AttachedFileURLType createAttachedFileURLType() { - return new AttachedFileURLType(); - } - - /** - * Create an instance of {@link ProgrammeRequirementsType } - * - */ - public ProgrammeRequirementsType createProgrammeRequirementsType() { - return new ProgrammeRequirementsType(); - } - - /** - * Create an instance of {@link CourseUnitWorkPlacementsType } - * - */ - public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() { - return new CourseUnitWorkPlacementsType(); - } - - /** - * Create an instance of {@link AdditionalInformationType } - * - */ - public AdditionalInformationType createAdditionalInformationType() { - return new AdditionalInformationType(); - } - - /** - * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType } - * - */ - public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() { - return new GradingSchemeAndGradeDistributionGuidanceType(); - } - - /** - * Create an instance of {@link AttachmentsType } - * - */ - public AttachmentsType createAttachmentsType() { - return new AttachmentsType(); - } - - /** - * Create an instance of {@link CourseUnitLanguageOfInstructionType } - * - */ - public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() { - return new CourseUnitLanguageOfInstructionType(); - } - - /** - * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType } - * - */ - public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() { - return new CoursesAttendedInOtherInstitutionInMobilityProgramsType(); - } - - /** - * Create an instance of {@link FamilyNameType } - * - */ - public FamilyNameType createFamilyNameType() { - return new FamilyNameType(); - } - - /** - * Create an instance of {@link CoursesGroupsType } - * - */ - public CoursesGroupsType createCoursesGroupsType() { - return new CoursesGroupsType(); - } - - /** - * Create an instance of {@link TitleConferredType } - * - */ - public TitleConferredType createTitleConferredType() { - return new TitleConferredType(); - } - - /** - * Create an instance of {@link OfficialStampType } - * - */ - public OfficialStampType createOfficialStampType() { - return new OfficialStampType(); - } - - /** - * Create an instance of {@link CourseUnitStudentPerformanceType } - * - */ - public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() { - return new CourseUnitStudentPerformanceType(); - } - - /** - * Create an instance of {@link GivenNameType } - * - */ - public GivenNameType createGivenNameType() { - return new GivenNameType(); - } - - /** - * Create an instance of {@link CoursesUnitsType } - * - */ - public CoursesUnitsType createCoursesUnitsType() { - return new CoursesUnitsType(); - } - - /** - * Create an instance of {@link MobilityProgrammeType } - * - */ - public MobilityProgrammeType createMobilityProgrammeType() { - return new MobilityProgrammeType(); - } - - /** - * Create an instance of {@link ProgrammeDetailsType } - * - */ - public ProgrammeDetailsType createProgrammeDetailsType() { - return new ProgrammeDetailsType(); - } - - /** - * Create an instance of {@link OfficialCertifyingType } - * - */ - public OfficialCertifyingType createOfficialCertifyingType() { - return new OfficialCertifyingType(); - } - - /** - * Create an instance of {@link CourseUnitLanguagesOfInstructionType } - * - */ - public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() { - return new CourseUnitLanguagesOfInstructionType(); - } - - /** - * Create an instance of {@link AttachedImageDataType } - * - */ - public AttachedImageDataType createAttachedImageDataType() { - return new AttachedImageDataType(); - } - - /** - * Create an instance of {@link AttachedType } - * - */ - public AttachedType createAttachedType() { - return new AttachedType(); - } - - /** - * Create an instance of {@link CoursesGroupType } - * - */ - public CoursesGroupType createCoursesGroupType() { - return new CoursesGroupType(); - } - - /** - * Create an instance of {@link AddressType } - * - */ - public AddressType createAddressType() { - return new AddressType(); - } - - /** - * Create an instance of {@link AttachedFileDataType } - * - */ - public AttachedFileDataType createAttachedFileDataType() { - return new AttachedFileDataType(); - } - - /** - * Create an instance of {@link ContactInformationType } - * - */ - public ContactInformationType createContactInformationType() { - return new ContactInformationType(); - } - - /** - * Create an instance of {@link OfficialsCertifyingType } - * - */ - public OfficialsCertifyingType createOfficialsCertifyingType() { - return new OfficialsCertifyingType(); - } - - /** - * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language } - * - */ - public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() { - return new LanguagesOfInstructionAndExaminationType.Language(); - } - - /** - * Create an instance of {@link RichTextTagType.AttachedRef } - * - */ - public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() { - return new RichTextTagType.AttachedRef(); - } - - /** - * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } - * - */ - public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() { - return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies(); - } - - /** - * Create an instance of {@link InstitutionType.AttachedImageRef } - * - */ - public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() { - return new InstitutionType.AttachedImageRef(); - } - - /** - * Create an instance of {@link MobilityProgrammeCourseUnitType.Title } - * - */ - public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() { - return new MobilityProgrammeCourseUnitType.Title(); - } - - /** - * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender } - * - */ - public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() { - return new InformationIdentifyingTheHolderOfTheQualificationType.Gender(); - } - - /** - * Create an instance of {@link CourseUnitType.Type } - * - */ - public CourseUnitType.Type createCourseUnitTypeType() { - return new CourseUnitType.Type(); - } - - /** - * Create an instance of {@link CourseUnitType.YearOfStudy } - * - */ - public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() { - return new CourseUnitType.YearOfStudy(); - } - - /** - * Create an instance of {@link CourseUnitType.Level } - * - */ - public CourseUnitType.Level createCourseUnitTypeLevel() { - return new CourseUnitType.Level(); - } - - /** - * Create an instance of {@link CourseUnitType.ModeOfDelivery } - * - */ - public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() { - return new CourseUnitType.ModeOfDelivery(); - } - - /** - * Create an instance of {@link LocalGradeType.Source } - * - */ - public LocalGradeType.Source createLocalGradeTypeSource() { - return new LocalGradeType.Source(); - } - - /** - * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } - * - */ - public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() { - return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy(); - } - - /** - * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level } - * - */ - public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() { - return new InformationOnTheLevelOfTheQualificationType.Level(); - } - - /** - * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } - * - */ - public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() { - return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme(); - } - - /** - * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } - * - */ - public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() { - return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution(); - } - - /** - * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } - * - */ - public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() { - return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualGeneralDiplomaType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "MultilingualGeneralDiploma") - public JAXBElement createMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) { - return new JAXBElement(_MultilingualGeneralDiploma_QNAME, MultilingualGeneralDiplomaType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link GeneralDiplomaType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "GeneralDiploma") - public JAXBElement createGeneralDiploma(GeneralDiplomaType value) { - return new JAXBElement(_GeneralDiploma_QNAME, GeneralDiplomaType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "BreakLine", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeBreakLine(String value) { - return new JAXBElement(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "AttachedRef", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) { - return new JAXBElement(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Italic", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeItalic(String value) { - return new JAXBElement(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Underline", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeUnderline(String value) { - return new JAXBElement(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Bold", scope = RichTextTagType.class) - public JAXBElement createRichTextTagTypeBold(String value) { - return new JAXBElement(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value); - } + private final static QName _MultilingualGeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "MultilingualGeneralDiploma"); + private final static QName _GeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "GeneralDiploma"); + private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "BreakLine"); + private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "AttachedRef"); + private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Italic"); + private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Underline"); + private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Bold"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._2_0.academic.generaldiploma + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link LanguagesOfInstructionAndExaminationType } + * + */ + public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() { + return new LanguagesOfInstructionAndExaminationType(); + } + + /** + * Create an instance of {@link RichTextTagType } + * + */ + public RichTextTagType createRichTextTagType() { + return new RichTextTagType(); + } + + /** + * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType } + * + */ + public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() { + return new NameAndStatusOfInstitutionAdministeringStudiesType(); + } + + /** + * Create an instance of {@link InstitutionType } + * + */ + public InstitutionType createInstitutionType() { + return new InstitutionType(); + } + + /** + * Create an instance of {@link MobilityProgrammeCourseUnitType } + * + */ + public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() { + return new MobilityProgrammeCourseUnitType(); + } + + /** + * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType } + * + */ + public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() { + return new InformationIdentifyingTheHolderOfTheQualificationType(); + } + + /** + * Create an instance of {@link CourseUnitType } + * + */ + public CourseUnitType createCourseUnitType() { + return new CourseUnitType(); + } + + /** + * Create an instance of {@link LocalGradeType } + * + */ + public LocalGradeType createLocalGradeType() { + return new LocalGradeType(); + } + + /** + * Create an instance of {@link InformationOnTheContentsAndResultsGainedType } + * + */ + public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() { + return new InformationOnTheContentsAndResultsGainedType(); + } + + /** + * Create an instance of {@link InformationOnTheLevelOfTheQualificationType } + * + */ + public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() { + return new InformationOnTheLevelOfTheQualificationType(); + } + + /** + * Create an instance of {@link NameAndStatusOfAwardingInstitutionType } + * + */ + public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() { + return new NameAndStatusOfAwardingInstitutionType(); + } + + /** + * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType } + * + */ + public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() { + return new InformationOnTheFunctionOfTheQualificationType(); + } + + /** + * Create an instance of {@link MultilingualGeneralDiplomaType } + * + */ + public MultilingualGeneralDiplomaType createMultilingualGeneralDiplomaType() { + return new MultilingualGeneralDiplomaType(); + } + + /** + * Create an instance of {@link GeneralDiplomaType } + * + */ + public GeneralDiplomaType createGeneralDiplomaType() { + return new GeneralDiplomaType(); + } + + /** + * Create an instance of {@link ExtensionContentType } + * + */ + public ExtensionContentType createExtensionContentType() { + return new ExtensionContentType(); + } + + /** + * Create an instance of {@link CountryTextCodeType } + * + */ + public CountryTextCodeType createCountryTextCodeType() { + return new CountryTextCodeType(); + } + + /** + * Create an instance of {@link AttachedImageURLType } + * + */ + public AttachedImageURLType createAttachedImageURLType() { + return new AttachedImageURLType(); + } + + /** + * Create an instance of {@link CourseStructureDiagramType } + * + */ + public CourseStructureDiagramType createCourseStructureDiagramType() { + return new CourseStructureDiagramType(); + } + + /** + * Create an instance of {@link CourseUnitWorkPlacementType } + * + */ + public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() { + return new CourseUnitWorkPlacementType(); + } + + /** + * Create an instance of {@link InformationIdentifyingTheQualificationType } + * + */ + public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() { + return new InformationIdentifyingTheQualificationType(); + } + + /** + * Create an instance of {@link MobilityProgrammeCoursesUnitsType } + * + */ + public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() { + return new MobilityProgrammeCoursesUnitsType(); + } + + /** + * Create an instance of {@link QualificationType } + * + */ + public QualificationType createQualificationType() { + return new QualificationType(); + } + + /** + * Create an instance of {@link CertificationOfTheSupplementType } + * + */ + public CertificationOfTheSupplementType createCertificationOfTheSupplementType() { + return new CertificationOfTheSupplementType(); + } + + /** + * Create an instance of {@link AttachedFileURLType } + * + */ + public AttachedFileURLType createAttachedFileURLType() { + return new AttachedFileURLType(); + } + + /** + * Create an instance of {@link ProgrammeRequirementsType } + * + */ + public ProgrammeRequirementsType createProgrammeRequirementsType() { + return new ProgrammeRequirementsType(); + } + + /** + * Create an instance of {@link CourseUnitWorkPlacementsType } + * + */ + public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() { + return new CourseUnitWorkPlacementsType(); + } + + /** + * Create an instance of {@link AdditionalInformationType } + * + */ + public AdditionalInformationType createAdditionalInformationType() { + return new AdditionalInformationType(); + } + + /** + * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType } + * + */ + public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() { + return new GradingSchemeAndGradeDistributionGuidanceType(); + } + + /** + * Create an instance of {@link AttachmentsType } + * + */ + public AttachmentsType createAttachmentsType() { + return new AttachmentsType(); + } + + /** + * Create an instance of {@link CourseUnitLanguageOfInstructionType } + * + */ + public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() { + return new CourseUnitLanguageOfInstructionType(); + } + + /** + * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType } + * + */ + public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() { + return new CoursesAttendedInOtherInstitutionInMobilityProgramsType(); + } + + /** + * Create an instance of {@link FamilyNameType } + * + */ + public FamilyNameType createFamilyNameType() { + return new FamilyNameType(); + } + + /** + * Create an instance of {@link CoursesGroupsType } + * + */ + public CoursesGroupsType createCoursesGroupsType() { + return new CoursesGroupsType(); + } + + /** + * Create an instance of {@link TitleConferredType } + * + */ + public TitleConferredType createTitleConferredType() { + return new TitleConferredType(); + } + + /** + * Create an instance of {@link OfficialStampType } + * + */ + public OfficialStampType createOfficialStampType() { + return new OfficialStampType(); + } + + /** + * Create an instance of {@link CourseUnitStudentPerformanceType } + * + */ + public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() { + return new CourseUnitStudentPerformanceType(); + } + + /** + * Create an instance of {@link GivenNameType } + * + */ + public GivenNameType createGivenNameType() { + return new GivenNameType(); + } + + /** + * Create an instance of {@link CoursesUnitsType } + * + */ + public CoursesUnitsType createCoursesUnitsType() { + return new CoursesUnitsType(); + } + + /** + * Create an instance of {@link MobilityProgrammeType } + * + */ + public MobilityProgrammeType createMobilityProgrammeType() { + return new MobilityProgrammeType(); + } + + /** + * Create an instance of {@link ProgrammeDetailsType } + * + */ + public ProgrammeDetailsType createProgrammeDetailsType() { + return new ProgrammeDetailsType(); + } + + /** + * Create an instance of {@link OfficialCertifyingType } + * + */ + public OfficialCertifyingType createOfficialCertifyingType() { + return new OfficialCertifyingType(); + } + + /** + * Create an instance of {@link CourseUnitLanguagesOfInstructionType } + * + */ + public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() { + return new CourseUnitLanguagesOfInstructionType(); + } + + /** + * Create an instance of {@link AttachedImageDataType } + * + */ + public AttachedImageDataType createAttachedImageDataType() { + return new AttachedImageDataType(); + } + + /** + * Create an instance of {@link AttachedType } + * + */ + public AttachedType createAttachedType() { + return new AttachedType(); + } + + /** + * Create an instance of {@link CoursesGroupType } + * + */ + public CoursesGroupType createCoursesGroupType() { + return new CoursesGroupType(); + } + + /** + * Create an instance of {@link AddressType } + * + */ + public AddressType createAddressType() { + return new AddressType(); + } + + /** + * Create an instance of {@link AttachedFileDataType } + * + */ + public AttachedFileDataType createAttachedFileDataType() { + return new AttachedFileDataType(); + } + + /** + * Create an instance of {@link ContactInformationType } + * + */ + public ContactInformationType createContactInformationType() { + return new ContactInformationType(); + } + + /** + * Create an instance of {@link OfficialsCertifyingType } + * + */ + public OfficialsCertifyingType createOfficialsCertifyingType() { + return new OfficialsCertifyingType(); + } + + /** + * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language } + * + */ + public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() { + return new LanguagesOfInstructionAndExaminationType.Language(); + } + + /** + * Create an instance of {@link RichTextTagType.AttachedRef } + * + */ + public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() { + return new RichTextTagType.AttachedRef(); + } + + /** + * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies } + * + */ + public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() { + return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies(); + } + + /** + * Create an instance of {@link InstitutionType.AttachedImageRef } + * + */ + public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() { + return new InstitutionType.AttachedImageRef(); + } + + /** + * Create an instance of {@link MobilityProgrammeCourseUnitType.Title } + * + */ + public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() { + return new MobilityProgrammeCourseUnitType.Title(); + } + + /** + * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender } + * + */ + public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() { + return new InformationIdentifyingTheHolderOfTheQualificationType.Gender(); + } + + /** + * Create an instance of {@link CourseUnitType.Type } + * + */ + public CourseUnitType.Type createCourseUnitTypeType() { + return new CourseUnitType.Type(); + } + + /** + * Create an instance of {@link CourseUnitType.YearOfStudy } + * + */ + public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() { + return new CourseUnitType.YearOfStudy(); + } + + /** + * Create an instance of {@link CourseUnitType.Level } + * + */ + public CourseUnitType.Level createCourseUnitTypeLevel() { + return new CourseUnitType.Level(); + } + + /** + * Create an instance of {@link CourseUnitType.ModeOfDelivery } + * + */ + public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() { + return new CourseUnitType.ModeOfDelivery(); + } + + /** + * Create an instance of {@link LocalGradeType.Source } + * + */ + public LocalGradeType.Source createLocalGradeTypeSource() { + return new LocalGradeType.Source(); + } + + /** + * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy } + * + */ + public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() { + return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy(); + } + + /** + * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level } + * + */ + public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() { + return new InformationOnTheLevelOfTheQualificationType.Level(); + } + + /** + * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme } + * + */ + public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() { + return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme(); + } + + /** + * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution } + * + */ + public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() { + return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution(); + } + + /** + * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus } + * + */ + public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() { + return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualGeneralDiplomaType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "MultilingualGeneralDiploma") + public JAXBElement createMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) { + return new JAXBElement(_MultilingualGeneralDiploma_QNAME, MultilingualGeneralDiplomaType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GeneralDiplomaType }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "GeneralDiploma") + public JAXBElement createGeneralDiploma(GeneralDiplomaType value) { + return new JAXBElement(_GeneralDiploma_QNAME, GeneralDiplomaType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "BreakLine", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeBreakLine(String value) { + return new JAXBElement(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "AttachedRef", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) { + return new JAXBElement(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Italic", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeItalic(String value) { + return new JAXBElement(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Underline", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeUnderline(String value) { + return new JAXBElement(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Bold", scope = RichTextTagType.class) + public JAXBElement createRichTextTagTypeBold(String value) { + return new JAXBElement(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value); + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java index 6564cad3a..a53e855d1 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for OfficialCertifyingType complex type. + *

    + * Java class for OfficialCertifyingType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="OfficialCertifyingType">
    @@ -38,120 +38,104 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "OfficialCertifyingType", propOrder = {
    -    "familyName",
    -    "givenName",
    -    "capacity"
    -})
    +@XmlType(name = "OfficialCertifyingType", propOrder = { "familyName", "givenName", "capacity" })
     public class OfficialCertifyingType {
     
    -    @XmlElement(name = "FamilyName", required = true)
    -    protected FamilyNameType familyName;
    -    @XmlElement(name = "GivenName", required = true)
    -    protected GivenNameType givenName;
    -    @XmlElement(name = "Capacity")
    -    protected String capacity;
    -    @XmlAttribute(name = "awardingInstitutionID")
    -    protected String awardingInstitutionID;
    +	@XmlElement(name = "FamilyName", required = true)
    +	protected FamilyNameType familyName;
    +	@XmlElement(name = "GivenName", required = true)
    +	protected GivenNameType givenName;
    +	@XmlElement(name = "Capacity")
    +	protected String capacity;
    +	@XmlAttribute(name = "awardingInstitutionID")
    +	protected String awardingInstitutionID;
     
    -    /**
    -     * Gets the value of the familyName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public FamilyNameType getFamilyName() {
    -        return familyName;
    -    }
    +	/**
    +	 * Gets the value of the familyName property.
    +	 * 
    +	 * @return possible object is {@link FamilyNameType }
    +	 * 
    +	 */
    +	public FamilyNameType getFamilyName() {
    +		return familyName;
    +	}
     
    -    /**
    -     * Sets the value of the familyName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link FamilyNameType }
    -     *     
    -     */
    -    public void setFamilyName(FamilyNameType value) {
    -        this.familyName = value;
    -    }
    +	/**
    +	 * Sets the value of the familyName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link FamilyNameType }
    +	 * 
    +	 */
    +	public void setFamilyName(FamilyNameType value) {
    +		this.familyName = value;
    +	}
     
    -    /**
    -     * Gets the value of the givenName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public GivenNameType getGivenName() {
    -        return givenName;
    -    }
    +	/**
    +	 * Gets the value of the givenName property.
    +	 * 
    +	 * @return possible object is {@link GivenNameType }
    +	 * 
    +	 */
    +	public GivenNameType getGivenName() {
    +		return givenName;
    +	}
     
    -    /**
    -     * Sets the value of the givenName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link GivenNameType }
    -     *     
    -     */
    -    public void setGivenName(GivenNameType value) {
    -        this.givenName = value;
    -    }
    +	/**
    +	 * Sets the value of the givenName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link GivenNameType }
    +	 * 
    +	 */
    +	public void setGivenName(GivenNameType value) {
    +		this.givenName = value;
    +	}
     
    -    /**
    -     * Gets the value of the capacity property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getCapacity() {
    -        return capacity;
    -    }
    +	/**
    +	 * Gets the value of the capacity property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getCapacity() {
    +		return capacity;
    +	}
     
    -    /**
    -     * Sets the value of the capacity property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setCapacity(String value) {
    -        this.capacity = value;
    -    }
    +	/**
    +	 * Sets the value of the capacity property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setCapacity(String value) {
    +		this.capacity = value;
    +	}
     
    -    /**
    -     * Gets the value of the awardingInstitutionID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAwardingInstitutionID() {
    -        if (awardingInstitutionID == null) {
    -            return "DEF-IAW";
    -        } else {
    -            return awardingInstitutionID;
    -        }
    -    }
    +	/**
    +	 * Gets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAwardingInstitutionID() {
    +		if (awardingInstitutionID == null) {
    +			return "DEF-IAW";
    +		} else {
    +			return awardingInstitutionID;
    +		}
    +	}
     
    -    /**
    -     * Sets the value of the awardingInstitutionID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAwardingInstitutionID(String value) {
    -        this.awardingInstitutionID = value;
    -    }
    +	/**
    +	 * Sets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAwardingInstitutionID(String value) {
    +		this.awardingInstitutionID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java
    index 61966f341..df1051a7c 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for OfficialStampType complex type. + *

    + * Java class for OfficialStampType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="OfficialStampType">
    @@ -36,66 +36,58 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "OfficialStampType", propOrder = {
    -    "description"
    -})
    +@XmlType(name = "OfficialStampType", propOrder = { "description" })
     public class OfficialStampType {
     
    -    @XmlElement(name = "Description", required = true)
    -    protected String description;
    -    @XmlAttribute(name = "awardingInstitutionID")
    -    protected String awardingInstitutionID;
    +	@XmlElement(name = "Description", required = true)
    +	protected String description;
    +	@XmlAttribute(name = "awardingInstitutionID")
    +	protected String awardingInstitutionID;
     
    -    /**
    -     * Gets the value of the description property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getDescription() {
    -        return description;
    -    }
    +	/**
    +	 * Gets the value of the description property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getDescription() {
    +		return description;
    +	}
     
    -    /**
    -     * Sets the value of the description property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setDescription(String value) {
    -        this.description = value;
    -    }
    +	/**
    +	 * Sets the value of the description property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setDescription(String value) {
    +		this.description = value;
    +	}
     
    -    /**
    -     * Gets the value of the awardingInstitutionID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getAwardingInstitutionID() {
    -        if (awardingInstitutionID == null) {
    -            return "DEF-IAW";
    -        } else {
    -            return awardingInstitutionID;
    -        }
    -    }
    +	/**
    +	 * Gets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getAwardingInstitutionID() {
    +		if (awardingInstitutionID == null) {
    +			return "DEF-IAW";
    +		} else {
    +			return awardingInstitutionID;
    +		}
    +	}
     
    -    /**
    -     * Sets the value of the awardingInstitutionID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setAwardingInstitutionID(String value) {
    -        this.awardingInstitutionID = value;
    -    }
    +	/**
    +	 * Sets the value of the awardingInstitutionID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setAwardingInstitutionID(String value) {
    +		this.awardingInstitutionID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java
    index dbb17d0bc..1760eddb3 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.util.ArrayList;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for OfficialsCertifyingType complex type. + *

    + * Java class for OfficialsCertifyingType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="OfficialsCertifyingType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "OfficialsCertifyingType", propOrder = {
    -    "officialCertifying"
    -})
    +@XmlType(name = "OfficialsCertifyingType", propOrder = { "officialCertifying" })
     public class OfficialsCertifyingType {
     
    -    @XmlElement(name = "OfficialCertifying", required = true)
    -    protected List officialCertifying;
    +	@XmlElement(name = "OfficialCertifying", required = true)
    +	protected List officialCertifying;
     
    -    /**
    -     * Gets the value of the officialCertifying property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the officialCertifying property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getOfficialCertifying().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link OfficialCertifyingType } - * - * - */ - public List getOfficialCertifying() { - if (officialCertifying == null) { - officialCertifying = new ArrayList(); - } - return this.officialCertifying; - } + /** + * Gets the value of the officialCertifying property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the officialCertifying property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getOfficialCertifying().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link OfficialCertifyingType } + * + * + */ + public List getOfficialCertifying() { + if (officialCertifying == null) { + officialCertifying = new ArrayList(); + } + return this.officialCertifying; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java index c5255c9ee..58d96bfe2 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for ProgrammeDetailsType complex type. + *

    + * Java class for ProgrammeDetailsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ProgrammeDetailsType">
    @@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ProgrammeDetailsType", propOrder = {
    -    "courseStructureDiagram",
    -    "coursesAttendedInOtherInstitutionInMobilityPrograms"
    -})
    +@XmlType(name = "ProgrammeDetailsType", propOrder = { "courseStructureDiagram", "coursesAttendedInOtherInstitutionInMobilityPrograms" })
     public class ProgrammeDetailsType {
     
    -    @XmlElement(name = "CourseStructureDiagram", required = true)
    -    protected CourseStructureDiagramType courseStructureDiagram;
    -    @XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
    -    protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
    +	@XmlElement(name = "CourseStructureDiagram", required = true)
    +	protected CourseStructureDiagramType courseStructureDiagram;
    +	@XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
    +	protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
     
    -    /**
    -     * Gets the value of the courseStructureDiagram property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CourseStructureDiagramType }
    -     *     
    -     */
    -    public CourseStructureDiagramType getCourseStructureDiagram() {
    -        return courseStructureDiagram;
    -    }
    +	/**
    +	 * Gets the value of the courseStructureDiagram property.
    +	 * 
    +	 * @return possible object is {@link CourseStructureDiagramType }
    +	 * 
    +	 */
    +	public CourseStructureDiagramType getCourseStructureDiagram() {
    +		return courseStructureDiagram;
    +	}
     
    -    /**
    -     * Sets the value of the courseStructureDiagram property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CourseStructureDiagramType }
    -     *     
    -     */
    -    public void setCourseStructureDiagram(CourseStructureDiagramType value) {
    -        this.courseStructureDiagram = value;
    -    }
    +	/**
    +	 * Sets the value of the courseStructureDiagram property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CourseStructureDiagramType }
    +	 * 
    +	 */
    +	public void setCourseStructureDiagram(CourseStructureDiagramType value) {
    +		this.courseStructureDiagram = value;
    +	}
     
    -    /**
    -     * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    -     *     
    -     */
    -    public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
    -        return coursesAttendedInOtherInstitutionInMobilityPrograms;
    -    }
    +	/**
    +	 * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    +	 * 
    +	 * @return possible object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    +	 * 
    +	 */
    +	public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
    +		return coursesAttendedInOtherInstitutionInMobilityPrograms;
    +	}
     
    -    /**
    -     * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    -     *     
    -     */
    -    public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
    -        this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
    -    }
    +	/**
    +	 * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
    +	 * 
    +	 */
    +	public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
    +		this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java
    index fac1755c3..a0481317d 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for ProgrammeRequirementsType complex type. + *

    + * Java class for ProgrammeRequirementsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ProgrammeRequirementsType">
    @@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ProgrammeRequirementsType", propOrder = {
    -    "requirements",
    -    "keyLearningOutcomes"
    -})
    +@XmlType(name = "ProgrammeRequirementsType", propOrder = { "requirements", "keyLearningOutcomes" })
     public class ProgrammeRequirementsType {
     
    -    @XmlElement(name = "Requirements", required = true)
    -    protected RichTextTagType requirements;
    -    @XmlElement(name = "KeyLearningOutcomes")
    -    protected RichTextTagType keyLearningOutcomes;
    +	@XmlElement(name = "Requirements", required = true)
    +	protected RichTextTagType requirements;
    +	@XmlElement(name = "KeyLearningOutcomes")
    +	protected RichTextTagType keyLearningOutcomes;
     
    -    /**
    -     * Gets the value of the requirements property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getRequirements() {
    -        return requirements;
    -    }
    +	/**
    +	 * Gets the value of the requirements property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getRequirements() {
    +		return requirements;
    +	}
     
    -    /**
    -     * Sets the value of the requirements property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setRequirements(RichTextTagType value) {
    -        this.requirements = value;
    -    }
    +	/**
    +	 * Sets the value of the requirements property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setRequirements(RichTextTagType value) {
    +		this.requirements = value;
    +	}
     
    -    /**
    -     * Gets the value of the keyLearningOutcomes property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getKeyLearningOutcomes() {
    -        return keyLearningOutcomes;
    -    }
    +	/**
    +	 * Gets the value of the keyLearningOutcomes property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getKeyLearningOutcomes() {
    +		return keyLearningOutcomes;
    +	}
     
    -    /**
    -     * Sets the value of the keyLearningOutcomes property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setKeyLearningOutcomes(RichTextTagType value) {
    -        this.keyLearningOutcomes = value;
    -    }
    +	/**
    +	 * Sets the value of the keyLearningOutcomes property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setKeyLearningOutcomes(RichTextTagType value) {
    +		this.keyLearningOutcomes = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java
    index 209094e4f..5fc5377d0 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for QualificationType complex type. + *

    + * Java class for QualificationType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="QualificationType">
    @@ -38,115 +38,100 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "QualificationType", propOrder = {
    -    "name",
    -    "additionalInformation"
    -})
    +@XmlType(name = "QualificationType", propOrder = { "name", "additionalInformation" })
     public class QualificationType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    -    @XmlElement(name = "AdditionalInformation")
    -    protected RichTextTagType additionalInformation;
    -    @XmlAttribute(name = "localID")
    -    protected String localID;
    -    @XmlAttribute(name = "nationalID")
    -    protected String nationalID;
    +	@XmlElement(name = "Name", required = true)
    +	protected String name;
    +	@XmlElement(name = "AdditionalInformation")
    +	protected RichTextTagType additionalInformation;
    +	@XmlAttribute(name = "localID")
    +	protected String localID;
    +	@XmlAttribute(name = "nationalID")
    +	protected String nationalID;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    +	/**
    +	 * Gets the value of the name property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    +	/**
    +	 * Sets the value of the name property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setName(String value) {
    +		this.name = value;
    +	}
     
    -    /**
    -     * Gets the value of the additionalInformation property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public RichTextTagType getAdditionalInformation() {
    -        return additionalInformation;
    -    }
    +	/**
    +	 * Gets the value of the additionalInformation property.
    +	 * 
    +	 * @return possible object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public RichTextTagType getAdditionalInformation() {
    +		return additionalInformation;
    +	}
     
    -    /**
    -     * Sets the value of the additionalInformation property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link RichTextTagType }
    -     *     
    -     */
    -    public void setAdditionalInformation(RichTextTagType value) {
    -        this.additionalInformation = value;
    -    }
    +	/**
    +	 * Sets the value of the additionalInformation property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link RichTextTagType }
    +	 * 
    +	 */
    +	public void setAdditionalInformation(RichTextTagType value) {
    +		this.additionalInformation = value;
    +	}
     
    -    /**
    -     * Gets the value of the localID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getLocalID() {
    -        return localID;
    -    }
    +	/**
    +	 * Gets the value of the localID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getLocalID() {
    +		return localID;
    +	}
     
    -    /**
    -     * Sets the value of the localID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setLocalID(String value) {
    -        this.localID = value;
    -    }
    +	/**
    +	 * Sets the value of the localID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setLocalID(String value) {
    +		this.localID = value;
    +	}
     
    -    /**
    -     * Gets the value of the nationalID property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getNationalID() {
    -        return nationalID;
    -    }
    +	/**
    +	 * Gets the value of the nationalID property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getNationalID() {
    +		return nationalID;
    +	}
     
    -    /**
    -     * Sets the value of the nationalID property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setNationalID(String value) {
    -        this.nationalID = value;
    -    }
    +	/**
    +	 * Sets the value of the nationalID property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setNationalID(String value) {
    +		this.nationalID = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java
    index 8d1906142..0a79919d7 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import java.io.Serializable;
    @@ -24,11 +23,12 @@ import javax.xml.bind.annotation.XmlSeeAlso;
     import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.XmlValue;
     
    -
     /**
    - * 

    Java class for RichTextTagType complex type. + *

    + * Java class for RichTextTagType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="RichTextTagType">
    @@ -57,141 +57,122 @@ import javax.xml.bind.annotation.XmlValue;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "RichTextTagType", propOrder = {
    -    "content"
    -})
    -@XmlSeeAlso({
    -    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
    -    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.Level.class,
    -    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
    -    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
    -    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.LanguagesOfInstructionAndExaminationType.Language.class
    -})
    +@XmlType(name = "RichTextTagType", propOrder = { "content" })
    +@XmlSeeAlso({ eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
    +		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.Level.class,
    +		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
    +		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
    +		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.LanguagesOfInstructionAndExaminationType.Language.class })
     public class RichTextTagType {
     
    -    @XmlElementRefs({
    -        @XmlElementRef(name = "Underline", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "BreakLine", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "AttachedRef", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "Italic", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "Bold", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false)
    -    })
    -    @XmlMixed
    -    protected List content;
    -
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link String } - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >} - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - - /** - *

    Java class for anonymous complex type. - * - *

    The following schema fragment specifies the expected content contained within this class. - * - *

    -     * <complexType>
    -     *   <simpleContent>
    -     *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    -     *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    -     *     </extension>
    -     *   </simpleContent>
    -     * </complexType>
    -     * 
    - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class AttachedRef { - - @XmlValue - protected String value; - @XmlAttribute(name = "attachedID", required = true) - @XmlIDREF - @XmlSchemaType(name = "IDREF") - protected Object attachedID; - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the attachedID property. - * - * @return - * possible object is - * {@link Object } - * - */ - public Object getAttachedID() { - return attachedID; - } - - /** - * Sets the value of the attachedID property. - * - * @param value - * allowed object is - * {@link Object } - * - */ - public void setAttachedID(Object value) { - this.attachedID = value; - } - - } + @XmlElementRefs({ @XmlElementRef(name = "Underline", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false), + @XmlElementRef(name = "BreakLine", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false), + @XmlElementRef(name = "AttachedRef", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false), + @XmlElementRef(name = "Italic", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false), + @XmlElementRef(name = "Bold", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false) }) + @XmlMixed + protected List content; + + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <} + * {@link String }{@code >} {@link String } {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >} + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } + + /** + *

    + * Java class for anonymous complex type. + * + *

    + * The following schema fragment specifies the expected content contained within this class. + * + *

    +	 * <complexType>
    +	 *   <simpleContent>
    +	 *     <extension base="<urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
    +	 *       <attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
    +	 *     </extension>
    +	 *   </simpleContent>
    +	 * </complexType>
    +	 * 
    + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { "value" }) + public static class AttachedRef { + + @XmlValue + protected String value; + @XmlAttribute(name = "attachedID", required = true) + @XmlIDREF + @XmlSchemaType(name = "IDREF") + protected Object attachedID; + + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the attachedID property. + * + * @return possible object is {@link Object } + * + */ + public Object getAttachedID() { + return attachedID; + } + + /** + * Sets the value of the attachedID property. + * + * @param value + * allowed object is {@link Object } + * + */ + public void setAttachedID(Object value) { + this.attachedID = value; + } + + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java index 2fc0d4292..488f87974 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java @@ -5,19 +5,20 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for SourceGradeType. + *

    + * Java class for SourceGradeType. * - *

    The following schema fragment specifies the expected content contained within this class. *

    + * The following schema fragment specifies the expected content contained within this class. + *

    + * *

      * <simpleType name="SourceGradeType">
      *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
    @@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
     @XmlEnum
     public enum SourceGradeType {
     
    -    @XmlEnumValue("Recognized")
    -    RECOGNIZED("Recognized"),
    -    @XmlEnumValue("MobilityProgramme")
    -    MOBILITY_PROGRAMME("MobilityProgramme"),
    -    @XmlEnumValue("Another")
    -    ANOTHER("Another");
    -    private final String value;
    -
    -    SourceGradeType(String v) {
    -        value = v;
    -    }
    -
    -    public String value() {
    -        return value;
    -    }
    -
    -    public static SourceGradeType fromValue(String v) {
    -        for (SourceGradeType c: SourceGradeType.values()) {
    -            if (c.value.equals(v)) {
    -                return c;
    -            }
    -        }
    -        throw new IllegalArgumentException(v);
    -    }
    +	@XmlEnumValue("Recognized")
    +	RECOGNIZED("Recognized"), @XmlEnumValue("MobilityProgramme")
    +	MOBILITY_PROGRAMME("MobilityProgramme"), @XmlEnumValue("Another")
    +	ANOTHER("Another");
    +	private final String value;
    +
    +	SourceGradeType(String v) {
    +		value = v;
    +	}
    +
    +	public String value() {
    +		return value;
    +	}
    +
    +	public static SourceGradeType fromValue(String v) {
    +		for (SourceGradeType c : SourceGradeType.values()) {
    +			if (c.value.equals(v)) {
    +				return c;
    +			}
    +		}
    +		throw new IllegalArgumentException(v);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java
    index 2ca949caa..ea1e6e9bb 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
     import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for TitleConferredType complex type. + *

    + * Java class for TitleConferredType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="TitleConferredType">
    @@ -34,36 +34,31 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "TitleConferredType", propOrder = {
    -    "name"
    -})
    +@XmlType(name = "TitleConferredType", propOrder = { "name" })
     public class TitleConferredType {
     
    -    @XmlElement(name = "Name", required = true)
    -    protected String name;
    +	@XmlElement(name = "Name", required = true)
    +	protected String name;
     
    -    /**
    -     * Gets the value of the name property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getName() {
    -        return name;
    -    }
    +	/**
    +	 * Gets the value of the name property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Sets the value of the name property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setName(String value) {
    -        this.name = value;
    -    }
    +	/**
    +	 * Sets the value of the name property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setName(String value) {
    +		this.name = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java
    index 7d2131e52..0a37ab296 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java
    @@ -7,3 +7,4 @@
     
     @javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
     package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
    +
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
    index e2c2db71d..98e01dc8c 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
     
     import java.util.ArrayList;
    @@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlMixed;
     import javax.xml.bind.annotation.XmlSchemaType;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for CanonicalizationMethodType complex type. + *

    + * Java class for CanonicalizationMethodType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="CanonicalizationMethodType">
    @@ -40,70 +40,62 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "CanonicalizationMethodType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "CanonicalizationMethodType", propOrder = { "content" })
     public class CanonicalizationMethodType {
     
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "Algorithm", required = true)
    -    @XmlSchemaType(name = "anyURI")
    -    protected String algorithm;
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "Algorithm", required = true)
    +	@XmlSchemaType(name = "anyURI")
    +	protected String algorithm;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link String } - * {@link Object } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link String } {@link Object } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + /** + * Gets the value of the algorithm property. + * + * @return possible object is {@link String } + * + */ + public String getAlgorithm() { + return algorithm; + } - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } + /** + * Sets the value of the algorithm property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java index 7f7c48206..af0978a99 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for DSAKeyValueType complex type. + *

    + * Java class for DSAKeyValueType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="DSAKeyValueType">
    @@ -44,184 +44,155 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "DSAKeyValueType", propOrder = {
    -    "p",
    -    "q",
    -    "g",
    -    "y",
    -    "j",
    -    "seed",
    -    "pgenCounter"
    -})
    +@XmlType(name = "DSAKeyValueType", propOrder = { "p", "q", "g", "y", "j", "seed", "pgenCounter" })
     public class DSAKeyValueType {
     
    -    @XmlElement(name = "P")
    -    protected byte[] p;
    -    @XmlElement(name = "Q")
    -    protected byte[] q;
    -    @XmlElement(name = "G")
    -    protected byte[] g;
    -    @XmlElement(name = "Y", required = true)
    -    protected byte[] y;
    -    @XmlElement(name = "J")
    -    protected byte[] j;
    -    @XmlElement(name = "Seed")
    -    protected byte[] seed;
    -    @XmlElement(name = "PgenCounter")
    -    protected byte[] pgenCounter;
    -
    -    /**
    -     * Gets the value of the p property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getP() {
    -        return p;
    -    }
    -
    -    /**
    -     * Sets the value of the p property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setP(byte[] value) {
    -        this.p = value;
    -    }
    -
    -    /**
    -     * Gets the value of the q property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getQ() {
    -        return q;
    -    }
    -
    -    /**
    -     * Sets the value of the q property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setQ(byte[] value) {
    -        this.q = value;
    -    }
    -
    -    /**
    -     * Gets the value of the g property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getG() {
    -        return g;
    -    }
    -
    -    /**
    -     * Sets the value of the g property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setG(byte[] value) {
    -        this.g = value;
    -    }
    -
    -    /**
    -     * Gets the value of the y property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getY() {
    -        return y;
    -    }
    -
    -    /**
    -     * Sets the value of the y property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setY(byte[] value) {
    -        this.y = value;
    -    }
    -
    -    /**
    -     * Gets the value of the j property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getJ() {
    -        return j;
    -    }
    -
    -    /**
    -     * Sets the value of the j property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setJ(byte[] value) {
    -        this.j = value;
    -    }
    -
    -    /**
    -     * Gets the value of the seed property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getSeed() {
    -        return seed;
    -    }
    -
    -    /**
    -     * Sets the value of the seed property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setSeed(byte[] value) {
    -        this.seed = value;
    -    }
    -
    -    /**
    -     * Gets the value of the pgenCounter property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getPgenCounter() {
    -        return pgenCounter;
    -    }
    -
    -    /**
    -     * Sets the value of the pgenCounter property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setPgenCounter(byte[] value) {
    -        this.pgenCounter = value;
    -    }
    +	@XmlElement(name = "P")
    +	protected byte[] p;
    +	@XmlElement(name = "Q")
    +	protected byte[] q;
    +	@XmlElement(name = "G")
    +	protected byte[] g;
    +	@XmlElement(name = "Y", required = true)
    +	protected byte[] y;
    +	@XmlElement(name = "J")
    +	protected byte[] j;
    +	@XmlElement(name = "Seed")
    +	protected byte[] seed;
    +	@XmlElement(name = "PgenCounter")
    +	protected byte[] pgenCounter;
    +
    +	/**
    +	 * Gets the value of the p property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getP() {
    +		return p;
    +	}
    +
    +	/**
    +	 * Sets the value of the p property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setP(byte[] value) {
    +		this.p = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the q property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getQ() {
    +		return q;
    +	}
    +
    +	/**
    +	 * Sets the value of the q property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setQ(byte[] value) {
    +		this.q = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the g property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getG() {
    +		return g;
    +	}
    +
    +	/**
    +	 * Sets the value of the g property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setG(byte[] value) {
    +		this.g = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the y property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getY() {
    +		return y;
    +	}
    +
    +	/**
    +	 * Sets the value of the y property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setY(byte[] value) {
    +		this.y = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the j property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getJ() {
    +		return j;
    +	}
    +
    +	/**
    +	 * Sets the value of the j property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setJ(byte[] value) {
    +		this.j = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the seed property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getSeed() {
    +		return seed;
    +	}
    +
    +	/**
    +	 * Sets the value of the seed property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setSeed(byte[] value) {
    +		this.seed = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the pgenCounter property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getPgenCounter() {
    +		return pgenCounter;
    +	}
    +
    +	/**
    +	 * Sets the value of the pgenCounter property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setPgenCounter(byte[] value) {
    +		this.pgenCounter = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
    index 9d32757cb..e71a1fdd1 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
     
     import java.util.ArrayList;
    @@ -19,11 +18,12 @@ import javax.xml.bind.annotation.XmlSchemaType;
     import javax.xml.bind.annotation.XmlType;
     import org.w3c.dom.Element;
     
    -
     /**
    - * 

    Java class for DigestMethodType complex type. + *

    + * Java class for DigestMethodType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="DigestMethodType">
    @@ -41,71 +41,62 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "DigestMethodType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "DigestMethodType", propOrder = { "content" })
     public class DigestMethodType {
     
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "Algorithm", required = true)
    -    @XmlSchemaType(name = "anyURI")
    -    protected String algorithm;
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "Algorithm", required = true)
    +	@XmlSchemaType(name = "anyURI")
    +	protected String algorithm;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + /** + * Gets the value of the algorithm property. + * + * @return possible object is {@link String } + * + */ + public String getAlgorithm() { + return algorithm; + } - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } + /** + * Sets the value of the algorithm property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java index 638d398ae..b5fbd20b2 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -25,11 +24,12 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3c.dom.Element; - /** - *

    Java class for KeyInfoType complex type. + *

    + * Java class for KeyInfoType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="KeyInfoType">
    @@ -54,89 +54,73 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "KeyInfoType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "KeyInfoType", propOrder = { "content" })
     public class KeyInfoType {
     
    -    @XmlElementRefs({
    -        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    -    })
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    +	@XmlElementRefs({ @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} - * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link Element } - * {@link String } - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} - * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} {@link JAXBElement }{@code <}{@link X509DataType }{@code >} {@link Object } + * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link Element } {@link String } {@link JAXBElement }{@code <}{@link SPKIDataType } + * {@code >} {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java index 819c9d014..c4d1aea20 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlType; import org.w3c.dom.Element; - /** - *

    Java class for KeyValueType complex type. + *

    + * Java class for KeyValueType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="KeyValueType">
    @@ -43,50 +43,41 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "KeyValueType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "KeyValueType", propOrder = { "content" })
     public class KeyValueType {
     
    -    @XmlElementRefs({
    -        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    -    })
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    +	@XmlElementRefs({ @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} - * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} {@link JAXBElement }{@code <} + * {@link RSAKeyValueType }{@code >} {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java index 8f55486fa..cfd4a435d 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - /** - *

    Java class for ManifestType complex type. + *

    + * Java class for ManifestType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ManifestType">
    @@ -42,70 +42,63 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ManifestType", propOrder = {
    -    "reference"
    -})
    +@XmlType(name = "ManifestType", propOrder = { "reference" })
     public class ManifestType {
     
    -    @XmlElement(name = "Reference", required = true)
    -    protected List reference;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    +	@XmlElement(name = "Reference", required = true)
    +	protected List reference;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
     
    -    /**
    -     * Gets the value of the reference property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the reference property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getReference().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link ReferenceType } - * - * - */ - public List getReference() { - if (reference == null) { - reference = new ArrayList(); - } - return this.reference; - } + /** + * Gets the value of the reference property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the reference property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getReference().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link ReferenceType } + * + * + */ + public List getReference() { + if (reference == null) { + reference = new ArrayList(); + } + return this.reference; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java index 621d32125..64a1fd7e3 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.math.BigInteger; @@ -14,546 +13,538 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; - /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.w3._2000._09.xmldsig package. - *

    An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. + * This object contains factory methods for each Java content interface and Java element interface generated in the org.w3._2000._09.xmldsig package. + *

    + * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class. * */ @XmlRegistry public class ObjectFactory { - private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); - private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData"); - private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData"); - private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod"); - private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod"); - private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty"); - private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest"); - private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms"); - private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod"); - private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo"); - private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod"); - private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData"); - private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference"); - private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); - private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); - private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); - private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); - private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object"); - private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); - private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform"); - private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data"); - private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue"); - private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties"); - private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName"); - private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue"); - private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); - private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); - private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); - private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial"); - private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate"); - private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI"); - private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName"); - private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL"); - private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link KeyInfoType } - * - */ - public KeyInfoType createKeyInfoType() { - return new KeyInfoType(); - } - - /** - * Create an instance of {@link SignedInfoType } - * - */ - public SignedInfoType createSignedInfoType() { - return new SignedInfoType(); - } - - /** - * Create an instance of {@link RetrievalMethodType } - * - */ - public RetrievalMethodType createRetrievalMethodType() { - return new RetrievalMethodType(); - } - - /** - * Create an instance of {@link DigestMethodType } - * - */ - public DigestMethodType createDigestMethodType() { - return new DigestMethodType(); - } - - /** - * Create an instance of {@link SignatureMethodType } - * - */ - public SignatureMethodType createSignatureMethodType() { - return new SignatureMethodType(); - } - - /** - * Create an instance of {@link SPKIDataType } - * - */ - public SPKIDataType createSPKIDataType() { - return new SPKIDataType(); - } - - /** - * Create an instance of {@link X509DataType } - * - */ - public X509DataType createX509DataType() { - return new X509DataType(); - } - - /** - * Create an instance of {@link PGPDataType } - * - */ - public PGPDataType createPGPDataType() { - return new PGPDataType(); - } - - /** - * Create an instance of {@link SignatureType } - * - */ - public SignatureType createSignatureType() { - return new SignatureType(); - } - - /** - * Create an instance of {@link DSAKeyValueType } - * - */ - public DSAKeyValueType createDSAKeyValueType() { - return new DSAKeyValueType(); - } - - /** - * Create an instance of {@link ManifestType } - * - */ - public ManifestType createManifestType() { - return new ManifestType(); - } - - /** - * Create an instance of {@link SignatureValueType } - * - */ - public SignatureValueType createSignatureValueType() { - return new SignatureValueType(); - } - - /** - * Create an instance of {@link TransformsType } - * - */ - public TransformsType createTransformsType() { - return new TransformsType(); - } - - /** - * Create an instance of {@link RSAKeyValueType } - * - */ - public RSAKeyValueType createRSAKeyValueType() { - return new RSAKeyValueType(); - } - - /** - * Create an instance of {@link TransformType } - * - */ - public TransformType createTransformType() { - return new TransformType(); - } - - /** - * Create an instance of {@link SignaturePropertyType } - * - */ - public SignaturePropertyType createSignaturePropertyType() { - return new SignaturePropertyType(); - } - - /** - * Create an instance of {@link KeyValueType } - * - */ - public KeyValueType createKeyValueType() { - return new KeyValueType(); - } - - /** - * Create an instance of {@link ReferenceType } - * - */ - public ReferenceType createReferenceType() { - return new ReferenceType(); - } - - /** - * Create an instance of {@link CanonicalizationMethodType } - * - */ - public CanonicalizationMethodType createCanonicalizationMethodType() { - return new CanonicalizationMethodType(); - } - - /** - * Create an instance of {@link SignaturePropertiesType } - * - */ - public SignaturePropertiesType createSignaturePropertiesType() { - return new SignaturePropertiesType(); - } - - /** - * Create an instance of {@link ObjectType } - * - */ - public ObjectType createObjectType() { - return new ObjectType(); - } - - /** - * Create an instance of {@link X509IssuerSerialType } - * - */ - public X509IssuerSerialType createX509IssuerSerialType() { - return new X509IssuerSerialType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) - public JAXBElement createSignatureMethodTypeHMACOutputLength(BigInteger value) { - return new JAXBElement(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") - public JAXBElement createPGPData(PGPDataType value) { - return new JAXBElement(_PGPData_QNAME, PGPDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") - public JAXBElement createSPKIData(SPKIDataType value) { - return new JAXBElement(_SPKIData_QNAME, SPKIDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") - public JAXBElement createRetrievalMethod(RetrievalMethodType value) { - return new JAXBElement(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") - public JAXBElement createCanonicalizationMethod(CanonicalizationMethodType value) { - return new JAXBElement(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") - public JAXBElement createSignatureProperty(SignaturePropertyType value) { - return new JAXBElement(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") - public JAXBElement createManifest(ManifestType value) { - return new JAXBElement(_Manifest_QNAME, ManifestType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms") - public JAXBElement createTransforms(TransformsType value) { - return new JAXBElement(_Transforms_QNAME, TransformsType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod") - public JAXBElement createSignatureMethod(SignatureMethodType value) { - return new JAXBElement(_SignatureMethod_QNAME, SignatureMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") - public JAXBElement createKeyInfo(KeyInfoType value) { - return new JAXBElement(_KeyInfo_QNAME, KeyInfoType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") - public JAXBElement createDigestMethod(DigestMethodType value) { - return new JAXBElement(_DigestMethod_QNAME, DigestMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData") - public JAXBElement createMgmtData(String value) { - return new JAXBElement(_MgmtData_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") - public JAXBElement createReference(ReferenceType value) { - return new JAXBElement(_Reference_QNAME, ReferenceType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") - public JAXBElement createRSAKeyValue(RSAKeyValueType value) { - return new JAXBElement(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") - public JAXBElement createSignature(SignatureType value) { - return new JAXBElement(_Signature_QNAME, SignatureType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") - public JAXBElement createDSAKeyValue(DSAKeyValueType value) { - return new JAXBElement(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") - public JAXBElement createSignedInfo(SignedInfoType value) { - return new JAXBElement(_SignedInfo_QNAME, SignedInfoType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") - public JAXBElement createObject(ObjectType value) { - return new JAXBElement(_Object_QNAME, ObjectType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") - public JAXBElement createSignatureValue(SignatureValueType value) { - return new JAXBElement(_SignatureValue_QNAME, SignatureValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") - public JAXBElement createTransform(TransformType value) { - return new JAXBElement(_Transform_QNAME, TransformType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") - public JAXBElement createX509Data(X509DataType value) { - return new JAXBElement(_X509Data_QNAME, X509DataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") - public JAXBElement createDigestValue(byte[] value) { - return new JAXBElement(_DigestValue_QNAME, byte[].class, null, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties") - public JAXBElement createSignatureProperties(SignaturePropertiesType value) { - return new JAXBElement(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName") - public JAXBElement createKeyName(String value) { - return new JAXBElement(_KeyName_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue") - public JAXBElement createKeyValue(KeyValueType value) { - return new JAXBElement(_KeyValue_QNAME, KeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) - public JAXBElement createSPKIDataTypeSPKISexp(byte[] value) { - return new JAXBElement(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) - public JAXBElement createPGPDataTypePGPKeyID(byte[] value) { - return new JAXBElement(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) - public JAXBElement createPGPDataTypePGPKeyPacket(byte[] value) { - return new JAXBElement(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) { - return new JAXBElement(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509Certificate(byte[] value) { - return new JAXBElement(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509SKI(byte[] value) { - return new JAXBElement(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509SubjectName(String value) { - return new JAXBElement(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509CRL(byte[] value) { - return new JAXBElement(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) - public JAXBElement createTransformTypeXPath(String value) { - return new JAXBElement(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); - } + private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); + private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData"); + private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData"); + private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod"); + private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod"); + private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty"); + private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest"); + private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms"); + private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod"); + private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo"); + private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod"); + private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData"); + private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference"); + private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); + private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); + private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); + private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); + private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object"); + private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); + private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform"); + private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data"); + private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue"); + private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties"); + private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName"); + private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue"); + private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); + private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); + private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); + private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial"); + private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate"); + private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI"); + private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName"); + private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL"); + private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link KeyInfoType } + * + */ + public KeyInfoType createKeyInfoType() { + return new KeyInfoType(); + } + + /** + * Create an instance of {@link SignedInfoType } + * + */ + public SignedInfoType createSignedInfoType() { + return new SignedInfoType(); + } + + /** + * Create an instance of {@link RetrievalMethodType } + * + */ + public RetrievalMethodType createRetrievalMethodType() { + return new RetrievalMethodType(); + } + + /** + * Create an instance of {@link DigestMethodType } + * + */ + public DigestMethodType createDigestMethodType() { + return new DigestMethodType(); + } + + /** + * Create an instance of {@link SignatureMethodType } + * + */ + public SignatureMethodType createSignatureMethodType() { + return new SignatureMethodType(); + } + + /** + * Create an instance of {@link SPKIDataType } + * + */ + public SPKIDataType createSPKIDataType() { + return new SPKIDataType(); + } + + /** + * Create an instance of {@link X509DataType } + * + */ + public X509DataType createX509DataType() { + return new X509DataType(); + } + + /** + * Create an instance of {@link PGPDataType } + * + */ + public PGPDataType createPGPDataType() { + return new PGPDataType(); + } + + /** + * Create an instance of {@link SignatureType } + * + */ + public SignatureType createSignatureType() { + return new SignatureType(); + } + + /** + * Create an instance of {@link DSAKeyValueType } + * + */ + public DSAKeyValueType createDSAKeyValueType() { + return new DSAKeyValueType(); + } + + /** + * Create an instance of {@link ManifestType } + * + */ + public ManifestType createManifestType() { + return new ManifestType(); + } + + /** + * Create an instance of {@link SignatureValueType } + * + */ + public SignatureValueType createSignatureValueType() { + return new SignatureValueType(); + } + + /** + * Create an instance of {@link TransformsType } + * + */ + public TransformsType createTransformsType() { + return new TransformsType(); + } + + /** + * Create an instance of {@link RSAKeyValueType } + * + */ + public RSAKeyValueType createRSAKeyValueType() { + return new RSAKeyValueType(); + } + + /** + * Create an instance of {@link TransformType } + * + */ + public TransformType createTransformType() { + return new TransformType(); + } + + /** + * Create an instance of {@link SignaturePropertyType } + * + */ + public SignaturePropertyType createSignaturePropertyType() { + return new SignaturePropertyType(); + } + + /** + * Create an instance of {@link KeyValueType } + * + */ + public KeyValueType createKeyValueType() { + return new KeyValueType(); + } + + /** + * Create an instance of {@link ReferenceType } + * + */ + public ReferenceType createReferenceType() { + return new ReferenceType(); + } + + /** + * Create an instance of {@link CanonicalizationMethodType } + * + */ + public CanonicalizationMethodType createCanonicalizationMethodType() { + return new CanonicalizationMethodType(); + } + + /** + * Create an instance of {@link SignaturePropertiesType } + * + */ + public SignaturePropertiesType createSignaturePropertiesType() { + return new SignaturePropertiesType(); + } + + /** + * Create an instance of {@link ObjectType } + * + */ + public ObjectType createObjectType() { + return new ObjectType(); + } + + /** + * Create an instance of {@link X509IssuerSerialType } + * + */ + public X509IssuerSerialType createX509IssuerSerialType() { + return new X509IssuerSerialType(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) + public JAXBElement createSignatureMethodTypeHMACOutputLength(BigInteger value) { + return new JAXBElement(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") + public JAXBElement createPGPData(PGPDataType value) { + return new JAXBElement(_PGPData_QNAME, PGPDataType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") + public JAXBElement createSPKIData(SPKIDataType value) { + return new JAXBElement(_SPKIData_QNAME, SPKIDataType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") + public JAXBElement createRetrievalMethod(RetrievalMethodType value) { + return new JAXBElement(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") + public JAXBElement createCanonicalizationMethod(CanonicalizationMethodType value) { + return new JAXBElement(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") + public JAXBElement createSignatureProperty(SignaturePropertyType value) { + return new JAXBElement(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") + public JAXBElement createManifest(ManifestType value) { + return new JAXBElement(_Manifest_QNAME, ManifestType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms") + public JAXBElement createTransforms(TransformsType value) { + return new JAXBElement(_Transforms_QNAME, TransformsType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod") + public JAXBElement createSignatureMethod(SignatureMethodType value) { + return new JAXBElement(_SignatureMethod_QNAME, SignatureMethodType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") + public JAXBElement createKeyInfo(KeyInfoType value) { + return new JAXBElement(_KeyInfo_QNAME, KeyInfoType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") + public JAXBElement createDigestMethod(DigestMethodType value) { + return new JAXBElement(_DigestMethod_QNAME, DigestMethodType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData") + public JAXBElement createMgmtData(String value) { + return new JAXBElement(_MgmtData_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") + public JAXBElement createReference(ReferenceType value) { + return new JAXBElement(_Reference_QNAME, ReferenceType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") + public JAXBElement createRSAKeyValue(RSAKeyValueType value) { + return new JAXBElement(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") + public JAXBElement createSignature(SignatureType value) { + return new JAXBElement(_Signature_QNAME, SignatureType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") + public JAXBElement createDSAKeyValue(DSAKeyValueType value) { + return new JAXBElement(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") + public JAXBElement createSignedInfo(SignedInfoType value) { + return new JAXBElement(_SignedInfo_QNAME, SignedInfoType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") + public JAXBElement createObject(ObjectType value) { + return new JAXBElement(_Object_QNAME, ObjectType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") + public JAXBElement createSignatureValue(SignatureValueType value) { + return new JAXBElement(_SignatureValue_QNAME, SignatureValueType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") + public JAXBElement createTransform(TransformType value) { + return new JAXBElement(_Transform_QNAME, TransformType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") + public JAXBElement createX509Data(X509DataType value) { + return new JAXBElement(_X509Data_QNAME, X509DataType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") + public JAXBElement createDigestValue(byte[] value) { + return new JAXBElement(_DigestValue_QNAME, byte[].class, null, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties") + public JAXBElement createSignatureProperties(SignaturePropertiesType value) { + return new JAXBElement(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName") + public JAXBElement createKeyName(String value) { + return new JAXBElement(_KeyName_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue") + public JAXBElement createKeyValue(KeyValueType value) { + return new JAXBElement(_KeyValue_QNAME, KeyValueType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) + public JAXBElement createSPKIDataTypeSPKISexp(byte[] value) { + return new JAXBElement(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) + public JAXBElement createPGPDataTypePGPKeyID(byte[] value) { + return new JAXBElement(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) + public JAXBElement createPGPDataTypePGPKeyPacket(byte[] value) { + return new JAXBElement(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class) + public JAXBElement createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) { + return new JAXBElement(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class) + public JAXBElement createX509DataTypeX509Certificate(byte[] value) { + return new JAXBElement(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) + public JAXBElement createX509DataTypeX509SKI(byte[] value) { + return new JAXBElement(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class) + public JAXBElement createX509DataTypeX509SubjectName(String value) { + return new JAXBElement(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class) + public JAXBElement createX509DataTypeX509CRL(byte[] value) { + return new JAXBElement(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) + public JAXBElement createTransformTypeXPath(String value) { + return new JAXBElement(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java index 0c4509139..8f8573ead 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -22,11 +21,12 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3c.dom.Element; - /** - *

    Java class for ObjectType complex type. + *

    + * Java class for ObjectType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ObjectType">
    @@ -46,126 +46,111 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ObjectType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "ObjectType", propOrder = { "content" })
     public class ObjectType {
     
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    -    @XmlAttribute(name = "MimeType")
    -    protected String mimeType;
    -    @XmlAttribute(name = "Encoding")
    -    @XmlSchemaType(name = "anyURI")
    -    protected String encoding;
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
    +	@XmlAttribute(name = "MimeType")
    +	protected String mimeType;
    +	@XmlAttribute(name = "Encoding")
    +	@XmlSchemaType(name = "anyURI")
    +	protected String encoding;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } - /** - * Gets the value of the mimeType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMimeType() { - return mimeType; - } + /** + * Gets the value of the mimeType property. + * + * @return possible object is {@link String } + * + */ + public String getMimeType() { + return mimeType; + } - /** - * Sets the value of the mimeType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMimeType(String value) { - this.mimeType = value; - } + /** + * Sets the value of the mimeType property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setMimeType(String value) { + this.mimeType = value; + } - /** - * Gets the value of the encoding property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEncoding() { - return encoding; - } + /** + * Gets the value of the encoding property. + * + * @return possible object is {@link String } + * + */ + public String getEncoding() { + return encoding; + } - /** - * Sets the value of the encoding property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEncoding(String value) { - this.encoding = value; - } + /** + * Sets the value of the encoding property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setEncoding(String value) { + this.encoding = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java index 8c0e1ceaa..a43e2857c 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -19,11 +18,12 @@ import javax.xml.bind.annotation.XmlElementRefs; import javax.xml.bind.annotation.XmlType; import org.w3c.dom.Element; - /** - *

    Java class for PGPDataType complex type. + *

    + * Java class for PGPDataType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="PGPDataType">
    @@ -48,58 +48,46 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "PGPDataType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "PGPDataType", propOrder = { "content" })
     public class PGPDataType {
     
    -    @XmlElementRefs({
    -        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    -    })
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    +	@XmlElementRefs({ @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
    +	@XmlAnyElement(lax = true)
    +	protected List content;
     
    -    /**
    -     * Gets the rest of the content model. 
    -     * 
    -     * 

    - * You are getting this "catch-all" property because of the following reason: - * The field name "PGPKeyPacket" is used by two different parts of a schema. See: - * line 209 of file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd - * line 204 of file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd - *

    - * To get rid of this property, apply a property customization to one - * of both of the following declarations to change their names: - * Gets the value of the content property. - * - *

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Element } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the rest of the content model. + * + *

    + * You are getting this "catch-all" property because of the following reason: The field name "PGPKeyPacket" is used by two different parts of a schema. See: line 209 of + * file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd line 204 of + * file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd + *

    + * To get rid of this property, apply a property customization to one of both of the following declarations to change their names: Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Element } {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java index 892944965..eedb02899 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import javax.xml.bind.annotation.XmlAccessType; @@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for RSAKeyValueType complex type. + *

    + * Java class for RSAKeyValueType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="RSAKeyValueType">
    @@ -35,59 +35,50 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "RSAKeyValueType", propOrder = {
    -    "modulus",
    -    "exponent"
    -})
    +@XmlType(name = "RSAKeyValueType", propOrder = { "modulus", "exponent" })
     public class RSAKeyValueType {
     
    -    @XmlElement(name = "Modulus", required = true)
    -    protected byte[] modulus;
    -    @XmlElement(name = "Exponent", required = true)
    -    protected byte[] exponent;
    +	@XmlElement(name = "Modulus", required = true)
    +	protected byte[] modulus;
    +	@XmlElement(name = "Exponent", required = true)
    +	protected byte[] exponent;
     
    -    /**
    -     * Gets the value of the modulus property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getModulus() {
    -        return modulus;
    -    }
    +	/**
    +	 * Gets the value of the modulus property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getModulus() {
    +		return modulus;
    +	}
     
    -    /**
    -     * Sets the value of the modulus property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setModulus(byte[] value) {
    -        this.modulus = value;
    -    }
    +	/**
    +	 * Sets the value of the modulus property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setModulus(byte[] value) {
    +		this.modulus = value;
    +	}
     
    -    /**
    -     * Gets the value of the exponent property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getExponent() {
    -        return exponent;
    -    }
    +	/**
    +	 * Gets the value of the exponent property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getExponent() {
    +		return exponent;
    +	}
     
    -    /**
    -     * Sets the value of the exponent property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setExponent(byte[] value) {
    -        this.exponent = value;
    -    }
    +	/**
    +	 * Sets the value of the exponent property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setExponent(byte[] value) {
    +		this.exponent = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
    index 117949e65..83f03f3c8 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
     import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
     
    -
     /**
    - * 

    Java class for ReferenceType complex type. + *

    + * Java class for ReferenceType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="ReferenceType">
    @@ -44,171 +44,149 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "ReferenceType", propOrder = {
    -    "transforms",
    -    "digestMethod",
    -    "digestValue"
    -})
    +@XmlType(name = "ReferenceType", propOrder = { "transforms", "digestMethod", "digestValue" })
     public class ReferenceType {
     
    -    @XmlElement(name = "Transforms")
    -    protected TransformsType transforms;
    -    @XmlElement(name = "DigestMethod", required = true)
    -    protected DigestMethodType digestMethod;
    -    @XmlElement(name = "DigestValue", required = true)
    -    protected byte[] digestValue;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    -    @XmlAttribute(name = "URI")
    -    @XmlSchemaType(name = "anyURI")
    -    protected String uri;
    -    @XmlAttribute(name = "Type")
    -    @XmlSchemaType(name = "anyURI")
    -    protected String type;
    -
    -    /**
    -     * Gets the value of the transforms property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link TransformsType }
    -     *     
    -     */
    -    public TransformsType getTransforms() {
    -        return transforms;
    -    }
    -
    -    /**
    -     * Sets the value of the transforms property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link TransformsType }
    -     *     
    -     */
    -    public void setTransforms(TransformsType value) {
    -        this.transforms = value;
    -    }
    -
    -    /**
    -     * Gets the value of the digestMethod property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link DigestMethodType }
    -     *     
    -     */
    -    public DigestMethodType getDigestMethod() {
    -        return digestMethod;
    -    }
    -
    -    /**
    -     * Sets the value of the digestMethod property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link DigestMethodType }
    -     *     
    -     */
    -    public void setDigestMethod(DigestMethodType value) {
    -        this.digestMethod = value;
    -    }
    -
    -    /**
    -     * Gets the value of the digestValue property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getDigestValue() {
    -        return digestValue;
    -    }
    -
    -    /**
    -     * Sets the value of the digestValue property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setDigestValue(byte[] value) {
    -        this.digestValue = value;
    -    }
    -
    -    /**
    -     * Gets the value of the id property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getId() {
    -        return id;
    -    }
    -
    -    /**
    -     * Sets the value of the id property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setId(String value) {
    -        this.id = value;
    -    }
    -
    -    /**
    -     * Gets the value of the uri property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getURI() {
    -        return uri;
    -    }
    -
    -    /**
    -     * Sets the value of the uri property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setURI(String value) {
    -        this.uri = value;
    -    }
    -
    -    /**
    -     * Gets the value of the type property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getType() {
    -        return type;
    -    }
    -
    -    /**
    -     * Sets the value of the type property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setType(String value) {
    -        this.type = value;
    -    }
    +	@XmlElement(name = "Transforms")
    +	protected TransformsType transforms;
    +	@XmlElement(name = "DigestMethod", required = true)
    +	protected DigestMethodType digestMethod;
    +	@XmlElement(name = "DigestValue", required = true)
    +	protected byte[] digestValue;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
    +	@XmlAttribute(name = "URI")
    +	@XmlSchemaType(name = "anyURI")
    +	protected String uri;
    +	@XmlAttribute(name = "Type")
    +	@XmlSchemaType(name = "anyURI")
    +	protected String type;
    +
    +	/**
    +	 * Gets the value of the transforms property.
    +	 * 
    +	 * @return possible object is {@link TransformsType }
    +	 * 
    +	 */
    +	public TransformsType getTransforms() {
    +		return transforms;
    +	}
    +
    +	/**
    +	 * Sets the value of the transforms property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link TransformsType }
    +	 * 
    +	 */
    +	public void setTransforms(TransformsType value) {
    +		this.transforms = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the digestMethod property.
    +	 * 
    +	 * @return possible object is {@link DigestMethodType }
    +	 * 
    +	 */
    +	public DigestMethodType getDigestMethod() {
    +		return digestMethod;
    +	}
    +
    +	/**
    +	 * Sets the value of the digestMethod property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link DigestMethodType }
    +	 * 
    +	 */
    +	public void setDigestMethod(DigestMethodType value) {
    +		this.digestMethod = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the digestValue property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getDigestValue() {
    +		return digestValue;
    +	}
    +
    +	/**
    +	 * Sets the value of the digestValue property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setDigestValue(byte[] value) {
    +		this.digestValue = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the id property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getId() {
    +		return id;
    +	}
    +
    +	/**
    +	 * Sets the value of the id property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setId(String value) {
    +		this.id = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the uri property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getURI() {
    +		return uri;
    +	}
    +
    +	/**
    +	 * Sets the value of the uri property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setURI(String value) {
    +		this.uri = value;
    +	}
    +
    +	/**
    +	 * Gets the value of the type property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getType() {
    +		return type;
    +	}
    +
    +	/**
    +	 * Sets the value of the type property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setType(String value) {
    +		this.type = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
    index a8da5c998..6f1a94de5 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
     
     import javax.xml.bind.annotation.XmlAccessType;
    @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlElement;
     import javax.xml.bind.annotation.XmlSchemaType;
     import javax.xml.bind.annotation.XmlType;
     
    -
     /**
    - * 

    Java class for RetrievalMethodType complex type. + *

    + * Java class for RetrievalMethodType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="RetrievalMethodType">
    @@ -38,90 +38,79 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "RetrievalMethodType", propOrder = {
    -    "transforms"
    -})
    +@XmlType(name = "RetrievalMethodType", propOrder = { "transforms" })
     public class RetrievalMethodType {
     
    -    @XmlElement(name = "Transforms")
    -    protected TransformsType transforms;
    -    @XmlAttribute(name = "URI")
    -    @XmlSchemaType(name = "anyURI")
    -    protected String uri;
    -    @XmlAttribute(name = "Type")
    -    @XmlSchemaType(name = "anyURI")
    -    protected String type;
    +	@XmlElement(name = "Transforms")
    +	protected TransformsType transforms;
    +	@XmlAttribute(name = "URI")
    +	@XmlSchemaType(name = "anyURI")
    +	protected String uri;
    +	@XmlAttribute(name = "Type")
    +	@XmlSchemaType(name = "anyURI")
    +	protected String type;
     
    -    /**
    -     * Gets the value of the transforms property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link TransformsType }
    -     *     
    -     */
    -    public TransformsType getTransforms() {
    -        return transforms;
    -    }
    +	/**
    +	 * Gets the value of the transforms property.
    +	 * 
    +	 * @return possible object is {@link TransformsType }
    +	 * 
    +	 */
    +	public TransformsType getTransforms() {
    +		return transforms;
    +	}
     
    -    /**
    -     * Sets the value of the transforms property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link TransformsType }
    -     *     
    -     */
    -    public void setTransforms(TransformsType value) {
    -        this.transforms = value;
    -    }
    +	/**
    +	 * Sets the value of the transforms property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link TransformsType }
    +	 * 
    +	 */
    +	public void setTransforms(TransformsType value) {
    +		this.transforms = value;
    +	}
     
    -    /**
    -     * Gets the value of the uri property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getURI() {
    -        return uri;
    -    }
    +	/**
    +	 * Gets the value of the uri property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getURI() {
    +		return uri;
    +	}
     
    -    /**
    -     * Sets the value of the uri property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setURI(String value) {
    -        this.uri = value;
    -    }
    +	/**
    +	 * Sets the value of the uri property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setURI(String value) {
    +		this.uri = value;
    +	}
     
    -    /**
    -     * Gets the value of the type property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getType() {
    -        return type;
    -    }
    +	/**
    +	 * Gets the value of the type property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getType() {
    +		return type;
    +	}
     
    -    /**
    -     * Sets the value of the type property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setType(String value) {
    -        this.type = value;
    -    }
    +	/**
    +	 * Sets the value of the type property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setType(String value) {
    +		this.type = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
    index a8154f49f..5199fb0e2 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
     
     import java.util.ArrayList;
    @@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlElementRef;
     import javax.xml.bind.annotation.XmlType;
     import org.w3c.dom.Element;
     
    -
     /**
    - * 

    Java class for SPKIDataType complex type. + *

    + * Java class for SPKIDataType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="SPKIDataType">
    @@ -40,44 +40,38 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "SPKIDataType", propOrder = {
    -    "spkiSexpAndAny"
    -})
    +@XmlType(name = "SPKIDataType", propOrder = { "spkiSexpAndAny" })
     public class SPKIDataType {
     
    -    @XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
    -    @XmlAnyElement(lax = true)
    -    protected List spkiSexpAndAny;
    +	@XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
    +	@XmlAnyElement(lax = true)
    +	protected List spkiSexpAndAny;
     
    -    /**
    -     * Gets the value of the spkiSexpAndAny property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the spkiSexpAndAny property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSPKISexpAndAny().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Object } - * - * - */ - public List getSPKISexpAndAny() { - if (spkiSexpAndAny == null) { - spkiSexpAndAny = new ArrayList(); - } - return this.spkiSexpAndAny; - } + /** + * Gets the value of the spkiSexpAndAny property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the spkiSexpAndAny property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSPKISexpAndAny().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Element } {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Object } + * + * + */ + public List getSPKISexpAndAny() { + if (spkiSexpAndAny == null) { + spkiSexpAndAny = new ArrayList(); + } + return this.spkiSexpAndAny; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java index 20c22bd5b..4f5658011 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.math.BigInteger; @@ -21,11 +20,12 @@ import javax.xml.bind.annotation.XmlMixed; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for SignatureMethodType complex type. + *

    + * Java class for SignatureMethodType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="SignatureMethodType">
    @@ -44,72 +44,63 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "SignatureMethodType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "SignatureMethodType", propOrder = { "content" })
     public class SignatureMethodType {
     
    -    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "Algorithm", required = true)
    -    @XmlSchemaType(name = "anyURI")
    -    protected String algorithm;
    +	@XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "Algorithm", required = true)
    +	@XmlSchemaType(name = "anyURI")
    +	protected String algorithm;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} - * {@link Object } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link BigInteger }{@code >} {@link Object } {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + /** + * Gets the value of the algorithm property. + * + * @return possible object is {@link String } + * + */ + public String getAlgorithm() { + return algorithm; + } - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } + /** + * Sets the value of the algorithm property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java index 163e314d3..481abd165 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - /** - *

    Java class for SignaturePropertiesType complex type. + *

    + * Java class for SignaturePropertiesType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="SignaturePropertiesType">
    @@ -42,70 +42,63 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "SignaturePropertiesType", propOrder = {
    -    "signatureProperty"
    -})
    +@XmlType(name = "SignaturePropertiesType", propOrder = { "signatureProperty" })
     public class SignaturePropertiesType {
     
    -    @XmlElement(name = "SignatureProperty", required = true)
    -    protected List signatureProperty;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    +	@XmlElement(name = "SignatureProperty", required = true)
    +	protected List signatureProperty;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
     
    -    /**
    -     * Gets the value of the signatureProperty property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the signatureProperty property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getSignatureProperty().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link SignaturePropertyType } - * - * - */ - public List getSignatureProperty() { - if (signatureProperty == null) { - signatureProperty = new ArrayList(); - } - return this.signatureProperty; - } + /** + * Gets the value of the signatureProperty property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the signatureProperty property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getSignatureProperty().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link SignaturePropertyType } + * + * + */ + public List getSignatureProperty() { + if (signatureProperty == null) { + signatureProperty = new ArrayList(); + } + return this.signatureProperty; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java index 1963a7399..027675315 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -22,11 +21,12 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.w3c.dom.Element; - /** - *

    Java class for SignaturePropertyType complex type. + *

    + * Java class for SignaturePropertyType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="SignaturePropertyType">
    @@ -45,100 +45,88 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "SignaturePropertyType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "SignaturePropertyType", propOrder = { "content" })
     public class SignaturePropertyType {
     
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "Target", required = true)
    -    @XmlSchemaType(name = "anyURI")
    -    protected String target;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "Target", required = true)
    +	@XmlSchemaType(name = "anyURI")
    +	protected String target;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the target property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTarget() { - return target; - } + /** + * Gets the value of the target property. + * + * @return possible object is {@link String } + * + */ + public String getTarget() { + return target; + } - /** - * Sets the value of the target property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTarget(String value) { - this.target = value; - } + /** + * Sets the value of the target property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setTarget(String value) { + this.target = value; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java index 3e7a1b97c..131cee1bc 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - /** - *

    Java class for SignatureType complex type. + *

    + * Java class for SignatureType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="SignatureType">
    @@ -45,151 +45,132 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "SignatureType", propOrder = {
    -    "signedInfo",
    -    "signatureValue",
    -    "keyInfo",
    -    "object"
    -})
    +@XmlType(name = "SignatureType", propOrder = { "signedInfo", "signatureValue", "keyInfo", "object" })
     public class SignatureType {
     
    -    @XmlElement(name = "SignedInfo", required = true)
    -    protected SignedInfoType signedInfo;
    -    @XmlElement(name = "SignatureValue", required = true)
    -    protected SignatureValueType signatureValue;
    -    @XmlElement(name = "KeyInfo")
    -    protected KeyInfoType keyInfo;
    -    @XmlElement(name = "Object")
    -    protected List object;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    -
    -    /**
    -     * Gets the value of the signedInfo property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link SignedInfoType }
    -     *     
    -     */
    -    public SignedInfoType getSignedInfo() {
    -        return signedInfo;
    -    }
    -
    -    /**
    -     * Sets the value of the signedInfo property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link SignedInfoType }
    -     *     
    -     */
    -    public void setSignedInfo(SignedInfoType value) {
    -        this.signedInfo = value;
    -    }
    -
    -    /**
    -     * Gets the value of the signatureValue property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link SignatureValueType }
    -     *     
    -     */
    -    public SignatureValueType getSignatureValue() {
    -        return signatureValue;
    -    }
    -
    -    /**
    -     * Sets the value of the signatureValue property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link SignatureValueType }
    -     *     
    -     */
    -    public void setSignatureValue(SignatureValueType value) {
    -        this.signatureValue = value;
    -    }
    -
    -    /**
    -     * Gets the value of the keyInfo property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link KeyInfoType }
    -     *     
    -     */
    -    public KeyInfoType getKeyInfo() {
    -        return keyInfo;
    -    }
    -
    -    /**
    -     * Sets the value of the keyInfo property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link KeyInfoType }
    -     *     
    -     */
    -    public void setKeyInfo(KeyInfoType value) {
    -        this.keyInfo = value;
    -    }
    -
    -    /**
    -     * Gets the value of the object property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the object property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getObject().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link ObjectType } - * - * - */ - public List getObject() { - if (object == null) { - object = new ArrayList(); - } - return this.object; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + @XmlElement(name = "SignedInfo", required = true) + protected SignedInfoType signedInfo; + @XmlElement(name = "SignatureValue", required = true) + protected SignatureValueType signatureValue; + @XmlElement(name = "KeyInfo") + protected KeyInfoType keyInfo; + @XmlElement(name = "Object") + protected List object; + @XmlAttribute(name = "Id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + + /** + * Gets the value of the signedInfo property. + * + * @return possible object is {@link SignedInfoType } + * + */ + public SignedInfoType getSignedInfo() { + return signedInfo; + } + + /** + * Sets the value of the signedInfo property. + * + * @param value + * allowed object is {@link SignedInfoType } + * + */ + public void setSignedInfo(SignedInfoType value) { + this.signedInfo = value; + } + + /** + * Gets the value of the signatureValue property. + * + * @return possible object is {@link SignatureValueType } + * + */ + public SignatureValueType getSignatureValue() { + return signatureValue; + } + + /** + * Sets the value of the signatureValue property. + * + * @param value + * allowed object is {@link SignatureValueType } + * + */ + public void setSignatureValue(SignatureValueType value) { + this.signatureValue = value; + } + + /** + * Gets the value of the keyInfo property. + * + * @return possible object is {@link KeyInfoType } + * + */ + public KeyInfoType getKeyInfo() { + return keyInfo; + } + + /** + * Sets the value of the keyInfo property. + * + * @param value + * allowed object is {@link KeyInfoType } + * + */ + public void setKeyInfo(KeyInfoType value) { + this.keyInfo = value; + } + + /** + * Gets the value of the object property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the object property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getObject().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link ObjectType } + * + * + */ + public List getObject() { + if (object == null) { + object = new ArrayList(); + } + return this.object; + } + + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java index 6ae095c5a..af43e55cd 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import javax.xml.bind.annotation.XmlAccessType; @@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - /** - *

    Java class for SignatureValueType complex type. + *

    + * Java class for SignatureValueType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="SignatureValueType">
    @@ -37,63 +37,55 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "SignatureValueType", propOrder = {
    -    "value"
    -})
    +@XmlType(name = "SignatureValueType", propOrder = { "value" })
     public class SignatureValueType {
     
    -    @XmlValue
    -    protected byte[] value;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    +	@XmlValue
    +	protected byte[] value;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
     
    -    /**
    -     * Gets the value of the value property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     byte[]
    -     */
    -    public byte[] getValue() {
    -        return value;
    -    }
    +	/**
    +	 * Gets the value of the value property.
    +	 * 
    +	 * @return possible object is byte[]
    +	 */
    +	public byte[] getValue() {
    +		return value;
    +	}
     
    -    /**
    -     * Sets the value of the value property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     byte[]
    -     */
    -    public void setValue(byte[] value) {
    -        this.value = value;
    -    }
    +	/**
    +	 * Sets the value of the value property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is byte[]
    +	 */
    +	public void setValue(byte[] value) {
    +		this.value = value;
    +	}
     
    -    /**
    -     * Gets the value of the id property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getId() {
    -        return id;
    -    }
    +	/**
    +	 * Gets the value of the id property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getId() {
    +		return id;
    +	}
     
    -    /**
    -     * Sets the value of the id property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setId(String value) {
    -        this.id = value;
    -    }
    +	/**
    +	 * Sets the value of the id property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setId(String value) {
    +		this.id = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
    index cc82093ef..2523af53c 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
    @@ -5,7 +5,6 @@
     // Generated on: 2014.04.12 at 12:22:50 PM GMT 
     //
     
    -
     package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
     
     import java.util.ArrayList;
    @@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType;
     import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
     import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
     
    -
     /**
    - * 

    Java class for SignedInfoType complex type. + *

    + * Java class for SignedInfoType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="SignedInfoType">
    @@ -44,124 +44,109 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "SignedInfoType", propOrder = {
    -    "canonicalizationMethod",
    -    "signatureMethod",
    -    "reference"
    -})
    +@XmlType(name = "SignedInfoType", propOrder = { "canonicalizationMethod", "signatureMethod", "reference" })
     public class SignedInfoType {
     
    -    @XmlElement(name = "CanonicalizationMethod", required = true)
    -    protected CanonicalizationMethodType canonicalizationMethod;
    -    @XmlElement(name = "SignatureMethod", required = true)
    -    protected SignatureMethodType signatureMethod;
    -    @XmlElement(name = "Reference", required = true)
    -    protected List reference;
    -    @XmlAttribute(name = "Id")
    -    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    -    @XmlID
    -    @XmlSchemaType(name = "ID")
    -    protected String id;
    +	@XmlElement(name = "CanonicalizationMethod", required = true)
    +	protected CanonicalizationMethodType canonicalizationMethod;
    +	@XmlElement(name = "SignatureMethod", required = true)
    +	protected SignatureMethodType signatureMethod;
    +	@XmlElement(name = "Reference", required = true)
    +	protected List reference;
    +	@XmlAttribute(name = "Id")
    +	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    +	@XmlID
    +	@XmlSchemaType(name = "ID")
    +	protected String id;
     
    -    /**
    -     * Gets the value of the canonicalizationMethod property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link CanonicalizationMethodType }
    -     *     
    -     */
    -    public CanonicalizationMethodType getCanonicalizationMethod() {
    -        return canonicalizationMethod;
    -    }
    +	/**
    +	 * Gets the value of the canonicalizationMethod property.
    +	 * 
    +	 * @return possible object is {@link CanonicalizationMethodType }
    +	 * 
    +	 */
    +	public CanonicalizationMethodType getCanonicalizationMethod() {
    +		return canonicalizationMethod;
    +	}
     
    -    /**
    -     * Sets the value of the canonicalizationMethod property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link CanonicalizationMethodType }
    -     *     
    -     */
    -    public void setCanonicalizationMethod(CanonicalizationMethodType value) {
    -        this.canonicalizationMethod = value;
    -    }
    +	/**
    +	 * Sets the value of the canonicalizationMethod property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link CanonicalizationMethodType }
    +	 * 
    +	 */
    +	public void setCanonicalizationMethod(CanonicalizationMethodType value) {
    +		this.canonicalizationMethod = value;
    +	}
     
    -    /**
    -     * Gets the value of the signatureMethod property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link SignatureMethodType }
    -     *     
    -     */
    -    public SignatureMethodType getSignatureMethod() {
    -        return signatureMethod;
    -    }
    +	/**
    +	 * Gets the value of the signatureMethod property.
    +	 * 
    +	 * @return possible object is {@link SignatureMethodType }
    +	 * 
    +	 */
    +	public SignatureMethodType getSignatureMethod() {
    +		return signatureMethod;
    +	}
     
    -    /**
    -     * Sets the value of the signatureMethod property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link SignatureMethodType }
    -     *     
    -     */
    -    public void setSignatureMethod(SignatureMethodType value) {
    -        this.signatureMethod = value;
    -    }
    +	/**
    +	 * Sets the value of the signatureMethod property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link SignatureMethodType }
    +	 * 
    +	 */
    +	public void setSignatureMethod(SignatureMethodType value) {
    +		this.signatureMethod = value;
    +	}
     
    -    /**
    -     * Gets the value of the reference property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the reference property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getReference().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link ReferenceType } - * - * - */ - public List getReference() { - if (reference == null) { - reference = new ArrayList(); - } - return this.reference; - } + /** + * Gets the value of the reference property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the reference property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getReference().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link ReferenceType } + * + * + */ + public List getReference() { + if (reference == null) { + reference = new ArrayList(); + } + return this.reference; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the id property. + * + * @return possible object is {@link String } + * + */ + public String getId() { + return id; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setId(String value) { + this.id = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java index a56f59f0e..f47dc1251 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -21,11 +20,12 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import org.w3c.dom.Element; - /** - *

    Java class for TransformType complex type. + *

    + * Java class for TransformType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="TransformType">
    @@ -44,73 +44,63 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "TransformType", propOrder = {
    -    "content"
    -})
    +@XmlType(name = "TransformType", propOrder = { "content" })
     public class TransformType {
     
    -    @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    -    @XmlMixed
    -    @XmlAnyElement(lax = true)
    -    protected List content;
    -    @XmlAttribute(name = "Algorithm", required = true)
    -    @XmlSchemaType(name = "anyURI")
    -    protected String algorithm;
    +	@XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    +	@XmlMixed
    +	@XmlAnyElement(lax = true)
    +	protected List content;
    +	@XmlAttribute(name = "Algorithm", required = true)
    +	@XmlSchemaType(name = "anyURI")
    +	protected String algorithm;
     
    -    /**
    -     * Gets the value of the content property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getContent().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link Element } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } + /** + * Gets the value of the content property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the content property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getContent().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link Object } {@link JAXBElement }{@code <}{@link String }{@code >} {@link Element } {@link String } + * + * + */ + public List getContent() { + if (content == null) { + content = new ArrayList(); + } + return this.content; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + /** + * Gets the value of the algorithm property. + * + * @return possible object is {@link String } + * + */ + public String getAlgorithm() { + return algorithm; + } - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } + /** + * Sets the value of the algorithm property. + * + * @param value + * allowed object is {@link String } + * + */ + public void setAlgorithm(String value) { + this.algorithm = value; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java index e326030fd..b31f36764 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for TransformsType complex type. + *

    + * Java class for TransformsType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="TransformsType">
    @@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "TransformsType", propOrder = {
    -    "transform"
    -})
    +@XmlType(name = "TransformsType", propOrder = { "transform" })
     public class TransformsType {
     
    -    @XmlElement(name = "Transform", required = true)
    -    protected List transform;
    +	@XmlElement(name = "Transform", required = true)
    +	protected List transform;
     
    -    /**
    -     * Gets the value of the transform property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the transform property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getTransform().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link TransformType } - * - * - */ - public List getTransform() { - if (transform == null) { - transform = new ArrayList(); - } - return this.transform; - } + /** + * Gets the value of the transform property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the transform property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getTransform().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link TransformType } + * + * + */ + public List getTransform() { + if (transform == null) { + transform = new ArrayList(); + } + return this.transform; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java index 2fac2e33a..b6260d67d 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.util.ArrayList; @@ -19,11 +18,12 @@ import javax.xml.bind.annotation.XmlElementRefs; import javax.xml.bind.annotation.XmlType; import org.w3c.dom.Element; - /** - *

    Java class for X509DataType complex type. + *

    + * Java class for X509DataType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="X509DataType">
    @@ -47,54 +47,43 @@ import org.w3c.dom.Element;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "X509DataType", propOrder = {
    -    "x509IssuerSerialOrX509SKIOrX509SubjectName"
    -})
    +@XmlType(name = "X509DataType", propOrder = { "x509IssuerSerialOrX509SKIOrX509SubjectName" })
     public class X509DataType {
     
    -    @XmlElementRefs({
    -        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    -        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
    -    })
    -    @XmlAnyElement(lax = true)
    -    protected List x509IssuerSerialOrX509SKIOrX509SubjectName;
    +	@XmlElementRefs({ @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
    +			@XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
    +	@XmlAnyElement(lax = true)
    +	protected List x509IssuerSerialOrX509SKIOrX509SubjectName;
     
    -    /**
    -     * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName property.
    -     * 
    -     * 

    - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the x509IssuerSerialOrX509SKIOrX509SubjectName property. - * - *

    - * For example, to add a new item, do as follows: - *

    -     *    getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
    -     * 
    - * - * - *

    - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Object } - * {@link Element } - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - * - */ - public List getX509IssuerSerialOrX509SKIOrX509SubjectName() { - if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) { - x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList(); - } - return this.x509IssuerSerialOrX509SKIOrX509SubjectName; - } + /** + * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName property. + * + *

    + * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is + * not a set method for the x509IssuerSerialOrX509SKIOrX509SubjectName property. + * + *

    + * For example, to add a new item, do as follows: + * + *

    +	 * getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
    +	 * 
    + * + * + *

    + * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Object } {@link Element } + * {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * + * + */ + public List getX509IssuerSerialOrX509SKIOrX509SubjectName() { + if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) { + x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList(); + } + return this.x509IssuerSerialOrX509SKIOrX509SubjectName; + } } diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java index 48c70e6d0..7da3185c8 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java @@ -5,7 +5,6 @@ // Generated on: 2014.04.12 at 12:22:50 PM GMT // - package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig; import java.math.BigInteger; @@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; - /** - *

    Java class for X509IssuerSerialType complex type. + *

    + * Java class for X509IssuerSerialType complex type. * - *

    The following schema fragment specifies the expected content contained within this class. + *

    + * The following schema fragment specifies the expected content contained within this class. * *

      * <complexType name="X509IssuerSerialType">
    @@ -36,63 +36,54 @@ import javax.xml.bind.annotation.XmlType;
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
    -@XmlType(name = "X509IssuerSerialType", propOrder = {
    -    "x509IssuerName",
    -    "x509SerialNumber"
    -})
    +@XmlType(name = "X509IssuerSerialType", propOrder = { "x509IssuerName", "x509SerialNumber" })
     public class X509IssuerSerialType {
     
    -    @XmlElement(name = "X509IssuerName", required = true)
    -    protected String x509IssuerName;
    -    @XmlElement(name = "X509SerialNumber", required = true)
    -    protected BigInteger x509SerialNumber;
    +	@XmlElement(name = "X509IssuerName", required = true)
    +	protected String x509IssuerName;
    +	@XmlElement(name = "X509SerialNumber", required = true)
    +	protected BigInteger x509SerialNumber;
     
    -    /**
    -     * Gets the value of the x509IssuerName property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link String }
    -     *     
    -     */
    -    public String getX509IssuerName() {
    -        return x509IssuerName;
    -    }
    +	/**
    +	 * Gets the value of the x509IssuerName property.
    +	 * 
    +	 * @return possible object is {@link String }
    +	 * 
    +	 */
    +	public String getX509IssuerName() {
    +		return x509IssuerName;
    +	}
     
    -    /**
    -     * Sets the value of the x509IssuerName property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link String }
    -     *     
    -     */
    -    public void setX509IssuerName(String value) {
    -        this.x509IssuerName = value;
    -    }
    +	/**
    +	 * Sets the value of the x509IssuerName property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link String }
    +	 * 
    +	 */
    +	public void setX509IssuerName(String value) {
    +		this.x509IssuerName = value;
    +	}
     
    -    /**
    -     * Gets the value of the x509SerialNumber property.
    -     * 
    -     * @return
    -     *     possible object is
    -     *     {@link BigInteger }
    -     *     
    -     */
    -    public BigInteger getX509SerialNumber() {
    -        return x509SerialNumber;
    -    }
    +	/**
    +	 * Gets the value of the x509SerialNumber property.
    +	 * 
    +	 * @return possible object is {@link BigInteger }
    +	 * 
    +	 */
    +	public BigInteger getX509SerialNumber() {
    +		return x509SerialNumber;
    +	}
     
    -    /**
    -     * Sets the value of the x509SerialNumber property.
    -     * 
    -     * @param value
    -     *     allowed object is
    -     *     {@link BigInteger }
    -     *     
    -     */
    -    public void setX509SerialNumber(BigInteger value) {
    -        this.x509SerialNumber = value;
    -    }
    +	/**
    +	 * Sets the value of the x509SerialNumber property.
    +	 * 
    +	 * @param value
    +	 *            allowed object is {@link BigInteger }
    +	 * 
    +	 */
    +	public void setX509SerialNumber(BigInteger value) {
    +		this.x509SerialNumber = value;
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
    index 9d0e537e4..52572b90c 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
    @@ -7,3 +7,4 @@
     
     @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
     package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
    +
    diff --git a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
    index 1dfd6b319..d1c782f52 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
    @@ -1,366 +1,368 @@
     
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
     		
    -			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
     			
     		
     	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +				
    +				
    +				
    +				
    +			
    +			
    +				
    +				
    +				
    +				
    +				
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +		
    +			
    +			
    +			
    +			
     
    -	
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +		
    +	
    +	
    +		
    +			
    +		
    +		
    +		
    +		
    +		
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +				
    +				
    +				
    +				
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			
    +				
    +				
    +			
    +			
    +			
    +			
    +			
    +		
    +	
    +	
    +	
    +	
    +	
     		
    -			
    -			
    -			
    -			
    -			
    -			
    +			
    +			
     		
     	
    - 
    --->
    -
    -
    -
    -
    -
    -
    -
     
     	
     		
    @@ -390,7 +392,8 @@
     					
     				
     			
    -			
    +			
     		
     	
     
    diff --git a/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd b/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
    index 3728a7904..f51742e51 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
    @@ -1,3778 +1,4196 @@
     
     
    -		
    -    
    +	xmlns:aclan="urn:crue:academic:xsd:language:diplomasupplement"
    +	attributeFormDefault="unqualified" elementFormDefault="qualified"
    +	targetNamespace="urn:crue:academic:xsd:language:diplomasupplement"
    +	version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
     
    -    
    -        
    -            Academic year constraint YYYY-YY. (e.g. 2005-06, 2006-07, ...)
    -        
    -        
    -            
    -        
    -    
    -    
    -        
    -            ISO 3166-1-alpha-2
    -        
    -        
    -            
    -                
    -                    Andorra
    -                
    -            
    -            
    -                
    -                    United Arab Emirates
    -                
    -            
    -            
    -                
    -                    Afghanistan
    -                
    -            
    -            
    -                
    -                    Antigua and Barbuda
    -                
    -            
    -            
    -                
    -                    Albania
    -                
    -            
    -            
    -                
    -                    Armenia
    -                
    -            
    -            
    -                
    -                    Angola
    -                
    -            
    -            
    -                
    -                    Argentina
    -                
    -            
    -            
    -                
    -                    Austria
    -                
    -            
    -            
    -                
    -                    Australia
    -                
    -            
    -            
    -                
    -                    Azerbaijan
    -                
    -            
    -            
    -                
    -                    Bosnia and Herzegovina
    -                
    -            
    -            
    -                
    -                    Barbados
    -                
    -            
    -            
    -                
    -                    Bangladesh
    -                
    -            
    -            
    -                
    -                    Belgium
    -                
    -            
    -            
    -                
    -                    Burkina Faso
    -                
    -            
    -            
    -                
    -                    Bulgaria
    -                
    -            
    -            
    -                
    -                    Bahrain
    -                
    -            
    -            
    -                
    -                    Burundi
    -                
    -            
    -            
    -                
    -                    Benin
    -                
    -            
    -            
    -                
    -                    Brunei Darussalam
    -                
    -            
    -            
    -                
    -                    Bolivia
    -                
    -            
    -            
    -                
    -                    Brazil
    -                
    -            
    -            
    -                
    -                    Bahamas
    -                
    -            
    -            
    -                
    -                    Bhutan
    -                
    -            
    -            
    -                
    -                    Botswana
    -                
    -            
    -            
    -                
    -                    Belarus
    -                
    -            
    -            
    -                
    -                    Belize
    -                
    -            
    -            
    -                
    -                    Canada
    -                
    -            
    -            
    -                
    -                    Congo, Democratic Republic of the
    -                
    -            
    -            
    -                
    -                    Central African Republic
    -                
    -            
    -            
    -                
    -                    Congo, Republic of the
    -                
    -            
    -            
    -                
    -                    Switzerland
    -                
    -            
    -            
    -                
    -                    Cote d/Ivoire
    -                
    -            
    -            
    -                
    -                    Chile
    -                
    -            
    -            
    -                
    -                    Cameroon
    -                
    -            
    -            
    -                
    -                    China
    -                
    -            
    -            
    -                
    -                    Colombia
    -                
    -            
    -            
    -                
    -                    Costa Rica
    -                
    -            
    -            
    -                
    -                    Cuba
    -                
    -            
    -            
    -                
    -                    Cape Verde
    -                
    -            
    -            
    -                
    -                    Cyprus
    -                
    -            
    -            
    -                
    -                    Czech Republic
    -                
    -            
    -            
    -                
    -                    Germany
    -                
    -            
    -            
    -                
    -                    Djibouti
    -                
    -            
    -            
    -                
    -                    Denmark
    -                
    -            
    -            
    -                
    -                    Dominica
    -                
    -            
    -            
    -                
    -                    Dominican Republic
    -                
    -            
    -            
    -                
    -                    Algeria
    -                
    -            
    -            
    -                
    -                    Ecuador
    -                
    -            
    -            
    -                
    -                    Estonia
    -                
    -            
    -            
    -                
    -                    Egypt
    -                
    -            
    -            
    -                
    -                    Eritrea
    -                
    -            
    -            
    -                
    -                    Spain
    -                
    -            
    -            
    -                
    -                    Ethiopia
    -                
    -            
    -            
    -                
    -                    Finland
    -                
    -            
    -            
    -                
    -                    Fiji
    -                
    -            
    -            
    -                
    -                    Federated States of Micronesia
    -                
    -            
    -            
    -                
    -                    France
    -                
    -            
    -            
    -                
    -                    Gabon
    -                
    -            
    -            
    -                
    -                    United Kingdom
    -                
    -            
    -            
    -                
    -                    Grenada
    -                
    -            
    -            
    -                
    -                    Georgia
    -                
    -            
    -            
    -                
    -                    Ghana
    -                
    -            
    -            
    -                
    -                    Greenland
    -                
    -            
    -            
    -                
    -                    Gambia
    -                
    -            
    -            
    -                
    -                    Guinea
    -                
    -            
    -            
    -                
    -                    Equatorial Guinea
    -                
    -            
    -            
    -                
    -                    Greece
    -                
    -            
    -            
    -                
    -                    Guatemala
    -                
    -            
    -            
    -                
    -                    Guinea-Bissau
    -                
    -            
    -            
    -                
    -                    Guyana
    -                
    -            
    -            
    -                
    -                    Honduras
    -                
    -            
    -            
    -                
    -                    Croatia
    -                
    -            
    -            
    -                
    -                    Haiti
    -                
    -            
    -            
    -                
    -                    Hungary
    -                
    -            
    -            
    -                
    -                    Indonesia
    -                
    -            
    -            
    -                
    -                    Ireland
    -                
    -            
    -            
    -                
    -                    Israel
    -                
    -            
    -            
    -                
    -                    India
    -                
    -            
    -            
    -                
    -                    Iraq
    -                
    -            
    -            
    -                
    -                    Iran
    -                
    -            
    -            
    -                
    -                    Iceland
    -                
    -            
    -            
    -                
    -                    Italy
    -                
    -            
    -            
    -                
    -                    Jamaica
    -                
    -            
    -            
    -                
    -                    Jordan
    -                
    -            
    -            
    -                
    -                    Japan
    -                
    -            
    -            
    -                
    -                    Kenya
    -                
    -            
    -            
    -                
    -                    Kyrgyzstan
    -                
    -            
    -            
    -                
    -                    Cambodia
    -                
    -            
    -            
    -                
    -                    Kiribati
    -                
    -            
    -            
    -                
    -                    Comoros
    -                
    -            
    -            
    -                
    -                    Saint Kitts and Nevis
    -                
    -            
    -            
    -                
    -                    Korea, Democratic People/s Republic
    -                
    -            
    -            
    -                
    -                    Korea, Republic of
    -                
    -            
    -            
    -                
    -                    Kuwait
    -                
    -            
    -            
    -                
    -                    Kazakstan
    -                
    -            
    -            
    -                
    -                    Lao People/s Democratic Republic
    -                
    -            
    -            
    -                
    -                    Lebanon
    -                
    -            
    -            
    -                
    -                    Saint Lucia
    -                
    -            
    -            
    -                
    -                    Liechtenstein
    -                
    -            
    -            
    -                
    -                    Sri Lanka
    -                
    -            
    -            
    -                
    -                    Liberia
    -                
    -            
    -            
    -                
    -                    Lesotho
    -                
    -            
    -            
    -                
    -                    Lithuania
    -                
    -            
    -            
    -                
    -                    Luxembourg
    -                
    -            
    -            
    -                
    -                    Latvia
    -                
    -            
    -            
    -                
    -                    Libyan Arab Jamahiriya
    -                
    -            
    -            
    -                
    -                    Morocco
    -                
    -            
    -            
    -                
    -                    Monaco
    -                
    -            
    -            
    -                
    -                    Moldova, Republic of
    -                
    -            
    -            
    -                
    -                    Montenegro
    -                
    -            
    -            
    -                
    -                    Madagascar
    -                
    -            
    -            
    -                
    -                    Marshall Islands
    -                
    -            
    -            
    -                
    -                    Macedonia, the former Yugoslav Republic of
    -                
    -            
    -            
    -                
    -                    Mali
    -                
    -            
    -            
    -                
    -                    Myanmar
    -                
    -            
    -            
    -                
    -                    Mongolia
    -                
    -            
    -            
    -                
    -                    Mauritania
    -                
    -            
    -            
    -                
    -                    Malta
    -                
    -            
    -            
    -                
    -                    Mauritius
    -                
    -            
    -            
    -                
    -                    Maldives
    -                
    -            
    -            
    -                
    -                    Malawi
    -                
    -            
    -            
    -                
    -                    Mexico
    -                
    -            
    -            
    -                
    -                    Malaysia
    -                
    -            
    -            
    -                
    -                    Mozambique
    -                
    -            
    -            
    -                
    -                    Namibia
    -                
    -            
    -            
    -                
    -                    Niger
    -                
    -            
    -            
    -                
    -                    Nigeria
    -                
    -            
    -            
    -                
    -                    Nicaragua
    -                
    -            
    -            
    -                
    -                    Netherlands
    -                
    -            
    -            
    -                
    -                    Norway
    -                
    -            
    -            
    -                
    -                    Nepal
    -                
    -            
    -            
    -                
    -                    Nauru
    -                
    -            
    -            
    -                
    -                    Niue
    -                
    -            
    -            
    -                
    -                    New Zealand
    -                
    -            
    -            
    -                
    -                    Oman
    -                
    -            
    -            
    -                
    -                    Panama
    -                
    -            
    -            
    -                
    -                    Peru
    -                
    -            
    -            
    -                
    -                    Papua New Guinea
    -                
    -            
    -            
    -                
    -                    Philippines
    -                
    -            
    -            
    -                
    -                    Pakistan
    -                
    -            
    -            
    -                
    -                    Poland
    -                
    -            
    -            
    -                
    -                    Puerto Rico
    -                
    -            
    -            
    -                
    -                    Palestinian Territory, Occupied
    -                
    -            
    -            
    -                
    -                    Portugal
    -                
    -            
    -            
    -                
    -                    Palau
    -                
    -            
    -            
    -                
    -                    Paraguay
    -                
    -            
    -            
    -                
    -                    Qatar
    -                
    -            
    -            
    -                
    -                    Romania
    -                
    -            
    -            
    -                
    -                    Serbia
    -                
    -            
    -            
    -                
    -                    Russian Federation
    -                
    -            
    -            
    -                
    -                    Rwanda
    -                
    -            
    -            
    -                
    -                    Saudi Arabia
    -                
    -            
    -            
    -                
    -                    Solomon Islands
    -                
    -            
    -            
    -                
    -                    Seychelles
    -                
    -            
    -            
    -                
    -                    Sudan
    -                
    -            
    -            
    -                
    -                    Sweden
    -                
    -            
    -            
    -                
    -                    Singapore
    -                
    -            
    -            
    -                
    -                    Slovenia
    -                
    -            
    -            
    -                
    -                    Slovakia
    -                
    -            
    -            
    -                
    -                    Sierra Leone
    -                
    -            
    -            
    -                
    -                    San Marino
    -                
    -            
    -            
    -                
    -                    Senegal
    -                
    -            
    -            
    -                
    -                    Somalia
    -                
    -            
    -            
    -                
    -                    Suriname
    -                
    -            
    -            
    -                
    -                    Sao Tome and Principe
    -                
    -            
    -            
    -                
    -                    El Salvador
    -                
    -            
    -            
    -                
    -                    Syrian Arab Republic
    -                
    -            
    -            
    -                
    -                    Swaziland
    -                
    -            
    -            
    -                
    -                    Chad
    -                
    -            
    -            
    -                
    -                    Togo
    -                
    -            
    -            
    -                
    -                    Thailand
    -                
    -            
    -            
    -                
    -                    Tajikistan
    -                
    -            
    -            
    -                
    -                    Timor-Leste
    -                
    -            
    -            
    -                
    -                    Turkmenistan
    -                
    -            
    -            
    -                
    -                    Tunisia
    -                
    -            
    -            
    -                
    -                    Tonga
    -                
    -            
    -            
    -                
    -                    Turkey
    -                
    -            
    -            
    -                
    -                    Trindidad and Tobago
    -                
    -            
    -            
    -                
    -                    Tuvalu
    -                
    -            
    -            
    -                
    -                    Tanzania, United republic of
    -                
    -            
    -            
    -                
    -                    Ukraina
    -                
    -            
    -            
    -                
    -                    Uganda
    -                
    -            
    -            
    -                
    -                    United States
    -                
    -            
    -            
    -                
    -                    Uruguay
    -                
    -            
    -            
    -                
    -                    Uzbekistan
    -                
    -            
    -            
    -                
    -                    Holy See (Vatican City State)
    -                
    -            
    -            
    -                
    -                    Saint Vincent and the Granadines
    -                
    -            
    -            
    -                
    -                    Venezuela
    -                
    -            
    -            
    -                
    -                    Viet Nam
    -                
    -            
    -            
    -                
    -                    Vanuatu
    -                
    -            
    -            
    -                
    -                    Samoa
    -                
    -            
    -            
    -                
    -                    Yemen
    -                
    -            
    -            
    -                
    -                    South Africa
    -                
    -            
    -            
    -                
    -                    Zambia
    -                
    -            
    -            
    -                
    -                    Zimbabwe
    -                
    -            
    -        
    -    
    -    
    -        
    -            Type of course unit
    -        
    -        
    -            
    -                
    -                    Compulsory
    -                
    -            
    -            
    -                
    -                    Optional
    -                
    -            
    -        
    -    
    -    
    -        
    -            Date format yyyy-mm-dd. Ex.: 2013-05-04, ...
    -        
    -        
    -    
    -    
    -        
    -            ECTS grading scale
    -        
    -        
    -            
    -                
    -                    Top 10%
    -                
    -            
    -            
    -                
    -                    Next 25%
    -                
    -            
    -            
    -                
    -                    Next 30%
    -                
    -            
    -            
    -                
    -                    Next 25%
    -                
    -            
    -            
    -                
    -                    Lowest 10%
    -                
    -            
    -            
    -                
    -                    Fail
    -                
    -            
    -            
    -                
    -                    Fail
    -                
    -            
    -        
    -    
    -    
    -        
    -            E-Mail address constraint
    -        
    -        
    -    
    -    
    -        
    -            EHEA Framework (Bologna: Framework of Qualifications/European Qualifications Framework)
    -        
    -        
    -            
    -                
    -                    First Cycle
    -                
    -            
    -            
    -                
    -                    Second Cycle
    -                
    -            
    -            
    -                
    -                    Third Cycle
    -                
    -            
    -        
    -    
    -    
    -        
    -            Empty text constraint
    -        
    -        
    -            
    -                Empty text constraint
    -            
    -            
    -        
    -    
    -    
    -        
    -            Gender
    -        
    -        
    -            
    -                
    -                    Female
    -                
    -            
    -            
    -                
    -                    Male
    -                
    -            
    -        
    -    
    -    
    -        
    -            MIME: Type image
    -        
    -        
    -            
    -                
    -                    GIF image
    -                
    -            
    -            
    -                
    -                    JPEG JFIF image
    -                
    -            
    -            
    -                
    -                    JPEG JFIF image
    -                
    -            
    -            
    -                
    -                    Portable Network Graphics
    -                
    -            
    -            
    -                
    -                    Tag Image File Format
    -                
    -            
    -        
    -    
    -    
    -        
    -            International Standard Classification of Education (ISCED) 1997
    -        
    -        
    -            
    -                
    -                    Level 0: Pre-primary education
    -                
    -            
    -            
    -                
    -                    Level 1: Primary education or first stage of basic education
    -                
    -            
    -            
    -                
    -                    Level 2: Lower secondary education or second stage of basic education
    -                
    -            
    -            
    -                
    -                    Level 3: Upper secondary education
    -                
    -            
    -            
    -                
    -                    Level 4: Post-secondary non-tertiary education
    -                
    -            
    -            
    -                
    -                    Level 5A: First stage of tertiary education: largely theoretically based programmes intended to provide qualifications for gaining entry into more advanced research programmes and professions with higher skills requirements
    -                
    -            
    -            
    -                
    -                    Level 5B: First stage of tertiary education: shorter, more practical/technical/occupationally specific prgrammes leading to professional qualifications
    -                
    -            
    -            
    -                
    -                    Level 6: Second stage of tertiary education (leading to an advanced research qualification)
    -                
    -            
    -        
    -    
    -    
    -        
    -            International Standard Classification of Education (ISCED) 2011
    -        
    -        
    -            
    -                
    -                    Level 0: Early childhood Education
    -                
    -            
    -            
    -                
    -                    Level 1: Primary education
    -                
    -            
    -            
    -                
    -                    Level 2: Lower secondary education
    -                
    -            
    -            
    -                
    -                    Level 3: Upper secondary education
    -                
    -            
    -            
    -                
    -                    Level 4: Post-secondary non-tertiary education
    -                
    -            
    -            
    -                
    -                    Level 5: Short-cycle teriary education
    -                
    -            
    -            
    -                
    -                    Level 6: Bachelor or equivalent
    -                
    -            
    -            
    -                
    -                    Level 7: Master or equivalent
    -                
    -            
    -            
    -                
    -                    Level 8: Doctoral or equivalent
    -                
    -            
    -        
    -    
    -    
    -        
    -            ISO 639-1 languages
    -        
    -        
    -            
    -                
    -                    Abkhazian
    -                
    -            
    -            
    -                
    -                    Afrikaans
    -                
    -            
    -            
    -                
    -                    Aragonese
    -                
    -            
    -            
    -                
    -                    Arabic
    -                
    -            
    -            
    -                
    -                    Assamese
    -                
    -            
    -            
    -                
    -                    Azerbaijani
    -                
    -            
    -            
    -                
    -                    Belarusian
    -                
    -            
    -            
    -                
    -                    Bulgarian
    -                
    -            
    -            
    -                
    -                    Bengali
    -                
    -            
    -            
    -                
    -                    Tibetan
    -                
    -            
    -            
    -                
    -                    Breton
    -                
    -            
    -            
    -                
    -                    Bosnian
    -                
    -            
    -            
    -                
    -                    Catalan / Valencian
    -                
    -            
    -            
    -                
    -                    Chechen
    -                
    -            
    -            
    -                
    -                    Corsican
    -                
    -            
    -            
    -                
    -                    Czech
    -                
    -            
    -            
    -                
    -                    Welsh
    -                
    -            
    -            
    -                
    -                    Danish
    -                
    -            
    -            
    -                
    -                    German
    -                
    -            
    -            
    -                
    -                    Greek
    -                
    -            
    -            
    -                
    -                    English
    -                
    -            
    -            
    -                
    -                    Spanish / Castilian
    -                
    -            
    -            
    -                
    -                    Estonian
    -                
    -            
    -            
    -                
    -                    Basque
    -                
    -            
    -            
    -                
    -                    Persian
    -                
    -            
    -            
    -                
    -                    Finnish
    -                
    -            
    -            
    -                
    -                    Fijian
    -                
    -            
    -            
    -                
    -                    Faroese
    -                
    -            
    -            
    -                
    -                    French
    -                
    -            
    -            
    -                
    -                    Western Frisian
    -                
    -            
    -            
    -                
    -                    Irish
    -                
    -            
    -            
    -                
    -                    Gaelic / Scottish Gaelic
    -                
    -            
    -            
    -                
    -                    Galician
    -                
    -            
    -            
    -                
    -                    Manx
    -                
    -            
    -            
    -                
    -                    Ancient Greek
    -                
    -            
    -            
    -                
    -                    Alemanic; Swiss German
    -                
    -            
    -            
    -                
    -                    Hebrew
    -                
    -            
    -            
    -                
    -                    Hindi
    -                
    -            
    -            
    -                
    -                    Croatian
    -                
    -            
    -            
    -                
    -                    Haitian; Haitian Creole
    -                
    -            
    -            
    -                
    -                    Hungarian
    -                
    -            
    -            
    -                
    -                    Armenian
    -                
    -            
    -            
    -                
    -                    Indonesian
    -                
    -            
    -            
    -                
    -                    Icelandic
    -                
    -            
    -            
    -                
    -                    Italian
    -                
    -            
    -            
    -                
    -                    Japanese
    -                
    -            
    -            
    -                
    -                    Javanese
    -                
    -            
    -            
    -                
    -                    Georgian
    -                
    -            
    -            
    -                
    -                    Kongo
    -                
    -            
    -            
    -                
    -                    Korean
    -                
    -            
    -            
    -                
    -                    Kurdish
    -                
    -            
    -            
    -                
    -                    Cornish
    -                
    -            
    -            
    -                
    -                    Kirghiz
    -                
    -            
    -            
    -                
    -                    Luxembourgish; Letzeburgesch
    -                
    -            
    -            
    -                
    -                    Limburgan; Limburger; Limburgish
    -                
    -            
    -            
    -                
    -                    Lingala
    -                
    -            
    -            
    -                
    -                    Lithuanian
    -                
    -            
    -            
    -                
    -                    Latvian
    -                
    -            
    -            
    -                
    -                    Malagasy
    -                
    -            
    -            
    -                
    -                    Macedonian
    -                
    -            
    -            
    -                
    -                    Mongolian
    -                
    -            
    -            
    -                
    -                    Moldavian
    -                
    -            
    -            
    -                
    -                    Malay
    -                
    -            
    -            
    -                
    -                    Maltese
    -                
    -            
    -            
    -                
    -                    Burmese
    -                
    -            
    -            
    -                
    -                    Norwegian (Bokmål)
    -                
    -            
    -            
    -                
    -                    Nepali
    -                
    -            
    -            
    -                
    -                    Dutch
    -                
    -            
    -            
    -                
    -                    Norwegian (Nynorsk)
    -                
    -            
    -            
    -                
    -                    Norwegian
    -                
    -            
    -            
    -                
    -                    Polish
    -                
    -            
    -            
    -                
    -                    Portuguese
    -                
    -            
    -            
    -                
    -                    Raeto-Romance
    -                
    -            
    -            
    -                
    -                    Romanian
    -                
    -            
    -            
    -                
    -                    Russian
    -                
    -            
    -            
    -                
    -                    Sardinian
    -                
    -            
    -            
    -                
    -                    Northern Sami
    -                
    -            
    -            
    -                
    -                    Slovak
    -                
    -            
    -            
    -                
    -                    Slovenian
    -                
    -            
    -            
    -                
    -                    Somali
    -                
    -            
    -            
    -                
    -                    Albanian
    -                
    -            
    -            
    -                
    -                    Serbian
    -                
    -            
    -            
    -                
    -                    Swedish
    -                
    -            
    -            
    -                
    -                    Swahili
    -                
    -            
    -            
    -                
    -                    Turkmen
    -                
    -            
    -            
    -                
    -                    Turkish
    -                
    -            
    -            
    -                
    -                    Tahitian
    -                
    -            
    -            
    -                
    -                    Ukrainian
    -                
    -            
    -            
    -                
    -                    Urdu
    -                
    -            
    -            
    -                
    -                    Uzbek
    -                
    -            
    -            
    -                
    -                    Vietnamese
    -                
    -            
    -            
    -                
    -                    Yiddish
    -                
    -            
    -            
    -                
    -                    Chinese
    -                
    -            
    -            
    -                
    -                    Church Slavic
    -                
    -            
    -            
    -                
    -                    Esperanto
    -                
    -            
    -            
    -                
    -                    Latin
    -                
    -            
    -            
    -                
    -                    Occitan (post 1500); Provençal
    -                
    -            
    -            
    -                
    -                    VVolapük
    -                
    -            
    -        
    -    
    -    
    -        
    -            MIME types
    -        
    -        
    -            
    -                
    -                    GIF image
    -                
    -            
    -            
    -                
    -                    JPEG JFIF image
    -                
    -            
    -            
    -                
    -                    JPEG JFIF image
    -                
    -            
    -            
    -                
    -                    Portable Network Graphics
    -                
    -            
    -            
    -                
    -                    Tag Image File Format
    -                
    -            
    -            
    -                
    -                    HTML
    -                
    -            
    -            
    -                
    -                    Portable Document Format
    -                
    -            
    -        
    -    
    -    
    -        
    -            Mode of study
    -        
    -        
    -            
    -                
    -                    Full time
    -                
    -            
    -            
    -                
    -                    Par time
    -                
    -            
    -            
    -                
    -                    Distance
    -                
    -            
    -            
    -                
    -                    eLearning
    -                
    -            
    -            
    -                
    -                    Another
    -                
    -            
    -        
    -    
    -    
    -        
    -            Model of delivery
    -        
    -        
    -            
    -                
    -                    Face-to-face
    -                
    -            
    -            
    -                
    -                    Distance learning
    -                
    -            
    -        
    -    
    -    
    -        
    -            National Framework of Qualifications (NFQ) Level 
    -        
    -        
    -    
    -    
    -        
    -            Plain text constraint
    -        
    -        
    -            
    -                Non empty text
    -            
    -            
    -        
    -    
    -    
    -        
    -            Percent constraint
    -        
    -        
    -            
    -                Restriction between 0 and 100
    -            
    -            
    -            
    -        
    -    
    -    
    -        
    -            Positive decimal number
    -        
    -        
    -            
    -                Positive decimal numbers restriction
    -            
    -            
    -        
    -    
    -    
    -        
    -            Positive integer number
    -        
    -        
    -            
    -                Positive integer numbers restriction
    -            
    -            
    -        
    -    
    -    
    -        
    -            Source of the course unit performance
    -        
    -        
    -            
    -                
    -                    Recognized
    -                
    -            
    -            
    -                
    -                    Course unit attended in mobility programme
    -                
    -            
    -            
    -                
    -                    Another
    -                
    -            
    -        
    -    
    -    
    -        
    -            Uniform Resource Locator (URL)
    -        
    -        
    -            
    -                http and https restriction
    -            
    -            
    -            
    -        
    -    
    -    
    -        
    -            Additional information
    -        
    -        
    -            
    -                
    -                    Specific information
    -                
    -            
    -            
    -                
    -                    Other sources
    -                
    -            
    -        
    -    
    -    
    -        
    -            Address
    -        
    -        
    -            
    -                
    -                    Name, street, PO box, ...
    -                
    -            
    -            
    -                
    -                    City
    -                
    -            
    -            
    -                
    -                    State or region
    -                
    -            
    -            
    -                
    -                    Postal code
    -                
    -            
    -            
    -                
    -                    Country
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Country code ISO 3166-1-alpha-2
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Data file
    -        
    -        
    -            
    -                
    -                    Description
    -                
    -            
    -            
    -                
    -                    MIME type code
    -                
    -            
    -            
    -                
    -                    Base64 binary data
    -                
    -            
    -        
    -    
    -    
    -        
    -            URL reference to the file
    -        
    -        
    -            
    -                
    -                    Description
    -                
    -            
    -            
    -                
    -                    MIME type code
    -                
    -            
    -            
    -                
    -                    URL
    -                
    -            
    -        
    -    
    -    
    -        
    -            Image data file
    -        
    -        
    -            
    -                
    -                    Description
    -                
    -            
    -            
    -                
    -                    MIME type image code
    -                
    -            
    -            
    -                
    -                    Base64 binary data
    -                
    -            
    -        
    -    
    -    
    -        
    -            URL reference to the image file
    -        
    -        
    -            
    -                
    -                    Description
    -                
    -            
    -            
    -                
    -                    MIME type image code
    -                
    -            
    -            
    -                
    -                    URL
    -                
    -            
    -        
    -    
    -    
    -        
    -            Attachment resource
    -        
    -        
    -            
    -                
    -                    Data file
    -                
    -            
    -            
    -                
    -                    URL reference to the file
    -                
    -            
    -            
    -                
    -                    Image data file
    -                
    -            
    -            
    -                
    -                    URL reference to the image file
    -                
    -            
    -        
    -        
    -            
    -                Attached identifier
    -            
    -        
    -    
    -    
    -        
    -            Attachments resources
    -        
    -        
    -            
    -                
    -                    Attachment resource
    -                
    -            
    -        
    -    
    -    
    -        
    -            Certification of the Supplement
    -        
    -        
    -            
    -                
    -                    Date was issued
    -                
    -            
    -            
    -                
    -                    Officials certifying
    -                
    -            
    -            
    -                
    -                    Official stamp or seal of the institution
    -                
    -            
    -        
    -    
    -    
    -        
    -            Contact information
    -        
    -        
    -            
    -                
    -                    Address
    -                
    -            
    -            
    -                
    -                    Phone number
    -                
    -            
    -            
    -                
    -                    E-Mail address
    -                
    -            
    -            
    -                
    -                    Web site
    -                
    -            
    -        
    -    
    -    
    -        
    -            
    -                
    -                    Mobility programme
    -                
    -            
    -        
    -    
    -    
    -        
    -            Course structure diagram
    -        
    -        
    -            
    -                
    -                    Courses groups
    -                
    -            
    -            
    -                
    -                    Course units
    -                
    -                
    -                    
    -                        Unique: Course unit code
    -                    
    -                    
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Course units
    -        
    -        
    -            
    -                
    -                    Course unit
    -                
    -            
    -        
    -    
    -    
    -        
    -            Language of instruction
    -        
    -        
    -            
    -                
    -                    Language of instruction
    -                
    -            
    -        
    -    
    -    
    -        
    -            Student performance
    -        
    -        
    -            
    -                
    -                    Local grade
    -                
    -            
    -            
    -                
    -                    ECTS grade
    -                
    -            
    -        
    -    
    -    
    -        
    -            Course unit
    -        
    -        
    -            
    -                
    -                    Course unit code
    -                
    -            
    -            
    -            
    -                
    -                    Course unit title
    -                
    -            
    -            
    -                
    -                    Theme (example: Academic project)
    -                
    -            
    -            
    -                
    -                    Type of course unit
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Type of course unit code
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Year of study
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Year of study
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Level of course unit
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    EHEA Framework code
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Number of ECTS credits
    -                
    -            
    -            
    -                
    -                    Number of local credits
    -                
    -            
    -            
    -                
    -                    Number of hours
    -                
    -            
    -            
    -                
    -                    Languages of instruction
    -                
    -                
    -                    
    -                        Unique: Language
    -                    
    -                    
    -                    
    -                
    -            
    -            
    -                
    -                    Mode of delivery
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Mode of delivery oode
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Work placements
    -                
    -            
    -            
    -                
    -                    Student performance
    -                
    -            
    -            
    -                
    -                    Name of lecturer(s)
    -                
    -            
    -            
    -                
    -                    Learning outcomes of the course unit
    -                
    -            
    -            
    -                
    -                    Prerequisites and co-requisites
    -                
    -            
    -            
    -                
    -                    Recomended optional programme components
    -                
    -            
    -            
    -                
    -                    Course contents
    -                
    -            
    -            
    -                
    -                    Recomended or required reading
    -                
    -            
    -            
    -                
    -                    Planed learning activities and teaching method
    -                
    -            
    -            
    -                
    -                    Assesment methods and criteria
    -                
    -            
    -            
    -                
    -                    Observations
    -                
    -            
    -        
    -        
    -            
    -                Group identifier
    -            
    -        
    -        
    -            
    -                Institution administering studies identifier 
    -            
    -        
    -        
    -            
    -                Is required by the programme?
    -            
    -        
    -    
    -    
    -        
    -            Course unit work placements
    -        
    -        
    -            
    -                
    -                    Work placement
    -                
    -            
    -        
    -    
    -    
    -        
    -            Course unit work placement
    -        
    -        
    -            
    -                
    -                    Name of collaborating institution
    -                
    -            
    -            
    -                
    -                    Date from
    -                
    -            
    -            
    -                
    -                    Date to
    -                
    -            
    -            
    -                
    -                    Training Hours
    -                
    -            
    -        
    -    
    -    
    -        
    -            Language of instruction
    -        
    -        
    -            
    -                
    -                    
    -                        Language code ISO 639-1 of the Supplement
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Diploma Supplement
    -        
    -        
    -            
    -                
    -                    Information identifying the holder of the qualification
    -                
    -            
    -            
    -                
    -                    Information identifying the qualification
    -                
    -            
    -            
    -                
    -                    Information on the level of the qualification
    -                
    -            
    -            
    -                
    -                    Information on the contents and results gained
    -                
    -            
    -            
    -                
    -                    Information on the function of the qualification
    -                
    -            
    -            
    -                
    -                    Additional informationType
    -                
    -            
    -            
    -                
    -                    Certification of the Supplement
    -                
    -            
    -            
    -                
    -                    Information on the national higher education system
    -                
    -            
    -            
    -                
    -                    Attachments resources
    -                
    -            
    -            
    -                
    -                    Extension content
    -                
    -            
    -            
    -                
    -                    Digital signature
    -                
    -            
    -        
    -        
    -            
    -                Language code ISO 639-1 of the Supplement
    -            
    -        
    -        
    -            
    -                Indicate if language is the original language
    -            
    -        
    -    
    -    
    -        
    -            Extension content
    -        
    -        
    -            
    -        
    -        
    -    
    -    
    -        
    -            Family name(s)
    -        
    -        
    -            
    -                
    -                    Surname
    -                
    -            
    -        
    -    
    -    
    -        
    -            Given name(s)
    -        
    -        
    -            
    -                
    -                    Name
    -                
    -            
    -        
    -    
    -    
    -        
    -            Grading scheme and grade distribution guidance
    -        
    -        
    -            
    -                
    -                    Grading scheme
    -                
    -            
    -            
    -                
    -                    Grade distribution guidance
    -                
    -            
    -        
    -    
    -    
    -        
    -            Courses groups
    -        
    -        
    -            
    -                
    -                    Groups set name
    -                
    -            
    -            
    -                
    -                    Header information
    -                
    -            
    -            
    -                
    -                    Courses group
    -                
    -            
    -            
    -                
    -                    Footer information
    -                
    -            
    -        
    -    
    -    
    -        
    -            Courses group
    -        
    -        
    -            
    -                
    -                    Name of the group
    -                
    -            
    -            
    -                
    -                    Header information
    -                
    -            
    -            
    -                
    -                    Courses group
    -                
    -            
    -            
    -                
    -                    Footer information
    -                
    -            
    -        
    -        
    -            
    -                Group identifier
    -            
    -        
    -    
    -    
    -        
    -            Information identifying the holder of the qualification
    -        
    -        
    -            
    -                
    -                    Family name(s)
    -                
    -            
    -            
    -                
    -                    Given name(s)
    -                
    -            
    -            
    -                
    -                    Date of birth
    -                
    -            
    -            
    -                
    -                    Student identification number or code
    -                
    -            
    -            
    -                
    -                    Country of birth
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Country code ISO 3166-1-alpha-2
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Place of birth
    -                
    -            
    -            
    -                
    -                    Gender
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Gender code
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Information identifying the qualification
    -        
    -        
    -            
    -                
    -                    Qualification
    -                
    -            
    -            
    -                
    -                    Title conferred
    -                
    -            
    -            
    -                
    -                    Main fields of study
    -                
    -            
    -            
    -                
    -                    Name and status of awarding institution
    -                
    -            
    -            
    -                
    -                    Name and status of institution administering studies
    -                
    -            
    -            
    -                
    -                    Language of instruction and examination
    -                
    -                
    -                    
    -                        Unique: Language of instruction and examinatio
    -                    
    -                    
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Information on the contents and results gained
    -        
    -        
    -            
    -                
    -                    Mode of study
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Mode of study
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Programme requirements
    -                
    -            
    -            
    -                
    -                    Programme details
    -                
    -            
    -            
    -                
    -                    Grading scheme and grade distribution guidance
    -                
    -            
    -            
    -                
    -                    Overall classification of the qualification
    -                
    -            
    -        
    -    
    -    
    -        
    -            Information on the function of the qualification type
    -        
    -        
    -            
    -                
    -                    Access to further study
    -                
    -            
    -            
    -                
    -                    Professional status
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Is regulated profession
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Information on the level of the qualification
    -        
    -        
    -            
    -                
    -                    Level ff the qualification
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    ISCED 1997 code
    -                                
    -                            
    -                            
    -                                
    -                                    ISCED 2011 code
    -                                
    -                            
    -                            
    -                                
    -                                    EHEA Framework code
    -                                
    -                            
    -                            
    -                                
    -                                    NFQ code
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Official length of programme
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Number of ECTS credits
    -                                
    -                            
    -                            
    -                                
    -                                    Number of years
    -                                
    -                            
    -                            
    -                                
    -                                    Number of semesters
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Access requirements
    -                
    -            
    -        
    -    
    -    
    -        
    -            Name and status of the institution
    -        
    -        
    -            
    -                
    -                    Name of the institution
    -                
    -            
    -            
    -                
    -                    Status of the institution
    -                
    -            
    -            
    -                
    -                    Country of the institution
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Country code ISO 3166-1-alpha-2
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Additional Information about the institution
    -                
    -            
    -            
    -                
    -                    Contact information
    -                
    -            
    -            
    -                
    -                    Logo of the institution reference
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Attached identifier reference
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -        
    -            
    -                National identification code or number of the institution
    -            
    -        
    -        
    -            
    -                ERASMUS code of the institution
    -            
    -        
    -    
    -    
    -        
    -            Language of instruction and examination
    -        
    -        
    -            
    -                
    -                    Language of instruction and examination
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Language code ISO 639-1
    -                                
    -                            
    -                            
    -                                
    -                                    Percent
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Local grade
    -        
    -        
    -            
    -                
    -                    Academic year
    -                
    -            
    -            
    -                
    -                    Date issued
    -                
    -            
    -            
    -                
    -                    Grade
    -                
    -            
    -            
    -                
    -                    Source grade
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Source grade code
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Mobility programme courses units
    -        
    -        
    -            
    -                
    -                    Course unit
    -                
    -            
    -        
    -    
    -    
    -        
    -            Mobility programme course unit
    -        
    -        
    -            
    -                
    -                    Course unit code
    -                
    -            
    -            
    -                
    -                    Course unit title
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Language code ISO 639-1
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Number of ECTS credits
    -                
    -            
    -            
    -                
    -                    Additional information
    -                
    -            
    -        
    -        
    -            
    -                Is in the learning agreement?
    -            
    -        
    -    
    -    
    -        
    -            Mobility programme
    -        
    -        
    -            
    -                
    -                    Mobility programme type (e.g. ERASMUS, ISEP, ...)
    -                
    -            
    -            
    -                
    -                    Field of study
    -                
    -            
    -            
    -                
    -                    Country
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Country code ISO 3166-1-alpha-2
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -            
    -                
    -                    Receiving institution
    -                
    -            
    -            
    -                
    -                    Academic year
    -                
    -            
    -            
    -                
    -                    Study period (Date from)
    -                
    -            
    -            
    -                
    -                    Study period (Date to)
    -                
    -            
    -            
    -                
    -                    Course units
    -                
    -            
    -        
    -    
    -    
    -        
    -            Multilingual Diploma Supplement (DS)
    -        
    -        
    -            
    -                
    -                    Diploma Supplement
    -                
    -            
    -            
    -                
    -                    Digital signature
    -                
    -            
    -        
    -    
    -    
    -        
    -            Name and status of awarding institution
    -        
    -        
    -            
    -                
    -                    Awarding institution
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Awarding institution identifier
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Name and status of institution administering studies
    -        
    -        
    -            
    -                
    -                    Institution administering studies
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Institution administering studies identifier
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Official certifying the DS
    -        
    -        
    -            
    -                
    -                    Family name(s)
    -                
    -            
    -            
    -                
    -                    Given name(s)
    -                
    -            
    -            
    -                
    -                    Official capacity
    -                
    -            
    -        
    -        
    -            
    -                Identifier of awarding institution
    -            
    -        
    -    
    -    
    -        
    -            Officials certifying
    -        
    -        
    -            
    -                
    -                    Official certifying
    -                
    -            
    -        
    -    
    -    
    -        
    -            Official stamp or seal of the institution
    -        
    -        
    -            
    -                
    -                    Stamp description
    -                
    -            
    -        
    -        
    -            
    -                Identifier of awarding institution
    -            
    -        
    -    
    -    
    -        
    -            Programme details
    -        
    -        
    -            
    -                
    -                    Course structure diagram
    -                
    -            
    -            
    -                
    -                    Courses attended in other institution in mobility programs
    -                
    -            
    -        
    -    
    -    
    -        
    -            Programme requirements
    -        
    -        
    -            
    -                
    -                    Programme requirements
    -                
    -            
    -            
    -                
    -                    Key learning outcomes of the programme
    -                
    -            
    -        
    -    
    -    
    -        
    -            Qualification
    -        
    -        
    -            
    -                
    -                    Name of the qualification
    -                
    -            
    -            
    -                
    -                    Additional information about the qualification
    -                
    -            
    -        
    -        
    -            
    -                Local identification code or number of the qualification
    -            
    -        
    -        
    -            
    -                National identification code or number of the qualification
    -            
    -        
    -    
    -    
    -        
    -            Rich text tag
    -        
    -        
    -            
    -                
    -                    Specifies bold text
    -                
    -            
    -            
    -                
    -                    Specifies break line
    -                
    -            
    -            
    -                
    -                    Specifies italic text
    -                
    -            
    -            
    -                
    -                    Specifies underline text
    -                
    -            
    -            
    -                
    -                    Specifies reference to the attached resource 
    -                
    -                
    -                    
    -                        
    -                            
    -                                
    -                                    Attached identifier reference
    -                                
    -                            
    -                        
    -                    
    -                
    -            
    -        
    -    
    -    
    -        
    -            Title conferred
    -        
    -        
    -            
    -                
    -                    Name of the title conferred
    -                
    -            
    -        
    -    
    -    
    -        
    -            Diploma Supplement
    -        
    -        
    -        
    -            
    -                Primary Key: Group identifier
    -            
    -            
    -            
    -        
    -        
    -            
    -                Primary Key: Awarding institution identifier
    -            
    -            
    -            
    -        
    -        
    -            
    -                Primary Key: Intitution administering studies identifier
    -            
    -            
    -            
    -        
    -        
    -        
    -            
    -                Foreign Key: Group identifier
    -            
    -            
    -            
    -        
    -        
    -            
    -                Foreign Key: Awarding institution (Official Stamp) identifier
    -            
    -            
    -            
    -        
    -        
    -            
    -                Foreign Key: Awarding institution (Official Stamp) identifier
    -            
    -            
    -            
    -        
    -        
    -            
    -                Foreign Key: Institution administering studies identifier
    -            
    -            
    -            
    -        
    -    
    -    
    -        
    -            Multilingual Diploma Supplement
    -        
    -        
    -        
    -            
    -                Unique: Diploma Supplement language
    -            
    -            
    -            
    -        
    -    
    +	
    +
    +	
    +		
    +			Academic year constraint
    +				YYYY-YY. (e.g. 2005-06, 2006-07, ...)
    +		
    +		
    +			
    +		
    +	
    +	
    +		
    +			ISO 3166-1-alpha-2
    +			
    +		
    +		
    +			
    +				
    +					Andorra
    +					
    +				
    +			
    +			
    +				
    +					United Arab Emirates
    +					
    +				
    +			
    +			
    +				
    +					Afghanistan
    +					
    +				
    +			
    +			
    +				
    +					Antigua and Barbuda
    +					
    +				
    +			
    +			
    +				
    +					Albania
    +					
    +				
    +			
    +			
    +				
    +					Armenia
    +					
    +				
    +			
    +			
    +				
    +					Angola
    +					
    +				
    +			
    +			
    +				
    +					Argentina
    +					
    +				
    +			
    +			
    +				
    +					Austria
    +					
    +				
    +			
    +			
    +				
    +					Australia
    +					
    +				
    +			
    +			
    +				
    +					Azerbaijan
    +					
    +				
    +			
    +			
    +				
    +					Bosnia and Herzegovina
    +					
    +				
    +			
    +			
    +				
    +					Barbados
    +					
    +				
    +			
    +			
    +				
    +					Bangladesh
    +					
    +				
    +			
    +			
    +				
    +					Belgium
    +					
    +				
    +			
    +			
    +				
    +					Burkina Faso
    +					
    +				
    +			
    +			
    +				
    +					Bulgaria
    +					
    +				
    +			
    +			
    +				
    +					Bahrain
    +					
    +				
    +			
    +			
    +				
    +					Burundi
    +					
    +				
    +			
    +			
    +				
    +					Benin
    +					
    +				
    +			
    +			
    +				
    +					Brunei Darussalam
    +					
    +				
    +			
    +			
    +				
    +					Bolivia
    +					
    +				
    +			
    +			
    +				
    +					Brazil
    +					
    +				
    +			
    +			
    +				
    +					Bahamas
    +					
    +				
    +			
    +			
    +				
    +					Bhutan
    +					
    +				
    +			
    +			
    +				
    +					Botswana
    +					
    +				
    +			
    +			
    +				
    +					Belarus
    +					
    +				
    +			
    +			
    +				
    +					Belize
    +					
    +				
    +			
    +			
    +				
    +					Canada
    +					
    +				
    +			
    +			
    +				
    +					Congo, Democratic
    +						Republic of the
    +				
    +			
    +			
    +				
    +					Central African
    +						Republic
    +				
    +			
    +			
    +				
    +					Congo, Republic of the
    +					
    +				
    +			
    +			
    +				
    +					Switzerland
    +					
    +				
    +			
    +			
    +				
    +					Cote d/Ivoire
    +					
    +				
    +			
    +			
    +				
    +					Chile
    +					
    +				
    +			
    +			
    +				
    +					Cameroon
    +					
    +				
    +			
    +			
    +				
    +					China
    +					
    +				
    +			
    +			
    +				
    +					Colombia
    +					
    +				
    +			
    +			
    +				
    +					Costa Rica
    +					
    +				
    +			
    +			
    +				
    +					Cuba
    +				
    +			
    +			
    +				
    +					Cape Verde
    +					
    +				
    +			
    +			
    +				
    +					Cyprus
    +					
    +				
    +			
    +			
    +				
    +					Czech Republic
    +					
    +				
    +			
    +			
    +				
    +					Germany
    +					
    +				
    +			
    +			
    +				
    +					Djibouti
    +					
    +				
    +			
    +			
    +				
    +					Denmark
    +					
    +				
    +			
    +			
    +				
    +					Dominica
    +					
    +				
    +			
    +			
    +				
    +					Dominican Republic
    +					
    +				
    +			
    +			
    +				
    +					Algeria
    +					
    +				
    +			
    +			
    +				
    +					Ecuador
    +					
    +				
    +			
    +			
    +				
    +					Estonia
    +					
    +				
    +			
    +			
    +				
    +					Egypt
    +					
    +				
    +			
    +			
    +				
    +					Eritrea
    +					
    +				
    +			
    +			
    +				
    +					Spain
    +					
    +				
    +			
    +			
    +				
    +					Ethiopia
    +					
    +				
    +			
    +			
    +				
    +					Finland
    +					
    +				
    +			
    +			
    +				
    +					Fiji
    +				
    +			
    +			
    +				
    +					Federated States of
    +						Micronesia
    +				
    +			
    +			
    +				
    +					France
    +					
    +				
    +			
    +			
    +				
    +					Gabon
    +					
    +				
    +			
    +			
    +				
    +					United Kingdom
    +					
    +				
    +			
    +			
    +				
    +					Grenada
    +					
    +				
    +			
    +			
    +				
    +					Georgia
    +					
    +				
    +			
    +			
    +				
    +					Ghana
    +					
    +				
    +			
    +			
    +				
    +					Greenland
    +					
    +				
    +			
    +			
    +				
    +					Gambia
    +					
    +				
    +			
    +			
    +				
    +					Guinea
    +					
    +				
    +			
    +			
    +				
    +					Equatorial Guinea
    +					
    +				
    +			
    +			
    +				
    +					Greece
    +					
    +				
    +			
    +			
    +				
    +					Guatemala
    +					
    +				
    +			
    +			
    +				
    +					Guinea-Bissau
    +					
    +				
    +			
    +			
    +				
    +					Guyana
    +					
    +				
    +			
    +			
    +				
    +					Honduras
    +					
    +				
    +			
    +			
    +				
    +					Croatia
    +					
    +				
    +			
    +			
    +				
    +					Haiti
    +					
    +				
    +			
    +			
    +				
    +					Hungary
    +					
    +				
    +			
    +			
    +				
    +					Indonesia
    +					
    +				
    +			
    +			
    +				
    +					Ireland
    +					
    +				
    +			
    +			
    +				
    +					Israel
    +					
    +				
    +			
    +			
    +				
    +					India
    +					
    +				
    +			
    +			
    +				
    +					Iraq
    +				
    +			
    +			
    +				
    +					Iran
    +				
    +			
    +			
    +				
    +					Iceland
    +					
    +				
    +			
    +			
    +				
    +					Italy
    +					
    +				
    +			
    +			
    +				
    +					Jamaica
    +					
    +				
    +			
    +			
    +				
    +					Jordan
    +					
    +				
    +			
    +			
    +				
    +					Japan
    +					
    +				
    +			
    +			
    +				
    +					Kenya
    +					
    +				
    +			
    +			
    +				
    +					Kyrgyzstan
    +					
    +				
    +			
    +			
    +				
    +					Cambodia
    +					
    +				
    +			
    +			
    +				
    +					Kiribati
    +					
    +				
    +			
    +			
    +				
    +					Comoros
    +					
    +				
    +			
    +			
    +				
    +					Saint Kitts and Nevis
    +					
    +				
    +			
    +			
    +				
    +					Korea, Democratic
    +						People/s Republic
    +				
    +			
    +			
    +				
    +					Korea, Republic of
    +					
    +				
    +			
    +			
    +				
    +					Kuwait
    +					
    +				
    +			
    +			
    +				
    +					Kazakstan
    +					
    +				
    +			
    +			
    +				
    +					Lao People/s Democratic
    +						Republic
    +				
    +			
    +			
    +				
    +					Lebanon
    +					
    +				
    +			
    +			
    +				
    +					Saint Lucia
    +					
    +				
    +			
    +			
    +				
    +					Liechtenstein
    +					
    +				
    +			
    +			
    +				
    +					Sri Lanka
    +					
    +				
    +			
    +			
    +				
    +					Liberia
    +					
    +				
    +			
    +			
    +				
    +					Lesotho
    +					
    +				
    +			
    +			
    +				
    +					Lithuania
    +					
    +				
    +			
    +			
    +				
    +					Luxembourg
    +					
    +				
    +			
    +			
    +				
    +					Latvia
    +					
    +				
    +			
    +			
    +				
    +					Libyan Arab Jamahiriya
    +					
    +				
    +			
    +			
    +				
    +					Morocco
    +					
    +				
    +			
    +			
    +				
    +					Monaco
    +					
    +				
    +			
    +			
    +				
    +					Moldova, Republic of
    +					
    +				
    +			
    +			
    +				
    +					Montenegro
    +					
    +				
    +			
    +			
    +				
    +					Madagascar
    +					
    +				
    +			
    +			
    +				
    +					Marshall Islands
    +					
    +				
    +			
    +			
    +				
    +					Macedonia, the former
    +						Yugoslav Republic of
    +				
    +			
    +			
    +				
    +					Mali
    +				
    +			
    +			
    +				
    +					Myanmar
    +					
    +				
    +			
    +			
    +				
    +					Mongolia
    +					
    +				
    +			
    +			
    +				
    +					Mauritania
    +					
    +				
    +			
    +			
    +				
    +					Malta
    +					
    +				
    +			
    +			
    +				
    +					Mauritius
    +					
    +				
    +			
    +			
    +				
    +					Maldives
    +					
    +				
    +			
    +			
    +				
    +					Malawi
    +					
    +				
    +			
    +			
    +				
    +					Mexico
    +					
    +				
    +			
    +			
    +				
    +					Malaysia
    +					
    +				
    +			
    +			
    +				
    +					Mozambique
    +					
    +				
    +			
    +			
    +				
    +					Namibia
    +					
    +				
    +			
    +			
    +				
    +					Niger
    +					
    +				
    +			
    +			
    +				
    +					Nigeria
    +					
    +				
    +			
    +			
    +				
    +					Nicaragua
    +					
    +				
    +			
    +			
    +				
    +					Netherlands
    +					
    +				
    +			
    +			
    +				
    +					Norway
    +					
    +				
    +			
    +			
    +				
    +					Nepal
    +					
    +				
    +			
    +			
    +				
    +					Nauru
    +					
    +				
    +			
    +			
    +				
    +					Niue
    +				
    +			
    +			
    +				
    +					New Zealand
    +					
    +				
    +			
    +			
    +				
    +					Oman
    +				
    +			
    +			
    +				
    +					Panama
    +					
    +				
    +			
    +			
    +				
    +					Peru
    +				
    +			
    +			
    +				
    +					Papua New Guinea
    +					
    +				
    +			
    +			
    +				
    +					Philippines
    +					
    +				
    +			
    +			
    +				
    +					Pakistan
    +					
    +				
    +			
    +			
    +				
    +					Poland
    +					
    +				
    +			
    +			
    +				
    +					Puerto Rico
    +					
    +				
    +			
    +			
    +				
    +					Palestinian Territory,
    +						Occupied
    +				
    +			
    +			
    +				
    +					Portugal
    +					
    +				
    +			
    +			
    +				
    +					Palau
    +					
    +				
    +			
    +			
    +				
    +					Paraguay
    +					
    +				
    +			
    +			
    +				
    +					Qatar
    +					
    +				
    +			
    +			
    +				
    +					Romania
    +					
    +				
    +			
    +			
    +				
    +					Serbia
    +					
    +				
    +			
    +			
    +				
    +					Russian Federation
    +					
    +				
    +			
    +			
    +				
    +					Rwanda
    +					
    +				
    +			
    +			
    +				
    +					Saudi Arabia
    +					
    +				
    +			
    +			
    +				
    +					Solomon Islands
    +					
    +				
    +			
    +			
    +				
    +					Seychelles
    +					
    +				
    +			
    +			
    +				
    +					Sudan
    +					
    +				
    +			
    +			
    +				
    +					Sweden
    +					
    +				
    +			
    +			
    +				
    +					Singapore
    +					
    +				
    +			
    +			
    +				
    +					Slovenia
    +					
    +				
    +			
    +			
    +				
    +					Slovakia
    +					
    +				
    +			
    +			
    +				
    +					Sierra Leone
    +					
    +				
    +			
    +			
    +				
    +					San Marino
    +					
    +				
    +			
    +			
    +				
    +					Senegal
    +					
    +				
    +			
    +			
    +				
    +					Somalia
    +					
    +				
    +			
    +			
    +				
    +					Suriname
    +					
    +				
    +			
    +			
    +				
    +					Sao Tome and Principe
    +					
    +				
    +			
    +			
    +				
    +					El Salvador
    +					
    +				
    +			
    +			
    +				
    +					Syrian Arab Republic
    +					
    +				
    +			
    +			
    +				
    +					Swaziland
    +					
    +				
    +			
    +			
    +				
    +					Chad
    +				
    +			
    +			
    +				
    +					Togo
    +				
    +			
    +			
    +				
    +					Thailand
    +					
    +				
    +			
    +			
    +				
    +					Tajikistan
    +					
    +				
    +			
    +			
    +				
    +					Timor-Leste
    +					
    +				
    +			
    +			
    +				
    +					Turkmenistan
    +					
    +				
    +			
    +			
    +				
    +					Tunisia
    +					
    +				
    +			
    +			
    +				
    +					Tonga
    +					
    +				
    +			
    +			
    +				
    +					Turkey
    +					
    +				
    +			
    +			
    +				
    +					Trindidad and Tobago
    +					
    +				
    +			
    +			
    +				
    +					Tuvalu
    +					
    +				
    +			
    +			
    +				
    +					Tanzania, United
    +						republic of
    +				
    +			
    +			
    +				
    +					Ukraina
    +					
    +				
    +			
    +			
    +				
    +					Uganda
    +					
    +				
    +			
    +			
    +				
    +					United States
    +					
    +				
    +			
    +			
    +				
    +					Uruguay
    +					
    +				
    +			
    +			
    +				
    +					Uzbekistan
    +					
    +				
    +			
    +			
    +				
    +					Holy See (Vatican City
    +						State)
    +				
    +			
    +			
    +				
    +					Saint Vincent and the
    +						Granadines
    +				
    +			
    +			
    +				
    +					Venezuela
    +					
    +				
    +			
    +			
    +				
    +					Viet Nam
    +					
    +				
    +			
    +			
    +				
    +					Vanuatu
    +					
    +				
    +			
    +			
    +				
    +					Samoa
    +					
    +				
    +			
    +			
    +				
    +					Yemen
    +					
    +				
    +			
    +			
    +				
    +					South Africa
    +					
    +				
    +			
    +			
    +				
    +					Zambia
    +					
    +				
    +			
    +			
    +				
    +					Zimbabwe
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Type of course unit
    +			
    +		
    +		
    +			
    +				
    +					Compulsory
    +					
    +				
    +			
    +			
    +				
    +					Optional
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Date format yyyy-mm-dd.
    +				Ex.: 2013-05-04, ...
    +		
    +		
    +	
    +	
    +		
    +			ECTS grading scale
    +			
    +		
    +		
    +			
    +				
    +					Top 10%
    +					
    +				
    +			
    +			
    +				
    +					Next 25%
    +					
    +				
    +			
    +			
    +				
    +					Next 30%
    +					
    +				
    +			
    +			
    +				
    +					Next 25%
    +					
    +				
    +			
    +			
    +				
    +					Lowest 10%
    +					
    +				
    +			
    +			
    +				
    +					Fail
    +				
    +			
    +			
    +				
    +					Fail
    +				
    +			
    +		
    +	
    +	
    +		
    +			E-Mail address constraint
    +			
    +		
    +		
    +	
    +	
    +		
    +			EHEA Framework (Bologna:
    +				Framework of Qualifications/European Qualifications Framework)
    +			
    +		
    +		
    +			
    +				
    +					First Cycle
    +					
    +				
    +			
    +			
    +				
    +					Second Cycle
    +					
    +				
    +			
    +			
    +				
    +					Third Cycle
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Empty text constraint
    +			
    +		
    +		
    +			
    +				Empty text constraint
    +				
    +			
    +			
    +		
    +	
    +	
    +		
    +			Gender
    +		
    +		
    +			
    +				
    +					Female
    +					
    +				
    +			
    +			
    +				
    +					Male
    +				
    +			
    +		
    +	
    +	
    +		
    +			MIME: Type image
    +			
    +		
    +		
    +			
    +				
    +					GIF image
    +					
    +				
    +			
    +			
    +				
    +					JPEG JFIF image
    +					
    +				
    +			
    +			
    +				
    +					JPEG JFIF image
    +					
    +				
    +			
    +			
    +				
    +					Portable Network
    +						Graphics
    +				
    +			
    +			
    +				
    +					Tag Image File Format
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			International Standard
    +				Classification of Education (ISCED) 1997
    +		
    +		
    +			
    +				
    +					Level 0: Pre-primary
    +						education
    +				
    +			
    +			
    +				
    +					Level 1: Primary
    +						education or first stage of basic education
    +				
    +			
    +			
    +				
    +					Level 2: Lower
    +						secondary education or second stage of basic education
    +					
    +				
    +			
    +			
    +				
    +					Level 3: Upper
    +						secondary education
    +				
    +			
    +			
    +				
    +					Level 4: Post-secondary
    +						non-tertiary education
    +				
    +			
    +			
    +				
    +					Level 5A: First stage
    +						of tertiary education: largely theoretically based programmes
    +						intended to provide qualifications for gaining entry into more
    +						advanced research programmes and professions with higher skills
    +						requirements
    +				
    +			
    +			
    +				
    +					Level 5B: First stage
    +						of tertiary education: shorter, more
    +						practical/technical/occupationally specific prgrammes leading to
    +						professional qualifications
    +				
    +			
    +			
    +				
    +					Level 6: Second stage
    +						of tertiary education (leading to an advanced research
    +						qualification)
    +				
    +			
    +		
    +	
    +	
    +		
    +			International Standard
    +				Classification of Education (ISCED) 2011
    +		
    +		
    +			
    +				
    +					Level 0: Early
    +						childhood Education
    +				
    +			
    +			
    +				
    +					Level 1: Primary
    +						education
    +				
    +			
    +			
    +				
    +					Level 2: Lower
    +						secondary education
    +				
    +			
    +			
    +				
    +					Level 3: Upper
    +						secondary education
    +				
    +			
    +			
    +				
    +					Level 4: Post-secondary
    +						non-tertiary education
    +				
    +			
    +			
    +				
    +					Level 5: Short-cycle
    +						teriary education
    +				
    +			
    +			
    +				
    +					Level 6: Bachelor or
    +						equivalent
    +				
    +			
    +			
    +				
    +					Level 7: Master or
    +						equivalent
    +				
    +			
    +			
    +				
    +					Level 8: Doctoral or
    +						equivalent
    +				
    +			
    +		
    +	
    +	
    +		
    +			ISO 639-1 languages
    +			
    +		
    +		
    +			
    +				
    +					Abkhazian
    +					
    +				
    +			
    +			
    +				
    +					Afrikaans
    +					
    +				
    +			
    +			
    +				
    +					Aragonese
    +					
    +				
    +			
    +			
    +				
    +					Arabic
    +					
    +				
    +			
    +			
    +				
    +					Assamese
    +					
    +				
    +			
    +			
    +				
    +					Azerbaijani
    +					
    +				
    +			
    +			
    +				
    +					Belarusian
    +					
    +				
    +			
    +			
    +				
    +					Bulgarian
    +					
    +				
    +			
    +			
    +				
    +					Bengali
    +					
    +				
    +			
    +			
    +				
    +					Tibetan
    +					
    +				
    +			
    +			
    +				
    +					Breton
    +					
    +				
    +			
    +			
    +				
    +					Bosnian
    +					
    +				
    +			
    +			
    +				
    +					Catalan / Valencian
    +					
    +				
    +			
    +			
    +				
    +					Chechen
    +					
    +				
    +			
    +			
    +				
    +					Corsican
    +					
    +				
    +			
    +			
    +				
    +					Czech
    +					
    +				
    +			
    +			
    +				
    +					Welsh
    +					
    +				
    +			
    +			
    +				
    +					Danish
    +					
    +				
    +			
    +			
    +				
    +					German
    +					
    +				
    +			
    +			
    +				
    +					Greek
    +					
    +				
    +			
    +			
    +				
    +					English
    +					
    +				
    +			
    +			
    +				
    +					Spanish / Castilian
    +					
    +				
    +			
    +			
    +				
    +					Estonian
    +					
    +				
    +			
    +			
    +				
    +					Basque
    +					
    +				
    +			
    +			
    +				
    +					Persian
    +					
    +				
    +			
    +			
    +				
    +					Finnish
    +					
    +				
    +			
    +			
    +				
    +					Fijian
    +					
    +				
    +			
    +			
    +				
    +					Faroese
    +					
    +				
    +			
    +			
    +				
    +					French
    +					
    +				
    +			
    +			
    +				
    +					Western Frisian
    +					
    +				
    +			
    +			
    +				
    +					Irish
    +					
    +				
    +			
    +			
    +				
    +					Gaelic / Scottish
    +						Gaelic
    +				
    +			
    +			
    +				
    +					Galician
    +					
    +				
    +			
    +			
    +				
    +					Manx
    +				
    +			
    +			
    +				
    +					Ancient Greek
    +					
    +				
    +			
    +			
    +				
    +					Alemanic; Swiss German
    +					
    +				
    +			
    +			
    +				
    +					Hebrew
    +					
    +				
    +			
    +			
    +				
    +					Hindi
    +					
    +				
    +			
    +			
    +				
    +					Croatian
    +					
    +				
    +			
    +			
    +				
    +					Haitian; Haitian Creole
    +					
    +				
    +			
    +			
    +				
    +					Hungarian
    +					
    +				
    +			
    +			
    +				
    +					Armenian
    +					
    +				
    +			
    +			
    +				
    +					Indonesian
    +					
    +				
    +			
    +			
    +				
    +					Icelandic
    +					
    +				
    +			
    +			
    +				
    +					Italian
    +					
    +				
    +			
    +			
    +				
    +					Japanese
    +					
    +				
    +			
    +			
    +				
    +					Javanese
    +					
    +				
    +			
    +			
    +				
    +					Georgian
    +					
    +				
    +			
    +			
    +				
    +					Kongo
    +					
    +				
    +			
    +			
    +				
    +					Korean
    +					
    +				
    +			
    +			
    +				
    +					Kurdish
    +					
    +				
    +			
    +			
    +				
    +					Cornish
    +					
    +				
    +			
    +			
    +				
    +					Kirghiz
    +					
    +				
    +			
    +			
    +				
    +					Luxembourgish;
    +						Letzeburgesch
    +				
    +			
    +			
    +				
    +					Limburgan; Limburger;
    +						Limburgish
    +				
    +			
    +			
    +				
    +					Lingala
    +					
    +				
    +			
    +			
    +				
    +					Lithuanian
    +					
    +				
    +			
    +			
    +				
    +					Latvian
    +					
    +				
    +			
    +			
    +				
    +					Malagasy
    +					
    +				
    +			
    +			
    +				
    +					Macedonian
    +					
    +				
    +			
    +			
    +				
    +					Mongolian
    +					
    +				
    +			
    +			
    +				
    +					Moldavian
    +					
    +				
    +			
    +			
    +				
    +					Malay
    +					
    +				
    +			
    +			
    +				
    +					Maltese
    +					
    +				
    +			
    +			
    +				
    +					Burmese
    +					
    +				
    +			
    +			
    +				
    +					Norwegian (Bokmål)
    +					
    +				
    +			
    +			
    +				
    +					Nepali
    +					
    +				
    +			
    +			
    +				
    +					Dutch
    +					
    +				
    +			
    +			
    +				
    +					Norwegian (Nynorsk)
    +					
    +				
    +			
    +			
    +				
    +					Norwegian
    +					
    +				
    +			
    +			
    +				
    +					Polish
    +					
    +				
    +			
    +			
    +				
    +					Portuguese
    +					
    +				
    +			
    +			
    +				
    +					Raeto-Romance
    +					
    +				
    +			
    +			
    +				
    +					Romanian
    +					
    +				
    +			
    +			
    +				
    +					Russian
    +					
    +				
    +			
    +			
    +				
    +					Sardinian
    +					
    +				
    +			
    +			
    +				
    +					Northern Sami
    +					
    +				
    +			
    +			
    +				
    +					Slovak
    +					
    +				
    +			
    +			
    +				
    +					Slovenian
    +					
    +				
    +			
    +			
    +				
    +					Somali
    +					
    +				
    +			
    +			
    +				
    +					Albanian
    +					
    +				
    +			
    +			
    +				
    +					Serbian
    +					
    +				
    +			
    +			
    +				
    +					Swedish
    +					
    +				
    +			
    +			
    +				
    +					Swahili
    +					
    +				
    +			
    +			
    +				
    +					Turkmen
    +					
    +				
    +			
    +			
    +				
    +					Turkish
    +					
    +				
    +			
    +			
    +				
    +					Tahitian
    +					
    +				
    +			
    +			
    +				
    +					Ukrainian
    +					
    +				
    +			
    +			
    +				
    +					Urdu
    +				
    +			
    +			
    +				
    +					Uzbek
    +					
    +				
    +			
    +			
    +				
    +					Vietnamese
    +					
    +				
    +			
    +			
    +				
    +					Yiddish
    +					
    +				
    +			
    +			
    +				
    +					Chinese
    +					
    +				
    +			
    +			
    +				
    +					Church Slavic
    +					
    +				
    +			
    +			
    +				
    +					Esperanto
    +					
    +				
    +			
    +			
    +				
    +					Latin
    +					
    +				
    +			
    +			
    +				
    +					Occitan (post 1500);
    +						Provençal
    +				
    +			
    +			
    +				
    +					VVolapük
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			MIME types
    +			
    +		
    +		
    +			
    +				
    +					GIF image
    +					
    +				
    +			
    +			
    +				
    +					JPEG JFIF image
    +					
    +				
    +			
    +			
    +				
    +					JPEG JFIF image
    +					
    +				
    +			
    +			
    +				
    +					Portable Network
    +						Graphics
    +				
    +			
    +			
    +				
    +					Tag Image File Format
    +					
    +				
    +			
    +			
    +				
    +					HTML
    +				
    +			
    +			
    +				
    +					Portable Document
    +						Format
    +				
    +			
    +		
    +	
    +	
    +		
    +			Mode of study
    +			
    +		
    +		
    +			
    +				
    +					Full time
    +					
    +				
    +			
    +			
    +				
    +					Par time
    +					
    +				
    +			
    +			
    +				
    +					Distance
    +					
    +				
    +			
    +			
    +				
    +					eLearning
    +					
    +				
    +			
    +			
    +				
    +					Another
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Model of delivery
    +			
    +		
    +		
    +			
    +				
    +					Face-to-face
    +					
    +				
    +			
    +			
    +				
    +					Distance learning
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			National Framework of
    +				Qualifications (NFQ) Level 
    +		
    +		
    +	
    +	
    +		
    +			Plain text constraint
    +			
    +		
    +		
    +			
    +				Non empty text
    +				
    +			
    +			
    +		
    +	
    +	
    +		
    +			Percent constraint
    +			
    +		
    +		
    +			
    +				Restriction between 0
    +					and 100
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			Positive decimal number
    +			
    +		
    +		
    +			
    +				Positive decimal numbers
    +					restriction
    +			
    +			
    +		
    +	
    +	
    +		
    +			Positive integer number
    +			
    +		
    +		
    +			
    +				Positive integer numbers
    +					restriction
    +			
    +			
    +		
    +	
    +	
    +		
    +			Source of the course unit
    +				performance
    +		
    +		
    +			
    +				
    +					Recognized
    +					
    +				
    +			
    +			
    +				
    +					Course unit attended in
    +						mobility programme
    +				
    +			
    +			
    +				
    +					Another
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Uniform Resource Locator
    +				(URL)
    +		
    +		
    +			
    +				http and https
    +					restriction
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			Additional information
    +			
    +		
    +		
    +			
    +				
    +					Specific information
    +					
    +				
    +			
    +			
    +				
    +					Other sources
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Address
    +			
    +		
    +		
    +			
    +				
    +					Name, street, PO box,
    +						...
    +				
    +			
    +			
    +				
    +					City
    +				
    +			
    +			
    +				
    +					State or region
    +					
    +				
    +			
    +			
    +				
    +					Postal code
    +					
    +				
    +			
    +			
    +				
    +					Country
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Country code ISO
    +										3166-1-alpha-2
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Data file
    +			
    +		
    +		
    +			
    +				
    +					Description
    +					
    +				
    +			
    +			
    +				
    +					MIME type code
    +					
    +				
    +			
    +			
    +				
    +					Base64 binary data
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			URL reference to the file
    +			
    +		
    +		
    +			
    +				
    +					Description
    +					
    +				
    +			
    +			
    +				
    +					MIME type code
    +					
    +				
    +			
    +			
    +				
    +					URL
    +				
    +			
    +		
    +	
    +	
    +		
    +			Image data file
    +			
    +		
    +		
    +			
    +				
    +					Description
    +					
    +				
    +			
    +			
    +				
    +					MIME type image code
    +					
    +				
    +			
    +			
    +				
    +					Base64 binary data
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			URL reference to the
    +				image file
    +		
    +		
    +			
    +				
    +					Description
    +					
    +				
    +			
    +			
    +				
    +					MIME type image code
    +					
    +				
    +			
    +			
    +				
    +					URL
    +				
    +			
    +		
    +	
    +	
    +		
    +			Attachment resource
    +			
    +		
    +		
    +			
    +				
    +					Data file
    +					
    +				
    +			
    +			
    +				
    +					URL reference to the
    +						file
    +				
    +			
    +			
    +				
    +					Image data file
    +					
    +				
    +			
    +			
    +				
    +					URL reference to the
    +						image file
    +				
    +			
    +		
    +		
    +			
    +				Attached identifier
    +				
    +			
    +		
    +	
    +	
    +		
    +			Attachments resources
    +			
    +		
    +		
    +			
    +				
    +					Attachment resource
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Certification of the
    +				Supplement
    +		
    +		
    +			
    +				
    +					Date was issued
    +					
    +				
    +			
    +			
    +				
    +					Officials certifying
    +					
    +				
    +			
    +			
    +				
    +					Official stamp or seal
    +						of the institution
    +				
    +			
    +		
    +	
    +	
    +		
    +			Contact information
    +			
    +		
    +		
    +			
    +				
    +					Address
    +					
    +				
    +			
    +			
    +				
    +					Phone number
    +					
    +				
    +			
    +			
    +				
    +					E-Mail address
    +					
    +				
    +			
    +			
    +				
    +					Web site
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			
    +				
    +					Mobility programme
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Course structure diagram
    +			
    +		
    +		
    +			
    +				
    +					Courses groups
    +					
    +				
    +			
    +			
    +				
    +					Course units
    +					
    +				
    +				
    +					
    +						Unique: Course unit
    +							code
    +					
    +					
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Course units
    +			
    +		
    +		
    +			
    +				
    +					Course unit
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Language of instruction
    +			
    +		
    +		
    +			
    +				
    +					Language of instruction
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Student performance
    +			
    +		
    +		
    +			
    +				
    +					Local grade
    +					
    +				
    +			
    +			
    +				
    +					ECTS grade
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Course unit
    +			
    +		
    +		
    +			
    +				
    +					Course unit code
    +					
    +				
    +			
    +			
    +			
    +				
    +					Course unit title
    +					
    +				
    +			
    +			
    +				
    +					Theme (example:
    +						Academic project)
    +				
    +			
    +			
    +				
    +					Type of course unit
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Type of course unit
    +										code
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Year of study
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Year of study
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Level of course unit
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									EHEA Framework code
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Number of ECTS credits
    +					
    +				
    +			
    +			
    +				
    +					Number of local credits
    +					
    +				
    +			
    +			
    +				
    +					Number of hours
    +					
    +				
    +			
    +			
    +				
    +					Languages of
    +						instruction
    +				
    +				
    +					
    +						Unique: Language
    +						
    +					
    +					
    +					
    +				
    +			
    +			
    +				
    +					Mode of delivery
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Mode of delivery
    +										oode
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Work placements
    +					
    +				
    +			
    +			
    +				
    +					Student performance
    +					
    +				
    +			
    +			
    +				
    +					Name of lecturer(s)
    +					
    +				
    +			
    +			
    +				
    +					Learning outcomes of
    +						the course unit
    +				
    +			
    +			
    +				
    +					Prerequisites and
    +						co-requisites
    +				
    +			
    +			
    +				
    +					Recomended optional
    +						programme components
    +				
    +			
    +			
    +				
    +					Course contents
    +					
    +				
    +			
    +			
    +				
    +					Recomended or required
    +						reading
    +				
    +			
    +			
    +				
    +					Planed learning
    +						activities and teaching method
    +				
    +			
    +			
    +				
    +					Assesment methods and
    +						criteria
    +				
    +			
    +			
    +				
    +					Observations
    +					
    +				
    +			
    +		
    +		
    +			
    +				Group identifier
    +				
    +			
    +		
    +		
    +			
    +				Institution
    +					administering studies identifier 
    +			
    +		
    +		
    +			
    +				Is required by the
    +					programme?
    +			
    +		
    +	
    +	
    +		
    +			Course unit work
    +				placements
    +		
    +		
    +			
    +				
    +					Work placement
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Course unit work
    +				placement
    +		
    +		
    +			
    +				
    +					Name of collaborating
    +						institution
    +				
    +			
    +			
    +				
    +					Date from
    +					
    +				
    +			
    +			
    +				
    +					Date to
    +					
    +				
    +			
    +			
    +				
    +					Training Hours
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Language of instruction
    +			
    +		
    +		
    +			
    +				
    +					
    +						Language code ISO
    +							639-1 of the Supplement
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Diploma Supplement
    +			
    +		
    +		
    +			
    +				
    +					Information identifying
    +						the holder of the qualification
    +				
    +			
    +			
    +				
    +					Information identifying
    +						the qualification
    +				
    +			
    +			
    +				
    +					Information on the
    +						level of the qualification
    +				
    +			
    +			
    +				
    +					Information on the
    +						contents and results gained
    +				
    +			
    +			
    +				
    +					Information on the
    +						function of the qualification
    +				
    +			
    +			
    +				
    +					Additional
    +						informationType
    +				
    +			
    +			
    +				
    +					Certification of the
    +						Supplement
    +				
    +			
    +			
    +				
    +					Information on the
    +						national higher education system
    +				
    +			
    +			
    +				
    +					Attachments resources
    +					
    +				
    +			
    +			
    +				
    +					Extension content
    +					
    +				
    +			
    +			
    +				
    +					Digital signature
    +					
    +				
    +			
    +		
    +		
    +			
    +				Language code ISO 639-1
    +					of the Supplement
    +			
    +		
    +		
    +			
    +				Indicate if language is
    +					the original language
    +			
    +		
    +	
    +	
    +		
    +			Extension content
    +			
    +		
    +		
    +			
    +		
    +		
    +	
    +	
    +		
    +			Family name(s)
    +			
    +		
    +		
    +			
    +				
    +					Surname
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Given name(s)
    +			
    +		
    +		
    +			
    +				
    +					Name
    +				
    +			
    +		
    +	
    +	
    +		
    +			Grading scheme and grade
    +				distribution guidance
    +		
    +		
    +			
    +				
    +					Grading scheme
    +					
    +				
    +			
    +			
    +				
    +					Grade distribution
    +						guidance
    +				
    +			
    +		
    +	
    +	
    +		
    +			Courses groups
    +			
    +		
    +		
    +			
    +				
    +					Groups set name
    +					
    +				
    +			
    +			
    +				
    +					Header information
    +					
    +				
    +			
    +			
    +				
    +					Courses group
    +					
    +				
    +			
    +			
    +				
    +					Footer information
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Courses group
    +			
    +		
    +		
    +			
    +				
    +					Name of the group
    +					
    +				
    +			
    +			
    +				
    +					Header information
    +					
    +				
    +			
    +			
    +				
    +					Courses group
    +					
    +				
    +			
    +			
    +				
    +					Footer information
    +					
    +				
    +			
    +		
    +		
    +			
    +				Group identifier
    +				
    +			
    +		
    +	
    +	
    +		
    +			Information identifying
    +				the holder of the qualification
    +		
    +		
    +			
    +				
    +					Family name(s)
    +					
    +				
    +			
    +			
    +				
    +					Given name(s)
    +					
    +				
    +			
    +			
    +				
    +					Date of birth
    +					
    +				
    +			
    +			
    +				
    +					Student identification
    +						number or code
    +				
    +			
    +			
    +				
    +					Country of birth
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Country code ISO
    +										3166-1-alpha-2
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Place of birth
    +					
    +				
    +			
    +			
    +				
    +					Gender
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Gender code
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Information identifying
    +				the qualification
    +		
    +		
    +			
    +				
    +					Qualification
    +					
    +				
    +			
    +			
    +				
    +					Title conferred
    +					
    +				
    +			
    +			
    +				
    +					Main fields of study
    +					
    +				
    +			
    +			
    +				
    +					Name and status of
    +						awarding institution
    +				
    +			
    +			
    +				
    +					Name and status of
    +						institution administering studies
    +				
    +			
    +			
    +				
    +					Language of instruction
    +						and examination
    +				
    +				
    +					
    +						Unique: Language of
    +							instruction and examinatio
    +					
    +					
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Information on the
    +				contents and results gained
    +		
    +		
    +			
    +				
    +					Mode of study
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Mode of study
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Programme requirements
    +					
    +				
    +			
    +			
    +				
    +					Programme details
    +					
    +				
    +			
    +			
    +				
    +					Grading scheme and
    +						grade distribution guidance
    +				
    +			
    +			
    +				
    +					Overall classification
    +						of the qualification
    +				
    +			
    +		
    +	
    +	
    +		
    +			Information on the
    +				function of the qualification type
    +		
    +		
    +			
    +				
    +					Access to further study
    +					
    +				
    +			
    +			
    +				
    +					Professional status
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Is regulated
    +										profession
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Information on the level
    +				of the qualification
    +		
    +		
    +			
    +				
    +					Level ff the
    +						qualification
    +				
    +				
    +					
    +						
    +							
    +								
    +									ISCED 1997 code
    +									
    +								
    +							
    +							
    +								
    +									ISCED 2011 code
    +									
    +								
    +							
    +							
    +								
    +									EHEA Framework code
    +									
    +								
    +							
    +							
    +								
    +									NFQ code
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Official length of
    +						programme
    +				
    +				
    +					
    +						
    +							
    +								
    +									Number of ECTS
    +										credits
    +								
    +							
    +							
    +								
    +									Number of years
    +									
    +								
    +							
    +							
    +								
    +									Number of semesters
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Access requirements
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Name and status of the
    +				institution
    +		
    +		
    +			
    +				
    +					Name of the institution
    +					
    +				
    +			
    +			
    +				
    +					Status of the
    +						institution
    +				
    +			
    +			
    +				
    +					Country of the
    +						institution
    +				
    +				
    +					
    +						
    +							
    +								
    +									Country code ISO
    +										3166-1-alpha-2
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Additional Information
    +						about the institution
    +				
    +			
    +			
    +				
    +					Contact information
    +					
    +				
    +			
    +			
    +				
    +					Logo of the institution
    +						reference
    +				
    +				
    +					
    +						
    +							
    +								
    +									Attached identifier
    +										reference
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +		
    +			
    +				National identification
    +					code or number of the institution
    +			
    +		
    +		
    +			
    +				ERASMUS code of the
    +					institution
    +			
    +		
    +	
    +	
    +		
    +			Language of instruction
    +				and examination
    +		
    +		
    +			
    +				
    +					Language of instruction
    +						and examination
    +				
    +				
    +					
    +						
    +							
    +								
    +									Language code ISO
    +										639-1
    +								
    +							
    +							
    +								
    +									Percent
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Local grade
    +			
    +		
    +		
    +			
    +				
    +					Academic year
    +					
    +				
    +			
    +			
    +				
    +					Date issued
    +					
    +				
    +			
    +			
    +				
    +					Grade
    +					
    +				
    +			
    +			
    +				
    +					Source grade
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Source grade code
    +									
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Mobility programme
    +				courses units
    +		
    +		
    +			
    +				
    +					Course unit
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Mobility programme course
    +				unit
    +		
    +		
    +			
    +				
    +					Course unit code
    +					
    +				
    +			
    +			
    +				
    +					Course unit title
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Language code ISO
    +										639-1
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Number of ECTS credits
    +					
    +				
    +			
    +			
    +				
    +					Additional information
    +					
    +				
    +			
    +		
    +		
    +			
    +				Is in the learning
    +					agreement?
    +			
    +		
    +	
    +	
    +		
    +			Mobility programme
    +			
    +		
    +		
    +			
    +				
    +					Mobility programme type
    +						(e.g. ERASMUS, ISEP, ...)
    +				
    +			
    +			
    +				
    +					Field of study
    +					
    +				
    +			
    +			
    +				
    +					Country
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Country code ISO
    +										3166-1-alpha-2
    +								
    +							
    +						
    +					
    +				
    +			
    +			
    +				
    +					Receiving institution
    +					
    +				
    +			
    +			
    +				
    +					Academic year
    +					
    +				
    +			
    +			
    +				
    +					Study period (Date
    +						from)
    +				
    +			
    +			
    +				
    +					Study period (Date to)
    +					
    +				
    +			
    +			
    +				
    +					Course units
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Multilingual Diploma
    +				Supplement (DS)
    +		
    +		
    +			
    +				
    +					Diploma Supplement
    +					
    +				
    +			
    +			
    +				
    +					Digital signature
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Name and status of
    +				awarding institution
    +		
    +		
    +			
    +				
    +					Awarding institution
    +					
    +				
    +				
    +					
    +						
    +							
    +								
    +									Awarding
    +										institution identifier
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Name and status of
    +				institution administering studies
    +		
    +		
    +			
    +				
    +					Institution
    +						administering studies
    +				
    +				
    +					
    +						
    +							
    +								
    +									Institution
    +										administering studies identifier
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Official certifying the
    +				DS
    +		
    +		
    +			
    +				
    +					Family name(s)
    +					
    +				
    +			
    +			
    +				
    +					Given name(s)
    +					
    +				
    +			
    +			
    +				
    +					Official capacity
    +					
    +				
    +			
    +		
    +		
    +			
    +				Identifier of awarding
    +					institution
    +			
    +		
    +	
    +	
    +		
    +			Officials certifying
    +			
    +		
    +		
    +			
    +				
    +					Official certifying
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Official stamp or seal of
    +				the institution
    +		
    +		
    +			
    +				
    +					Stamp description
    +					
    +				
    +			
    +		
    +		
    +			
    +				Identifier of awarding
    +					institution
    +			
    +		
    +	
    +	
    +		
    +			Programme details
    +			
    +		
    +		
    +			
    +				
    +					Course structure
    +						diagram
    +				
    +			
    +			
    +				
    +					Courses attended in
    +						other institution in mobility programs
    +				
    +			
    +		
    +	
    +	
    +		
    +			Programme requirements
    +			
    +		
    +		
    +			
    +				
    +					Programme requirements
    +					
    +				
    +			
    +			
    +				
    +					Key learning outcomes
    +						of the programme
    +				
    +			
    +		
    +	
    +	
    +		
    +			Qualification
    +			
    +		
    +		
    +			
    +				
    +					Name of the
    +						qualification
    +				
    +			
    +			
    +				
    +					Additional information
    +						about the qualification
    +				
    +			
    +		
    +		
    +			
    +				Local identification
    +					code or number of the qualification
    +			
    +		
    +		
    +			
    +				National identification
    +					code or number of the qualification
    +			
    +		
    +	
    +	
    +		
    +			Rich text tag
    +			
    +		
    +		
    +			
    +				
    +					Specifies bold text
    +					
    +				
    +			
    +			
    +				
    +					Specifies break line
    +					
    +				
    +			
    +			
    +				
    +					Specifies italic text
    +					
    +				
    +			
    +			
    +				
    +					Specifies underline
    +						text
    +				
    +			
    +			
    +				
    +					Specifies reference to
    +						the attached resource 
    +				
    +				
    +					
    +						
    +							
    +								
    +									Attached identifier
    +										reference
    +								
    +							
    +						
    +					
    +				
    +			
    +		
    +	
    +	
    +		
    +			Title conferred
    +			
    +		
    +		
    +			
    +				
    +					Name of the title
    +						conferred
    +				
    +			
    +		
    +	
    +	
    +		
    +			Diploma Supplement
    +			
    +		
    +		
    +		
    +			
    +				Primary Key: Group
    +					identifier
    +			
    +			
    +			
    +		
    +		
    +			
    +				Primary Key: Awarding
    +					institution identifier
    +			
    +			
    +			
    +		
    +		
    +			
    +				Primary Key: Intitution
    +					administering studies identifier
    +			
    +			
    +			
    +		
    +		
    +		
    +			
    +				Foreign Key: Group
    +					identifier
    +			
    +			
    +			
    +		
    +		
    +			
    +				Foreign Key: Awarding
    +					institution (Official Stamp) identifier
    +			
    +			
    +			
    +		
    +		
    +			
    +				Foreign Key: Awarding
    +					institution (Official Stamp) identifier
    +			
    +			
    +			
    +		
    +		
    +			
    +				Foreign Key: Institution
    +					administering studies identifier
    +			
    +			
    +			
    +		
    +	
    +	
    +		
    +			Multilingual Diploma
    +				Supplement
    +		
    +		
    +		
    +			
    +				Unique: Diploma
    +					Supplement language
    +			
    +			
    +			
    +		
    +	
     
    diff --git a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
    index bea3d03f1..ee46caf60 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
    @@ -1,17 +1,17 @@
     
    -
    -		
    -	
    -	
    +
    +
    +	
    +
     	
    -		
    +		
     	
    -	
    +
     	
     		
     			
    @@ -412,14 +412,14 @@
     	
     	
     		
    -		 
    +			
     			
     			
     			
     		
     	
     	
    -		
    +		
     	
     	
     		
    @@ -440,7 +440,7 @@
     		
     	
     	
    -		
    +		
     	
     	
     		
    @@ -454,7 +454,7 @@
     	
     	
     		
    -			
    +			
     		
     	
     	
    @@ -764,27 +764,27 @@
     		
     	
     	
    -		
    +		
     	
     	
     		
    -			
    +			
     		
     	
     	
     		
    -			
    -			
    +			
    +			
     		
     	
     	
     		
    -			
    +			
     		
     	
     	
     		
    -			
    +			
     		
     	
     	
    @@ -798,49 +798,54 @@
     		
     	
     	
    -		
    +		
     	
    - 
    - 
    - 
    - 
    - 
    -  
    - 
    -   
    -     
    -       
    -       
    -     
    -   
    - 
    - 
    - 
    -	 
    +
    +
    +
    +
    +	
    +
    +	
    +		
    +			
    +				
    +				
    +			
    +		
    +	
    +
    +
    +	
     		
    -			
    +			
     			
    -			
    +			
     			
     		
     	
    - 
    - 
    +
    +
     	
     		
     			
     			
     			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     		
     	
    - 
    +
     
     	
     		
    @@ -852,8 +857,8 @@
     			
     		
     	
    - 
    - 
    +
    +
     	
     		
     			
    @@ -864,8 +869,8 @@
     			
     		
     	
    - 
    - 
    +
    +
     	
     		
     			
    @@ -876,8 +881,8 @@
     			
     		
     	
    - 
    - 
    +
    +
     	
     		
     			
    @@ -888,8 +893,8 @@
     			
     		
     	
    - 
    - 
    +
    +
     	
     		
     			
    @@ -904,23 +909,27 @@
     		
     		
     	
    - 
    - 
    +
    +
     	
     		
    -			
    +			
     			
     		
     	
    - 
    - 
    +
    +
     	
     		
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     		
     	
    @@ -928,21 +937,27 @@
     
     	
     		
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     		
     	
     
     
    -	
    +	
     		
    -			
    +			
     			
     		
     	
    @@ -950,9 +965,11 @@
     
     	
     		
    -			
    +			
     			
    -			
    +			
     			
     		
     	
    @@ -960,7 +977,8 @@
     
     	
     		
    -			
    +			
     			
     		
     	
    @@ -968,7 +986,8 @@
     
     	
     		
    -			
    +			
     			
     		
     	
    @@ -978,30 +997,35 @@
     		
     			
     			
    -			
    +			
     			
     		
     	
    - 
    - 
    - 
     
    - 
    +
    +
    +
    +
     	
     		
    -    
    +			
     			
     			
    -			
    +			
     			
     			
    -			
    +			
     			
     			
     				
     					
     						
    -							
    +							
     							
     						
     					
    @@ -1011,7 +1035,8 @@
     				
     					
     						
    -							
    +							
     							
     						
     					
    @@ -1021,152 +1046,189 @@
     				
     					
     						
    -							
    +							
     							
     						
     					
     				
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     				
    -					
    -					
    +					
    +					
     				
     			
     			
     				
     					
     						
    -							
    +							
     							
     						
     					
     				
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     		
     		
     		
    -		
    +		
     		
    -		
    +		
     		
    - 
    - 
    - 
    - 
    - 
    - 
    +	
    +
    +
    +
    +
    +
     	
     		
    -    
    -    
    +			
    +			
    +		
    +	
    +
    +	
    +		
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +			
     		
     	
    - 
    - 
    -   
    -     
    -     
    -     
    -     
    -     
    -     
    -     
    -     
    -   
    - 
    - 
    - 
    - 
    +
    +
    +
     	
     		
     			
    -				
    +				
     				
     			
     		
     	
     
     
    - 
    +	
     
     	
     		
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -   
    -			
    +			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			 
    +			
     			
     			
     			
     		
     		
     		
    -		
    +		
     		
     	
    - 
    - 
    - 
    +
    +
    +	
     	
     		
    -			
    +			
     		
    -		
    +		
     	
     
     
     	
     		
    -			
    +			
     			
     		
     	
    @@ -1184,7 +1246,8 @@
     		
     			
     			
    -			
    +			
     			
     		
     	
    @@ -1194,32 +1257,39 @@
     		
     			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     		
     	
     
    - 
    +	
     	
     		
     			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     		
     		
     		
     	
     
    - 
    +
     
     	
     		
    @@ -1227,19 +1297,24 @@
     			
     			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     			
     				
     					
     						
    -							
    +							
     							
     						
     					
    @@ -1248,24 +1323,30 @@
     		
     	
     
    - 
    - 
    +
    +	
     	
     		
     			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     				
    -					
    -					
    +					
    +					
     				
     			
     		
    @@ -1279,19 +1360,24 @@
     				
     					
     						
    -							
    +							
     							
     						
     					
     				
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     		
     	
    @@ -1300,13 +1386,15 @@
     
     	
     		
    -			
    +			
     			
     			
     				
     					
     						
    -							
    +							
     							
     						
     					
    @@ -1323,11 +1411,14 @@
     				
     					
     						
    -							
    +							
     							
    -							
    +							
     							
    -							
    +							
     							
     							
     							
    @@ -1339,34 +1430,42 @@
     				
     					
     						
    -							
    +							
     							
    -							
    +							
     							
    -							
    +							
     							
     						
     					
     				
     			
    -			
    +			
     			
     		
     	
    - 
    - 
    - 
    +
    +
    +
     	
     		
     			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
    -			
    +			
     			
     			
     				
    @@ -1379,27 +1478,34 @@
     				
     			
     		
    -		
    +		
     		
    -		
    +		
     		
     	
     
     
    - 
    +	
     	
     		
     			
     				
     					
     						
    -							
    +							
     							
    -							
    +							
     							
    -							
    +							
     							
    -							
    +							
     							
     						
     					
    @@ -1412,9 +1518,11 @@
     
     	
     		
    -			
    +			
     			
    -			
    +			
     			
     			
     			
    @@ -1422,7 +1530,8 @@
     				
     					
     						
    -							
    +							
     							
     						
     					
    @@ -1435,7 +1544,8 @@
     
     	
     		
    -			
    +			
     			
     		
     	
    @@ -1455,28 +1565,33 @@
     					
     				
     			
    -			
    +			
     			
    -			
    +			
     			
     		
    -		
    +		
     		
     	
    - 
    - 
    - 
    +
    +
    +
     	
     		
     			
     			
    -			
    +			
     			
     			
     			
     			
     			
    -			
    +			
     			
     			
     			
    @@ -1489,26 +1604,28 @@
     
     
     
    - 
    +	
     
     	
     		
    -			
    +			
     			
     			
     			
     		
     	
     
    - 
    +	
     	
     		
     			
     				
     					
     						
    -							
    +							
     							
     						
     					
    @@ -1517,15 +1634,17 @@
     		
     	
     
    - 
    +	
     	
     		
    -			
    +			
     				
     					
     						
    -							
    +							
     							
     						
     					
    @@ -1541,29 +1660,34 @@
     			
     			
     			
    -			
    +			
     			
     		
    -		
    +		
     		
     	
     
     
     	
     		
    -			
    +			
     			
     		
     	
     
     
    - 
    +	
     	
     		
     			
     			
     		
    -		
    +		
     		
     	
     
    @@ -1572,7 +1696,9 @@
     		
     			
     			
    -			
    +			
     			
     		
     	
    @@ -1582,7 +1708,8 @@
     		
     			
     			
    -			
    +			
     			
     		
     	
    @@ -1592,12 +1719,14 @@
     		
     			
     			
    -			
    +			
     			
     		
     		
     		
    -		
    +		
     		
     	
     
    @@ -1632,53 +1761,57 @@
     			
     		
     	
    - 
    - 
    - 
    - 
    - 
    +
    +
    +
    +
    +	
     
     	
    -		 
    +		 
     		
    -			
    -			
    +			
    +			
     		
     		
    -			
    -			
    +			
    +			
     		
     		
    -			
    -			
    +			
    +			
     		
    -		
    +		
     		
    -			
    -			
    +			
    +			
     		
    -		
    -			
    -			
    +		
    +			
    +			
     		
     		
    -			
    -			
    +			
    +			
     		
     		
    -			
    -			
    +			
    +			
     		
     	
    - 
    - 
    - 
    +
    +
    +	
     
     	
    -		 
    +		 
     		
    -			
    -			
    +			
    +			
     		
     	
     
    diff --git a/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd b/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
    index e75c806e0..de4ac928a 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
    @@ -1,309 +1,302 @@
     
     
    -
    -
    -
    -
    -
    -
    -
    -
    -  
    -  
    -
    -
    -
    -
    -
    -
    -   
    -     
    -     
    -     
    -     
    -    
    -  
    -
    -
    -   
    -  
    -    
    -      
    -        
    -      
    -    
    -  
    -
    -
    -
    -
    -
    -   
    -     
    -     
    -     
    -    
    -   
    -
    -
    -   
    -  
    -    
    -      
    -      
    -    
    -     
    -  
    -
    -  
    -  
    -    
    -      
    -      
    -      
    -    
    -     
    -  
    -
    -
    -
    -
    -
    -   
    -     
    -     
    -     
    -  
    -   
    -   
    -   
    -
    -
    -  
    -  
    -    
    -        
    -    
    -  
    -
    -  
    -  
    -     
    -      
    -      
    -       
    -    
    -     
    -  
    -
    -
    -
    -
    - 
    -  
    -    
    -      
    -   
    -
    -
    -
    -
    -  
    -
    -
    -
    -
    -
    -
    - 
    -
    -       
    -     
    -     
    -     
    -     
    -     
    -    
    -    
    -    
    -    
    -  
    -   
    -
    -
    -  
    -  
    -
    -   
    -  
    -   
    -     
    -     
    -     
    -   
    -  
    -
    -   
    -  
    -    
    -       
    -      
    -    
    -    
    -  
    -
    -
    -
    - 
    -
    -  
    -    
    -      
    -      
    -      
    -      
    -      
    -      
    -    
    -  
    -
    -
    - 
    -   
    -     
    -     
    -  
    -
    -
    -
    -
    -
    -
    - 
    - 
    -  
    -    
    -       
    -       
    -      
    -    
    -    
    -       
    -      
    -    
    -  
    -
    -
    -
    -
    -
    -
    - 
    -
    -  
    -    
    -    
    -  
    - 
    -
    -
    -
    -
    -
    -
    -
    - 
    -
    -  
    -    
    -  
    -   
    -   
    -   
    -
    -
    - 
    -
    -  
    -     
    -  
    -   
    -
    -
    - 
    -
    -  
    -     
    -  
    -   
    -
    -
    -    
    -   
    -     
    -       
    -       
    -     
    -      
    -      
    -   
    -
    -
    -
    -
    -
    -
    -  
    -
    -
    -
    -
    -
    -
    -  
    -    
    -      
    -      
    -    
    -    
    -    
    -    
    -    
    -      
    -      
    -    
    -  
    -
    -
    -
    -
    -  
    -     
    -     
    -  
    - 
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +	
    +
    +	
    +		
    +		
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +		
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +				
    +			
    +		
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +			
    +		
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +		
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +			
    +		
    +		
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +			
    +		
    +		
    +		
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +			
    +		
    +		
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +		
    +		
    +	
    +
    +	
    +	
    +		
    +	
    +
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +			
    +		
    +		
    +	
    +
    +	
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +			
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +		
    +		
    +		
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +				
    +				
    +				
    +				
    +				
    +				
    +			
    +		
    +	
    +
    +	
    +		
    +			
    +			
    +		
    +	
    +
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +				
    +				
    +				
    +			
    +			
    +				
    +				
    +			
    +		
    +	
    +
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +
    +	
    +
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +		
    +		
    +		 
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +		
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +		
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +		
    +		
    +		
    +	
    +
    +	
    +
    +	
    +
    +	
    +		
    +	
    +
    +	
    +
    +	
    +	
    +		
    +			
    +				
    +				
    +			
    +			
    +			
    +			
    +			
    +				
    +				
    +			
    +		
    +	
    +
    +	
    +	
    +		
    +			
    +			
    +		
    +	
    +
    +	
    +
    +	
     
     
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
    index 89f5adbed..65f1f2247 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
    @@ -29,10 +29,10 @@ public class AttributeProvidersMapTestCase {
     		final IPersonalAttributeList pal = new PersonalAttributeList();
     		boolean outcome = false;
     
    -		//Add a single item
    +		// Add a single item
     		map.put(source, pal);
     
    -		if ( map.containsKey(source) ) {
    +		if (map.containsKey(source)) {
     			outcome = true;
     		}
     
    @@ -46,11 +46,11 @@ public class AttributeProvidersMapTestCase {
     		final IPersonalAttributeList pal = new PersonalAttributeList();
     		boolean outcome = false;
     
    -		//Add a single item
    +		// Add a single item
     		map.put(source, pal);
     
    -		if ( map.containsKey(source) ) {
    -			if ( map.get(source)!=null ) {
    +		if (map.containsKey(source)) {
    +			if (map.get(source) != null) {
     				outcome = true;
     			}
     		}
    @@ -66,10 +66,10 @@ public class AttributeProvidersMapTestCase {
     		final IPersonalAttributeList pal = new PersonalAttributeList();
     		boolean outcome = false;
     
    -		//Add a single item
    +		// Add a single item
     		map.put(source, pal);
     
    -		if ( map.containsKey(target) ) {
    +		if (map.containsKey(target)) {
     			outcome = true;
     		}
     
    @@ -84,11 +84,11 @@ public class AttributeProvidersMapTestCase {
     		final IPersonalAttributeList pal = new PersonalAttributeList();
     		boolean outcome = false;
     
    -		//Add a single item
    +		// Add a single item
     		map.put(source, pal);
     
    -		if ( map.containsKey(target) ) {
    -			if ( map.get(target)!=null ) {
    +		if (map.containsKey(target)) {
    +			if (map.get(target) != null) {
     				outcome = true;
     			}
     		}
    @@ -104,10 +104,10 @@ public class AttributeProvidersMapTestCase {
     		final IPersonalAttributeList pal = new PersonalAttributeList();
     		boolean outcome = false;
     
    -		//Add a single item
    +		// Add a single item
     		map.put(source, pal);
     
    -		if ( map.containsKey(target) ) {
    +		if (map.containsKey(target)) {
     			outcome = true;
     		}
     
    @@ -122,10 +122,10 @@ public class AttributeProvidersMapTestCase {
     		final IPersonalAttributeList pal = new PersonalAttributeList();
     		boolean outcome = false;
     
    -		//Add a single item
    +		// Add a single item
     		map.put(source, pal);
     
    -		if ( map.containsKey(target) ) {
    +		if (map.containsKey(target)) {
     			outcome = true;
     		}
     
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
    index 77fc4b9c2..6f3e5273a 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
    @@ -32,506 +32,447 @@ import eu.stork.peps.auth.commons.PersonalAttributeList;
     /**
      * The AttributeUtil's Test Case.
      * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    - *         luis.felix@multicert.com
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com
      * 
      * @version $Revision: $, $Date: $
      */
     public final class AttributeUtilTestCase {
    -  
    -  /**
    -   * Empty String to be used on the tests.
    -   */
    -  private static final String EMPTY_STRING = "";
    -  
    -  /**
    -   * Tuple value sample to be used on the tests.
    -   */
    -  private static final String[] TUPLE_STRING = new String[] { "age", "true",
    -    "[18]", "Available" };
    -  
    -  /**
    -   * Complex value to be used on escape/unescape tests.
    -   */
    -  private static final String COMPLEX_VAL = "postalCode=4100,"
    -    + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379,"
    -    + "streetName=Avenida Sidonio Pais,town=Porto,";
    -  
    -  /**
    -   * Escaped Complex value to be used on escape/unescape tests.
    -   */
    -  private static final String ESC_COMPLEX_VAL = "postalCode=4100%44"
    -    + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44"
    -    + "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44";
    -  
    -  /**
    -   * Simple value to be used on escape/unescape tests.
    -   */
    -  private static final String SIMPLE_VAL = "Avenida da Boavista, Porto";
    -  
    -  /**
    -   * Escaped simple value to be used on escape/unescape tests.
    -   */
    -  private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto";
    -  
    -  /**
    -   * Simple text to be used on escape/unescape tests. Must match the escaped
    -   * text.
    -   */
    -  private static final String SIMPLE_TEXT = "John Doe";
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#escape(String)} method for the given complex
    -   * attribute value (canonical address' example attribute value).
    -   */
    -  @Test
    -  public void testEscapeSpecialCharsComplexVal() {
    -    assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#escape(String)} method for the given
    -   * attribute value.
    -   */
    -  @Test
    -  public void testEscapeSpecialCharsVal() {
    -    assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#escape(String)} method for the given simple
    -   * text: no special characters to escape.
    -   */
    -  @Test
    -  public void testEscapeNormalChars() {
    -    assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#unescape(String)} method for the given
    -   * escape complex attribute value (canonical address' example attribute
    -   * value).
    -   */
    -  @Test
    -  public void testUnescapeSpecialCharsComplexVal() {
    -    assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#escape(String)} method for the given escape
    -   * attribute value.
    -   */
    -  @Test
    -  public void testUnescapeSpecialCharsVal() {
    -    assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#escape(String)} method for the given simple
    -   * text: no special characters to unescape.
    -   */
    -  @Test
    -  public void testUnescapeNormalChars() {
    -    assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
    -   * method for the given empty string.
    -   */
    -  @Test
    -  public void testAppendIfNotNullEmptyStr() {
    -    final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT);
    -    AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING);
    -    assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
    -   * method for the given string.
    -   */
    -  @Test
    -  public void testAppendIfNotNullStr() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT);
    -    assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
    -   * method for the given null value.
    -   */
    -  @Test
    -  public void testAppendIfNotNull() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    AttributeUtil.appendIfNotNull(strBuilder, null);
    -    assertEquals(strBuilder.toString(), EMPTY_STRING);
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#listToString(List, String)} method for the
    -   * given List with two values.
    -   */
    -  @Test
    -  public void testListToStringTwoVals() {
    -    final List vals = new ArrayList();
    -    vals.add(SIMPLE_VAL);
    -    vals.add(SIMPLE_TEXT);
    -    
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append(ESC_SIMPLE_VAL);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    strBuilder.append(SIMPLE_TEXT);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    
    -    assertEquals(
    -      AttributeUtil.listToString(vals,
    -        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#listToString(List, String)} method for the
    -   * given List with one values.
    -   */
    -  @Test
    -  public void testListToStringOneVal() {
    -    final List vals = new ArrayList();
    -    vals.add(SIMPLE_VAL);
    -    
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append(ESC_SIMPLE_VAL);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    
    -    assertEquals(
    -      AttributeUtil.listToString(vals,
    -        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#listToString(List, String)} method for the
    -   * given List with one value.
    -   */
    -  @Test
    -  public void testListToStringEmptyVal() {
    -    final List vals = new ArrayList();
    -    
    -    final StringBuilder strBuilder = new StringBuilder();
    -    
    -    assertEquals(
    -      AttributeUtil.listToString(vals,
    -        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
    -   * for the given Map with one value.
    -   */
    -  @Test
    -  public void testMapToStringOneVal() {
    -    final Map vals = new HashMap();
    -    vals.put("CanonicalAddress", COMPLEX_VAL);
    -    
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append("CanonicalAddress=");
    -    strBuilder.append(ESC_COMPLEX_VAL);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    
    -    assertEquals(AttributeUtil.mapToString(vals,
    -      PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
    -   * for the given empty Map.
    -   */
    -  @Test
    -  public void testMapToStringEmptyVal() {
    -    final Map vals = new HashMap();
    -    
    -    final StringBuilder strBuilder = new StringBuilder();
    -    
    -    assertEquals(AttributeUtil.mapToString(vals,
    -      PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * invalid List.
    -   */
    -  @Test
    -  public void testIsValidValueInvalidList() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append(ESC_SIMPLE_VAL);
    -    strBuilder.append("]");
    -    assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * null value.
    -   */
    -  @Test
    -  public void testIsValidValueNullList() {
    -    assertFalse(AttributeUtil.isValidValue(null));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * empty List.
    -   */
    -  @Test
    -  public void testIsValidValueEmptyList() {
    -    assertTrue(AttributeUtil.isValidValue("[]"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * empty List.
    -   */
    -  @Test
    -  public void testIsValidValueEmptyCommaList() {
    -    assertTrue(AttributeUtil.isValidValue("[,]"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * one simple value List.
    -   */
    -  @Test
    -  public void testIsValidValueOneValueList() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append("[");
    -    strBuilder.append(ESC_SIMPLE_VAL);
    -    strBuilder.append("]");
    -    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * one simple value List.
    -   */
    -  @Test
    -  public void testIsValidValueOneValueCommaList() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append("[");
    -    strBuilder.append(ESC_SIMPLE_VAL);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    strBuilder.append("]");
    -    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * one complex value List.
    -   */
    -  @Test
    -  public void testIsValidValueOneComplexValueList() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append("[");
    -    strBuilder.append(ESC_COMPLEX_VAL);
    -    strBuilder.append("]");
    -    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * one complex value List.
    -   */
    -  @Test
    -  public void testIsValidValueOneComplexValueCommaList() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append("[");
    -    strBuilder.append(ESC_COMPLEX_VAL);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    strBuilder.append("]");
    -    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * multi value List.
    -   */
    -  @Test
    -  public void testIsValidValueMultiValueList() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append("[");
    -    strBuilder.append(ESC_SIMPLE_VAL);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    strBuilder.append(SIMPLE_TEXT);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    strBuilder.append("]");
    -    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    -   * invalid multi value List.
    -   */
    -  @Test
    -  public void testIsValidValueInvalidMultiValueList() {
    -    final StringBuilder strBuilder = new StringBuilder();
    -    strBuilder.append(ESC_SIMPLE_VAL);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    strBuilder.append(SIMPLE_TEXT);
    -    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -    strBuilder.append("]");
    -    assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * true type.
    -   */
    -  @Test
    -  public void testIsValidTypetrue() {
    -    assertTrue(AttributeUtil.isValidType("true"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * True type.
    -   */
    -  @Test
    -  public void testIsValidTypeTrue() {
    -    assertTrue(AttributeUtil.isValidType("True"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * TRUE type.
    -   */
    -  @Test
    -  public void testIsValidTypeTRUE() {
    -    assertTrue(AttributeUtil.isValidType("TRUE"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * invalid type.
    -   */
    -  @Test
    -  public void testIsValidTypeInvalidType() {
    -    assertFalse(AttributeUtil.isValidType("str"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * false type.
    -   */
    -  @Test
    -  public void testIsValidTypefalse() {
    -    assertTrue(AttributeUtil.isValidType("false"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * False type.
    -   */
    -  @Test
    -  public void testIsValidTypeFalse() {
    -    assertTrue(AttributeUtil.isValidType("False"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * FALSE type.
    -   */
    -  @Test
    -  public void testIsValidTypeFALSEVal() {
    -    assertTrue(AttributeUtil.isValidType("False"));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    -   * null.
    -   */
    -  @Test
    -  public void testIsValidTypeNullVal() {
    -    assertFalse(AttributeUtil.isValidType(null));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    -   * given valid tuple.
    -   */
    -  @Test
    -  public void testHasValidTuples() {
    -    assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    -   * given invalid tuple. 
    -   */
    -  @Test
    -  public void testHasValidTuplesInvalid() {
    -    final String[] tuple = new String[]{"name", "type"};
    -    assertFalse(AttributeUtil.hasValidTuples(tuple));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    -   * given invalid tuple with valid size.
    -   */
    -  @Test
    -  public void testHasValidTuplesSameSizeInvalidValues() {
    -    final String[] tuple = new String[] { "age", "type", "[18]", "Available"};
    -    assertFalse(AttributeUtil.hasValidTuples(tuple));
    -  }
    -  
    -  /**
    -   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    -   * given null value.
    -   */
    -  @Test
    -  public void testHasValidTuplesNull() {
    -    assertFalse(AttributeUtil.hasValidTuples(null));
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    -   * method for the given attribute list..
    -   */
    -  @Test
    -  public void testCheckMandatoryAttributes() {
    -    final IPersonalAttributeList attrList = new PersonalAttributeList();
    -    attrList.populate("isAgeOver:true:[18,]:Available;");
    -    assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    -    
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    -   * method for the given null value.
    -   */
    -  @Test(expected = NullPointerException.class)
    -  public void testCheckMandatoryAttributesNullAttrList() {
    -    assertTrue(AttributeUtil.checkMandatoryAttributes(null));
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    -   * method for the given empty attribute list.
    -   */
    -  @Test
    -  public void testCheckMandatoryAttributesEmptyAttrList() {
    -    final IPersonalAttributeList attrList = new PersonalAttributeList();
    -    assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    -   * method for the given attribute list (missing mandatory attribute).
    -   */
    -  @Test
    -  public void testCheckMandatoryAttributesMissingAttr() {
    -    final IPersonalAttributeList attrList = new PersonalAttributeList();
    -    attrList.populate("isAgeOver:true:[]:NotAvailable;");
    -    assertFalse(AttributeUtil.checkMandatoryAttributes(attrList));
    -  }
    -  
    +
    +	/**
    +	 * Empty String to be used on the tests.
    +	 */
    +	private static final String EMPTY_STRING = "";
    +
    +	/**
    +	 * Tuple value sample to be used on the tests.
    +	 */
    +	private static final String[] TUPLE_STRING = new String[] { "age", "true", "[18]", "Available" };
    +
    +	/**
    +	 * Complex value to be used on escape/unescape tests.
    +	 */
    +	private static final String COMPLEX_VAL = "postalCode=4100," + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379," + "streetName=Avenida Sidonio Pais,town=Porto,";
    +
    +	/**
    +	 * Escaped Complex value to be used on escape/unescape tests.
    +	 */
    +	private static final String ESC_COMPLEX_VAL = "postalCode=4100%44" + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44"
    +			+ "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44";
    +
    +	/**
    +	 * Simple value to be used on escape/unescape tests.
    +	 */
    +	private static final String SIMPLE_VAL = "Avenida da Boavista, Porto";
    +
    +	/**
    +	 * Escaped simple value to be used on escape/unescape tests.
    +	 */
    +	private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto";
    +
    +	/**
    +	 * Simple text to be used on escape/unescape tests. Must match the escaped text.
    +	 */
    +	private static final String SIMPLE_TEXT = "John Doe";
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#escape(String)} method for the given complex attribute value (canonical address' example attribute value).
    +	 */
    +	@Test
    +	public void testEscapeSpecialCharsComplexVal() {
    +		assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#escape(String)} method for the given attribute value.
    +	 */
    +	@Test
    +	public void testEscapeSpecialCharsVal() {
    +		assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#escape(String)} method for the given simple text: no special characters to escape.
    +	 */
    +	@Test
    +	public void testEscapeNormalChars() {
    +		assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#unescape(String)} method for the given escape complex attribute value (canonical address' example attribute value).
    +	 */
    +	@Test
    +	public void testUnescapeSpecialCharsComplexVal() {
    +		assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#escape(String)} method for the given escape attribute value.
    +	 */
    +	@Test
    +	public void testUnescapeSpecialCharsVal() {
    +		assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#escape(String)} method for the given simple text: no special characters to unescape.
    +	 */
    +	@Test
    +	public void testUnescapeNormalChars() {
    +		assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} method for the given empty string.
    +	 */
    +	@Test
    +	public void testAppendIfNotNullEmptyStr() {
    +		final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT);
    +		AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING);
    +		assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} method for the given string.
    +	 */
    +	@Test
    +	public void testAppendIfNotNullStr() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT);
    +		assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} method for the given null value.
    +	 */
    +	@Test
    +	public void testAppendIfNotNull() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		AttributeUtil.appendIfNotNull(strBuilder, null);
    +		assertEquals(strBuilder.toString(), EMPTY_STRING);
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#listToString(List, String)} method for the given List with two values.
    +	 */
    +	@Test
    +	public void testListToStringTwoVals() {
    +		final List vals = new ArrayList();
    +		vals.add(SIMPLE_VAL);
    +		vals.add(SIMPLE_TEXT);
    +
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append(ESC_SIMPLE_VAL);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +		strBuilder.append(SIMPLE_TEXT);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +
    +		assertEquals(AttributeUtil.listToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#listToString(List, String)} method for the given List with one values.
    +	 */
    +	@Test
    +	public void testListToStringOneVal() {
    +		final List vals = new ArrayList();
    +		vals.add(SIMPLE_VAL);
    +
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append(ESC_SIMPLE_VAL);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +
    +		assertEquals(AttributeUtil.listToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#listToString(List, String)} method for the given List with one value.
    +	 */
    +	@Test
    +	public void testListToStringEmptyVal() {
    +		final List vals = new ArrayList();
    +
    +		final StringBuilder strBuilder = new StringBuilder();
    +
    +		assertEquals(AttributeUtil.listToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method for the given Map with one value.
    +	 */
    +	@Test
    +	public void testMapToStringOneVal() {
    +		final Map vals = new HashMap();
    +		vals.put("CanonicalAddress", COMPLEX_VAL);
    +
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append("CanonicalAddress=");
    +		strBuilder.append(ESC_COMPLEX_VAL);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +
    +		assertEquals(AttributeUtil.mapToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method for the given empty Map.
    +	 */
    +	@Test
    +	public void testMapToStringEmptyVal() {
    +		final Map vals = new HashMap();
    +
    +		final StringBuilder strBuilder = new StringBuilder();
    +
    +		assertEquals(AttributeUtil.mapToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given invalid List.
    +	 */
    +	@Test
    +	public void testIsValidValueInvalidList() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append(ESC_SIMPLE_VAL);
    +		strBuilder.append("]");
    +		assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given null value.
    +	 */
    +	@Test
    +	public void testIsValidValueNullList() {
    +		assertFalse(AttributeUtil.isValidValue(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given empty List.
    +	 */
    +	@Test
    +	public void testIsValidValueEmptyList() {
    +		assertTrue(AttributeUtil.isValidValue("[]"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given empty List.
    +	 */
    +	@Test
    +	public void testIsValidValueEmptyCommaList() {
    +		assertTrue(AttributeUtil.isValidValue("[,]"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one simple value List.
    +	 */
    +	@Test
    +	public void testIsValidValueOneValueList() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append("[");
    +		strBuilder.append(ESC_SIMPLE_VAL);
    +		strBuilder.append("]");
    +		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one simple value List.
    +	 */
    +	@Test
    +	public void testIsValidValueOneValueCommaList() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append("[");
    +		strBuilder.append(ESC_SIMPLE_VAL);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +		strBuilder.append("]");
    +		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one complex value List.
    +	 */
    +	@Test
    +	public void testIsValidValueOneComplexValueList() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append("[");
    +		strBuilder.append(ESC_COMPLEX_VAL);
    +		strBuilder.append("]");
    +		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one complex value List.
    +	 */
    +	@Test
    +	public void testIsValidValueOneComplexValueCommaList() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append("[");
    +		strBuilder.append(ESC_COMPLEX_VAL);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +		strBuilder.append("]");
    +		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given multi value List.
    +	 */
    +	@Test
    +	public void testIsValidValueMultiValueList() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append("[");
    +		strBuilder.append(ESC_SIMPLE_VAL);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +		strBuilder.append(SIMPLE_TEXT);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +		strBuilder.append("]");
    +		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given invalid multi value List.
    +	 */
    +	@Test
    +	public void testIsValidValueInvalidMultiValueList() {
    +		final StringBuilder strBuilder = new StringBuilder();
    +		strBuilder.append(ESC_SIMPLE_VAL);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +		strBuilder.append(SIMPLE_TEXT);
    +		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +		strBuilder.append("]");
    +		assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given true type.
    +	 */
    +	@Test
    +	public void testIsValidTypetrue() {
    +		assertTrue(AttributeUtil.isValidType("true"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given True type.
    +	 */
    +	@Test
    +	public void testIsValidTypeTrue() {
    +		assertTrue(AttributeUtil.isValidType("True"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given TRUE type.
    +	 */
    +	@Test
    +	public void testIsValidTypeTRUE() {
    +		assertTrue(AttributeUtil.isValidType("TRUE"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given invalid type.
    +	 */
    +	@Test
    +	public void testIsValidTypeInvalidType() {
    +		assertFalse(AttributeUtil.isValidType("str"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given false type.
    +	 */
    +	@Test
    +	public void testIsValidTypefalse() {
    +		assertTrue(AttributeUtil.isValidType("false"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given False type.
    +	 */
    +	@Test
    +	public void testIsValidTypeFalse() {
    +		assertTrue(AttributeUtil.isValidType("False"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given FALSE type.
    +	 */
    +	@Test
    +	public void testIsValidTypeFALSEVal() {
    +		assertTrue(AttributeUtil.isValidType("False"));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given null.
    +	 */
    +	@Test
    +	public void testIsValidTypeNullVal() {
    +		assertFalse(AttributeUtil.isValidType(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given valid tuple.
    +	 */
    +	@Test
    +	public void testHasValidTuples() {
    +		assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given invalid tuple.
    +	 */
    +	@Test
    +	public void testHasValidTuplesInvalid() {
    +		final String[] tuple = new String[] { "name", "type" };
    +		assertFalse(AttributeUtil.hasValidTuples(tuple));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given invalid tuple with valid size.
    +	 */
    +	@Test
    +	public void testHasValidTuplesSameSizeInvalidValues() {
    +		final String[] tuple = new String[] { "age", "type", "[18]", "Available" };
    +		assertFalse(AttributeUtil.hasValidTuples(tuple));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given null value.
    +	 */
    +	@Test
    +	public void testHasValidTuplesNull() {
    +		assertFalse(AttributeUtil.hasValidTuples(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given attribute list..
    +	 */
    +	@Test
    +	public void testCheckMandatoryAttributes() {
    +		final IPersonalAttributeList attrList = new PersonalAttributeList();
    +		attrList.populate("isAgeOver:true:[18,]:Available;");
    +		assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    +
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given null value.
    +	 */
    +	@Test(expected = NullPointerException.class)
    +	public void testCheckMandatoryAttributesNullAttrList() {
    +		assertTrue(AttributeUtil.checkMandatoryAttributes(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given empty attribute list.
    +	 */
    +	@Test
    +	public void testCheckMandatoryAttributesEmptyAttrList() {
    +		final IPersonalAttributeList attrList = new PersonalAttributeList();
    +		assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    +	}
    +
    +	/**
    +	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given attribute list (missing mandatory attribute).
    +	 */
    +	@Test
    +	public void testCheckMandatoryAttributesMissingAttr() {
    +		final IPersonalAttributeList attrList = new PersonalAttributeList();
    +		attrList.populate("isAgeOver:true:[]:NotAvailable;");
    +		assertFalse(AttributeUtil.checkMandatoryAttributes(attrList));
    +	}
    +
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
    index fc6e65f70..b8220ce98 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
    @@ -33,262 +33,243 @@ import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.O
     import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.RepresentationPersonType;
     
     /**
    - * @author Advania Examples on how to use the jaxb marshaller. The classes are created from the
    - *         StorkcomplexAttributes.xsd schema located in resources.
    - * @version $Revision: 1.00 $, $Date: 2014-17-02 11:15:00 $ 
    + * @author Advania Examples on how to use the jaxb marshaller. The classes are created from the StorkcomplexAttributes.xsd schema located in resources.
    + * @version $Revision: 1.00 $, $Date: 2014-17-02 11:15:00 $
      *
      */
     
     public class ComplexAttributesMarshalling {
     
    -    MandateContentType       mtObject  = new MandateContentType();
    -    RepresentationPersonType rpObject  = new RepresentationPersonType();
    -    RepresentationPersonType rptObject = new RepresentationPersonType();
    -
    -    void initMandateValues() {
    -        // Fill in the information ...
    -        mtObject.setIsChained(false);
    -        // mtObject.setIsJoined("IsJoined");
    -        mtObject.setTypeOfPower("The Force");
    -        mtObject.setIsChained(false);
    -        // ... fill in info for the representative
    -        rpObject.setTextRegisteredAddress("Address at some street");
    -        rpObject.setDateOfBirth(DateTime.now().toString());
    -        rpObject.setEIdentifier("123456");
    -        rpObject.setGivenName("Name of some person");
    -        rpObject.setLegalForm("Type of person");
    -        // .... fill in the info for the represented
    -        rptObject.setTextRegisteredAddress("Another Address at some street");
    -        rptObject.setDateOfBirth(DateTime.now().toString());
    -        rptObject.setEIdentifier("654321");
    -        rptObject.setGivenName("Another Name of some person");
    -        rptObject.setLegalForm("Yet another type of person");
    -    }
    +	MandateContentType mtObject = new MandateContentType();
    +	RepresentationPersonType rpObject = new RepresentationPersonType();
    +	RepresentationPersonType rptObject = new RepresentationPersonType();
    +
    +	void initMandateValues() {
    +		// Fill in the information ...
    +		mtObject.setIsChained(false);
    +		// mtObject.setIsJoined("IsJoined");
    +		mtObject.setTypeOfPower("The Force");
    +		mtObject.setIsChained(false);
    +		// ... fill in info for the representative
    +		rpObject.setTextRegisteredAddress("Address at some street");
    +		rpObject.setDateOfBirth(DateTime.now().toString());
    +		rpObject.setEIdentifier("123456");
    +		rpObject.setGivenName("Name of some person");
    +		rpObject.setLegalForm("Type of person");
    +		// .... fill in the info for the represented
    +		rptObject.setTextRegisteredAddress("Another Address at some street");
    +		rptObject.setDateOfBirth(DateTime.now().toString());
    +		rptObject.setEIdentifier("654321");
    +		rptObject.setGivenName("Another Name of some person");
    +		rptObject.setLegalForm("Yet another type of person");
    +	}
     
     	/**
    -     * Test marshalling canonical address 
    -	 *  
    -     * IS Reykjavik RVK
    -     * Reykjavik 101 Laugavegur
    -     * 1 10 
    +	 * Test marshalling canonical address  
    +	 * IS Reykjavik RVK Reykjavik 101
    +	 * Laugavegur 1 10 
     	 */
     	@Test
    -	public void testMarshallCanonicalResidencAddress() 
    -	{
    -		try 
    -		{
    -		    final CanonicalAddressType object = new CanonicalAddressType();
    -		    object.setApartmentNumber("10");
    -		    object.setCountryCodeAddress("IS");
    -		    object.setMunicipalityCode("RVK");
    -		    object.setPostalCode("101");
    -		    object.setState("Reykjavik");
    -		    object.setStreetName("Laugavegur");
    -		    object.setStreetNumber("1");
    -		    object.setTown("Reykjavik");
    -
    -		    final JAXBContext context = JAXBContext.newInstance(CanonicalAddressType.class);
    -		    final Marshaller m = context.createMarshaller();
    -		    m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    -		    final ObjectFactory objf = new ObjectFactory();
    -			
    -		    m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));		    
    +	public void testMarshallCanonicalResidencAddress() {
    +		try {
    +			final CanonicalAddressType object = new CanonicalAddressType();
    +			object.setApartmentNumber("10");
    +			object.setCountryCodeAddress("IS");
    +			object.setMunicipalityCode("RVK");
    +			object.setPostalCode("101");
    +			object.setState("Reykjavik");
    +			object.setStreetName("Laugavegur");
    +			object.setStreetNumber("1");
    +			object.setTown("Reykjavik");
    +
    +			final JAXBContext context = JAXBContext.newInstance(CanonicalAddressType.class);
    +			final Marshaller m = context.createMarshaller();
    +			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    +			final ObjectFactory objf = new ObjectFactory();
    +
    +			m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));
     			m.marshal(objf.createCanonicalResidenceAddress(object), System.out);
    +		} catch (Exception e) {
    +			e.printStackTrace();
     		}
    -        catch ( Exception e ) {
    +	}
    +
    +	@Test
    +	public void testForDiana() {
    +		initMandateValues();
    +
    +		try {
    +			// Create the marshallers'
    +
    +			final JAXBContext mandateTypeContext = JAXBContext.newInstance(MandateType.class);
    +			final Marshaller mandateMarshaller = mandateTypeContext.createMarshaller();
    +			final Unmarshaller mandateUnmarshaller = mandateTypeContext.createUnmarshaller();
    +
    +			// final JAXBContext MandateContentTypecontext = JAXBContext.newInstance(MandateContentType.class);
    +			// final Marshaller mandM = MandateContentTypecontext.createMarshaller();
    +			//
    +			// final JAXBContext RepresentationPersonTypecontext =
    +			// JAXBContext.newInstance(RepresentationPersonType.class);
    +			// final Marshaller repM = RepresentationPersonTypecontext.createMarshaller();
    +			//
    +
    +			final ObjectFactory objf = new ObjectFactory();
    +			MandateType mandate = new MandateType();
    +			RepresentationPersonType representative = new RepresentationPersonType();
    +			representative.setDateOfBirth("1990-01-01");
    +			representative.setGivenName("Bilbo");
    +			representative.setSurname("Baggins");
    +			representative.setEIdentifier("IT/IT/12345678990");
    +			mandate.setRepresentative(representative);
    +
    +			RepresentationPersonType represented = new RepresentationPersonType();
    +			represented.setTextRegisteredAddress("Via....");
    +			represented.setELPIdentifier("IT/1111111");
    +			represented.setLegalName("Shire Corp.");
    +			mandate.setRepresented(represented);
    +
    +			MandateContentType mandateContent1 = new MandateContentType();
    +			// OriginalMandateType omt1 = new OriginalMandateType();
    +			// omt1.setMimeType("text/plain");
    +			// omt1.setValue("Chief executive officer".getBytes());
    +			mandateContent1.setOriginalMandate("Chief executive officer".getBytes());
    +			mandateContent1.setOriginalMandateType("text/plain");
    +			MandateContentType mandateContent2 = new MandateContentType();
    +			// mandateContent2.setOriginalMandate(omt1);
    +			mandateContent2.setOriginalMandate("Chief executive officer2".getBytes());
    +			mandateContent2.setOriginalMandateType("text/plain");
    +			mandate.getMandateContent().add(mandateContent1);
    +			mandate.getMandateContent().add(mandateContent2);
    +
    +			// create a hashmap
    +			// HashMap complexMandate = new HashMap();
    +
    +			// marshall the mandatecontent
    +			StringWriter sw = new StringWriter();
    +			mandateMarshaller.marshal(objf.createMandate(mandate), sw);
    +
    +			System.out.print(sw.toString());
    +
    +			// add it to the hashmap
    +			// complexMandate.put("representative", sw.toString());
    +			// sw.flush();
    +			//
    +			// // continue with the rest of the objects.
    +			// repM.marshal(objf.createRepresentationPerson(rpObject), sw);
    +			// System.out.print(sw.toString());
    +			// complexMandate.put("representative", sw.toString());
    +			// sw.flush();
    +			//
    +			// MandateType mandateType = new MandateType();
    +			//
    +			// repM.marshal(objf.createRepresentationPerson(rptObject), sw);
    +			// System.out.print(sw.toString());
    +			// complexMandate.put("represented", sw.toString());
    +			// sw.flush();
    +			//
    +			// // add the complex values to the attr.list.
    +			// PersonalAttribute pal = new PersonalAttribute();
    +			//
    +			// pal.setName("mandateContent");
    +			// pal.setIsRequired(pal.isRequired());
    +			// pal.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +			// pal.setComplexValue(complexMandate);
    +			//
    +			// System.out.println(pal.toString());
    +		} catch (JAXBException e) {
     			e.printStackTrace();
    -        }
    -    }
    -
    -    @Test
    -    public void testForDiana() {
    -        initMandateValues();
    -			
    -        try {
    -            // Create the marshallers'
    -
    -            final JAXBContext mandateTypeContext = JAXBContext.newInstance(MandateType.class);
    -            final Marshaller mandateMarshaller = mandateTypeContext.createMarshaller();
    -            final Unmarshaller mandateUnmarshaller = mandateTypeContext.createUnmarshaller();
    -
    -            // final JAXBContext MandateContentTypecontext = JAXBContext.newInstance(MandateContentType.class);
    -            // final Marshaller mandM = MandateContentTypecontext.createMarshaller();
    -            //
    -            // final JAXBContext RepresentationPersonTypecontext =
    -            // JAXBContext.newInstance(RepresentationPersonType.class);
    -            // final Marshaller repM = RepresentationPersonTypecontext.createMarshaller();
    -            //
    -
    -            final ObjectFactory objf = new ObjectFactory();
    -            MandateType mandate = new MandateType();
    -            RepresentationPersonType representative = new RepresentationPersonType();
    -            representative.setDateOfBirth("1990-01-01");
    -            representative.setGivenName("Bilbo");
    -            representative.setSurname("Baggins");
    -            representative.setEIdentifier("IT/IT/12345678990");
    -            mandate.setRepresentative(representative);
    -
    -            RepresentationPersonType represented = new RepresentationPersonType();
    -            represented.setTextRegisteredAddress("Via....");
    -            represented.setELPIdentifier("IT/1111111");
    -            represented.setLegalName("Shire Corp.");
    -            mandate.setRepresented(represented);
    -
    -            MandateContentType mandateContent1 = new MandateContentType();
    -            // OriginalMandateType omt1 = new OriginalMandateType();
    -            // omt1.setMimeType("text/plain");
    -            // omt1.setValue("Chief executive officer".getBytes());
    -            mandateContent1.setOriginalMandate("Chief executive officer".getBytes());
    -            mandateContent1.setOriginalMandateType("text/plain");
    -            MandateContentType mandateContent2 = new MandateContentType();
    -            // mandateContent2.setOriginalMandate(omt1);
    -            mandateContent2.setOriginalMandate("Chief executive officer2".getBytes());
    -            mandateContent2.setOriginalMandateType("text/plain");
    -            mandate.getMandateContent().add(mandateContent1);
    -            mandate.getMandateContent().add(mandateContent2);
    -
    -            // create a hashmap
    -            // HashMap complexMandate = new HashMap();
    -
    -            // marshall the mandatecontent
    -            StringWriter sw = new StringWriter();
    -            mandateMarshaller.marshal(objf.createMandate(mandate), sw);
    -
    -            System.out.print(sw.toString());
    -
    -            // add it to the hashmap
    -            // complexMandate.put("representative", sw.toString());
    -            // sw.flush();
    -            //
    -            // // continue with the rest of the objects.
    -            // repM.marshal(objf.createRepresentationPerson(rpObject), sw);
    -            // System.out.print(sw.toString());
    -            // complexMandate.put("representative", sw.toString());
    -            // sw.flush();
    -            //
    -            // MandateType mandateType = new MandateType();
    -            //
    -            // repM.marshal(objf.createRepresentationPerson(rptObject), sw);
    -            // System.out.print(sw.toString());
    -            // complexMandate.put("represented", sw.toString());
    -            // sw.flush();
    -            //
    -            // // add the complex values to the attr.list.
    -            // PersonalAttribute pal = new PersonalAttribute();
    -            //
    -            // pal.setName("mandateContent");
    -            // pal.setIsRequired(pal.isRequired());
    -            // pal.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -            // pal.setComplexValue(complexMandate);
    -            //
    -            // System.out.println(pal.toString());
     		}
    -        catch ( JAXBException e ) {
    -            e.printStackTrace();
    -        }
    -    }
    -
    -    @Test
    -    public void testMandateContent() {
    -        initMandateValues();
    -        try {
    -            final MandateType object = new MandateType();
    -            // Make the object ....
    -            object.getMandateContent().add(mtObject);
    -            object.setRepresented(rpObject);
    -            object.setRepresentative(rptObject);
    -
    -            final JAXBContext context = JAXBContext.newInstance(MandateType.class);
    -            // Create the marshaller
    -            final Marshaller m = context.createMarshaller();
    -            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    -            final ObjectFactory objf = new ObjectFactory();
    -            // Various types of output
    -            m.marshal(objf.createMandate(object), new FileOutputStream("MandateContentType.xml"));
    -            m.marshal(objf.createMandate(object), System.out);
    -
    -            StringWriter sw = new StringWriter();
    -            m.marshal(objf.createMandate(object), sw);
    +	}
    +
    +	@Test
    +	public void testMandateContent() {
    +		initMandateValues();
    +		try {
    +			final MandateType object = new MandateType();
    +			// Make the object ....
    +			object.getMandateContent().add(mtObject);
    +			object.setRepresented(rpObject);
    +			object.setRepresentative(rptObject);
    +
    +			final JAXBContext context = JAXBContext.newInstance(MandateType.class);
    +			// Create the marshaller
    +			final Marshaller m = context.createMarshaller();
    +			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    +			final ObjectFactory objf = new ObjectFactory();
    +			// Various types of output
    +			m.marshal(objf.createMandate(object), new FileOutputStream("MandateContentType.xml"));
    +			m.marshal(objf.createMandate(object), System.out);
     
    +			StringWriter sw = new StringWriter();
    +			m.marshal(objf.createMandate(object), sw);
    +
    +		} catch (Exception e) {
    +			e.printStackTrace();
    +		}
     	}
    -        catch ( Exception e ) {
    -            e.printStackTrace();
    -        }
    -    }
     
     	/**
    -     * Test unmarshalling canonical address 
    -	 *  
    -     * IS Reykjavik RVK
    -     * Reykjavik 101 Laugavegur
    -     * 1 10 
    +	 * Test unmarshalling canonical address  
    +	 * IS Reykjavik RVK Reykjavik 101
    +	 * Laugavegur 1 10 
     	 */
     	@Test
    -	public void testUnmarshallCanonicalAddress() 
    -	{
    -	    JAXBContext uContext;
    -		try 
    -		{
    +	public void testUnmarshallCanonicalAddress() {
    +		JAXBContext uContext;
    +		try {
     			uContext = JAXBContext.newInstance(CanonicalAddressType.class);
    -		    final Unmarshaller u = uContext.createUnmarshaller();
    -			final File file = new File("CanonicalAddressType.xml");			
    -		    
    +			final Unmarshaller u = uContext.createUnmarshaller();
    +			final File file = new File("CanonicalAddressType.xml");
    +
     			final JAXBElement root = u.unmarshal(new StreamSource(file), CanonicalAddressType.class);
     			final CanonicalAddressType foo = root.getValue();
    -    
    -		    final String A = foo.getStreetName();
    -		    final String B = foo.getStreetNumber();
    -		 
    -		    System.out.println("Streetname: " + A);
    -		    System.out.println("Streetnumber: " + B);
    -
    -		} 
    -		catch (final JAXBException e) 
    -		{
    +
    +			final String A = foo.getStreetName();
    +			final String B = foo.getStreetNumber();
    +
    +			System.out.println("Streetname: " + A);
    +			System.out.println("Streetnumber: " + B);
    +
    +		} catch (final JAXBException e) {
     			e.printStackTrace();
     		}
     	}
     
     	/**
    -     * Test marshalling has bank account   Arion 3 
    +	 * Test marshalling has bank account   Arion
    +	 * 3 
     	 */
     	@Test
    -	public void testMarshallHasBankAccount()
    -	{
    -		try 
    -		{
    +	public void testMarshallHasBankAccount() {
    +		try {
     			final HasAccountInBankType object = new HasAccountInBankType();
     			object.setAQAA(3);
     			object.setBankName("Arion Bank");
    -					final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);
    +			final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);
     			final Marshaller m = context.createMarshaller();
    -		    final ObjectFactory o = new ObjectFactory();
    -			m.marshal(o.createHasAccountInBank(object), new FileOutputStream ("hasbankaccount.xml"));
    +			final ObjectFactory o = new ObjectFactory();
    +			m.marshal(o.createHasAccountInBank(object), new FileOutputStream("hasbankaccount.xml"));
     			m.marshal(o.createHasAccountInBank(object), System.out);
    -			
    -		}
    -        catch (FileNotFoundException e) {
    -            e.printStackTrace();
     
    -        }catch ( Exception e ) {
    +		} catch (FileNotFoundException e) {
     			e.printStackTrace();
    -			
    +
    +		} catch (Exception e) {
    +			e.printStackTrace();
    +
     		}
     	}
     
     	/**
    -     * Test unmarshalling has bank account   Arion 3 
    +	 * Test unmarshalling has bank account   Arion
    +	 * 3 
     	 */
     	@Test
    -	public void testUnmarshallHasBankAccount()
    -	{
    -		try 
    -		{
    +	public void testUnmarshallHasBankAccount() {
    +		try {
     			final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);
     			final Unmarshaller um = context.createUnmarshaller();
    -			final File file = new File("hasbankaccount.xml");			
    +			final File file = new File("hasbankaccount.xml");
     			final JAXBElement root = um.unmarshal(new StreamSource(file), HasAccountInBankType.class);
     			final HasAccountInBankType foo = root.getValue();
     			System.out.println(foo.getBankName());
    @@ -296,5 +277,5 @@ public class ComplexAttributesMarshalling {
     			e.printStackTrace();
     		}
     	}
    -	
    +
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
    index f6cacd67b..706e7affd 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
    @@ -29,268 +29,228 @@ import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException;
     /**
      * The PersonalAttribute's Test Case.
      * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    - *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
    - *         paulo.ribeiro@multicert.com
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
      * @version $Revision: 1.2 $, $Date: 2010-11-17 05:17:03 $
      */
     public final class DateUtilTestCase {
    -  
    -  /**
    -   * Stork Format date.
    -   */
    -  private static final String FORMAT = "yyyyMMdd";
    -  
    -  /**
    -   * Expected 10 value.
    -   */
    -  private static final int TEN = 10;
    -  
    -  /**
    -   * Expected 11 value.
    -   */
    -  private static final int ELEVEN = 11;
    -  
    -  /**
    -   * The testing Date ("current" date).
    -   */
    -  private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20,
    -    0, 0);
    -  
    -  /**
    -   * Init DateUtilTestCase class.
    -   */
    -  @BeforeClass
    -  public static void runsBeforeTheTestSuite() {
    -    final Properties configs = new Properties();
    -    configs.setProperty("invalidAgeDateValue.code", "35");
    -    configs.setProperty("invalidAttributeValue.code", "34");
    -    configs
    -      .setProperty(
    -        "invalidAttributeValue.message",
    -        "Unexpected or invalid content was encountered within a "
    -        + " or  element.");
    -    PEPSUtil.createInstance(configs);
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given year against
    -   * the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -   */
    -  @Test
    -  public void calculateAgeFromYear() {
    -    Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given year and month
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    -   */
    -  @Test
    -  public void calculateAgeFromEarlyMonth() {
    -    Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE,
    -      FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given year and month
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -   */
    -  @Test
    -  public void calculateAgeFromSameMonth() {
    -    Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given year and month
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -   */
    -  @Test
    -  public void calculateAgeFromLaterMonth() {
    -    Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    -   */
    -  @Test
    -  public void calculateAgeFromEarlyFullDate() {
    -    Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE,
    -      FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    -   */
    -  @Test
    -  public void calculateAgeFromSameDay() {
    -    Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE,
    -      FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -   */
    -  @Test
    -  public void calculateAgeFromLaterFullDate() {
    -    Assert.assertTrue(TEN == DateUtil
    -      .calculateAge("20001011", TESTDATE, FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return a
    -   * SecurityPEPSException exception.
    -   */
    -  @Test(expected = SecurityPEPSException.class)
    -  public void calculateAgeFromInvalidDate() {
    -    DateUtil.calculateAge("200", TESTDATE, FORMAT);
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return a
    -   * SecurityPEPSException exception.
    -   */
    -  @Test(expected = SecurityPEPSException.class)
    -  public void calculateAgeFromInvalidMonth() {
    -    DateUtil.calculateAge("200013", TESTDATE, FORMAT);
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return a
    -   * SecurityPEPSException exception.
    -   */
    -  @Test(expected = SecurityPEPSException.class)
    -  public void calculateAgeFromInvalidDay() {
    -    DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return a
    -   * SecurityPEPSException exception.
    -   */
    -  @Test(expected = SecurityPEPSException.class)
    -  public void calculateAgeFromNullDate() {
    -    DateUtil.calculateAge(null, TESTDATE, FORMAT);
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return a
    -   * SecurityPEPSException exception.
    -   */
    -  @Test(expected = SecurityPEPSException.class)
    -  public void calculateAgeFromNullCurDate() {
    -    DateUtil.calculateAge("2000", null, FORMAT);
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#calculateAge} method for the given full date
    -   * against the testDate: 2011-10-10 15:20:00.0. Must return a
    -   * SecurityPEPSException exception.
    -   */
    -  @Test(expected = SecurityPEPSException.class)
    -  public void calculateAgeFromNullFormat() {
    -    DateUtil.calculateAge("2000", TESTDATE, null);
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    -   * Must return true
    -   */
    -  @Test
    -  public void isValidFormatDateFromYear() {
    -    Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year and
    -   * month. Must return true.
    -   */
    -  @Test
    -  public void isValidFormatDateFromMonth() {
    -    Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    -   * Must return false.
    -   */
    -  @Test
    -  public void isValidFormatDate() {
    -    Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    -   * Must return false.
    -   */
    -  @Test
    -  public void isValidFormatDateInvalidYear() {
    -    Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    -   * Must return false.
    -   */
    -  @Test
    -  public void isValidFormatDateInvalidMonth() {
    -    Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    -   * Must return false.
    -   */
    -  @Test
    -  public void isValidFormatDateInvalidDate() {
    -    Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    -   * Must return false.
    -   */
    -  @Test
    -  public void isValidFormatDateNullDate() {
    -    Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    -   * Must return false.
    -   */
    -  @Test
    -  public void isValidFormatDateNullFormat() {
    -    Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#currentTimeStamp()} method for the current
    -   * TimeStamp (TS). Must return true.
    -   */
    -  @Test
    -  public void testCurrentTimeStampBefore() {
    -    Timestamp ts = DateUtil.currentTimeStamp();
    -    Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
    -  }
    -  
    -  /**
    -   * Tests the {@link DateUtil#currentTimeStamp()} method for the current
    -   * TimeStamp (TS). Must return true.
    -   */
    -  @Test
    -  @Ignore
    -  public void testCurrentTimeStampAfter() {
    -    Timestamp ts = DateUtil.currentTimeStamp();
    -    Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
    -  }
    -  
    +
    +	/**
    +	 * Stork Format date.
    +	 */
    +	private static final String FORMAT = "yyyyMMdd";
    +
    +	/**
    +	 * Expected 10 value.
    +	 */
    +	private static final int TEN = 10;
    +
    +	/**
    +	 * Expected 11 value.
    +	 */
    +	private static final int ELEVEN = 11;
    +
    +	/**
    +	 * The testing Date ("current" date).
    +	 */
    +	private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20, 0, 0);
    +
    +	/**
    +	 * Init DateUtilTestCase class.
    +	 */
    +	@BeforeClass
    +	public static void runsBeforeTheTestSuite() {
    +		final Properties configs = new Properties();
    +		configs.setProperty("invalidAgeDateValue.code", "35");
    +		configs.setProperty("invalidAttributeValue.code", "34");
    +		configs.setProperty("invalidAttributeValue.message", "Unexpected or invalid content was encountered within a " + " or  element.");
    +		PEPSUtil.createInstance(configs);
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given year against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +	 */
    +	@Test
    +	public void calculateAgeFromYear() {
    +		Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    +	 */
    +	@Test
    +	public void calculateAgeFromEarlyMonth() {
    +		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +	 */
    +	@Test
    +	public void calculateAgeFromSameMonth() {
    +		Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +	 */
    +	@Test
    +	public void calculateAgeFromLaterMonth() {
    +		Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    +	 */
    +	@Test
    +	public void calculateAgeFromEarlyFullDate() {
    +		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    +	 */
    +	@Test
    +	public void calculateAgeFromSameDay() {
    +		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +	 */
    +	@Test
    +	public void calculateAgeFromLaterFullDate() {
    +		Assert.assertTrue(TEN == DateUtil.calculateAge("20001011", TESTDATE, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    +	 */
    +	@Test(expected = SecurityPEPSException.class)
    +	public void calculateAgeFromInvalidDate() {
    +		DateUtil.calculateAge("200", TESTDATE, FORMAT);
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    +	 */
    +	@Test(expected = SecurityPEPSException.class)
    +	public void calculateAgeFromInvalidMonth() {
    +		DateUtil.calculateAge("200013", TESTDATE, FORMAT);
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    +	 */
    +	@Test(expected = SecurityPEPSException.class)
    +	public void calculateAgeFromInvalidDay() {
    +		DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    +	 */
    +	@Test(expected = SecurityPEPSException.class)
    +	public void calculateAgeFromNullDate() {
    +		DateUtil.calculateAge(null, TESTDATE, FORMAT);
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    +	 */
    +	@Test(expected = SecurityPEPSException.class)
    +	public void calculateAgeFromNullCurDate() {
    +		DateUtil.calculateAge("2000", null, FORMAT);
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    +	 */
    +	@Test(expected = SecurityPEPSException.class)
    +	public void calculateAgeFromNullFormat() {
    +		DateUtil.calculateAge("2000", TESTDATE, null);
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return true
    +	 */
    +	@Test
    +	public void isValidFormatDateFromYear() {
    +		Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year and month. Must return true.
    +	 */
    +	@Test
    +	public void isValidFormatDateFromMonth() {
    +		Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    +	 */
    +	@Test
    +	public void isValidFormatDate() {
    +		Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    +	 */
    +	@Test
    +	public void isValidFormatDateInvalidYear() {
    +		Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    +	 */
    +	@Test
    +	public void isValidFormatDateInvalidMonth() {
    +		Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    +	 */
    +	@Test
    +	public void isValidFormatDateInvalidDate() {
    +		Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    +	 */
    +	@Test
    +	public void isValidFormatDateNullDate() {
    +		Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    +	 */
    +	@Test
    +	public void isValidFormatDateNullFormat() {
    +		Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#currentTimeStamp()} method for the current TimeStamp (TS). Must return true.
    +	 */
    +	@Test
    +	public void testCurrentTimeStampBefore() {
    +		Timestamp ts = DateUtil.currentTimeStamp();
    +		Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
    +	}
    +
    +	/**
    +	 * Tests the {@link DateUtil#currentTimeStamp()} method for the current TimeStamp (TS). Must return true.
    +	 */
    +	@Test
    +	@Ignore
    +	public void testCurrentTimeStampAfter() {
    +		Timestamp ts = DateUtil.currentTimeStamp();
    +		Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
    +	}
    +
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
    index d4841ed43..fbef5bc99 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
    @@ -37,517 +37,435 @@ import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException;
     /**
      * The PEPSUtil's Test Case.
      * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    - *         luis.felix@multicert.com
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com
      * 
      * @version $Revision: $, $Date: $
      */
     public final class PEPSUtilTestCase {
    -  
    -  /**
    -   * Message example.
    -   */
    -  private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed";
    -  
    -  /**
    -   * Error message example.
    -   */
    -  private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed";
    -  
    -  /**
    -   * Error code example.
    -   */
    -  private static final String ERROR_CODE_SAMPLE = "003002";
    -  
    -  /**
    -   * Properties values for testing proposes.
    -   */
    -  private static final Properties CONFIGS1 = new Properties();
    -  
    -  /**
    -   * Properties values for testing proposes.
    -   */
    -  private static final Properties CONFIGS2 = new Properties();
    -  
    -  /**
    -   * The empty string value: "".
    -   */
    -  private static final String EMPTY_STRING = "";
    -  
    -  /**
    -   * The empty byte value: [].
    -   */
    -  private static final byte[] EMPTY_BYTE = new byte[] {};
    -  
    -  /**
    -   * The empty byte hash value.
    -   */
    -  private static final byte[] EMPTY_HASH_BYTE = new byte[] { -49, -125, -31,
    -    53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28,
    -    5, 11, 87, 21, -36, -125, -12, -87, 33, -45, 108, -23, -50, 71, -48, -47,
    -    60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49,
    -    -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62 };
    -  
    -  /**
    -   * The SAML example byte[] value.
    -   */
    -  private static final byte[] SAML_BYTE_SAMPLE = new byte[] { 60, 115, 97, 109,
    -    108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108 };
    -  
    -  /**
    -   * The SAML's Base64 example value.
    -   */
    -  private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s";
    -  
    -  /**
    -   * The SAML's Base64 byte[] example value.
    -   */
    -  private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[] { 80, 72, 78, 104,
    -    98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115 };
    -  
    -  /**
    -   * The SAML's Base64 Hash byte[] example value.
    -   */
    -  private static byte[] HASH_BYTE_SAMPLE = new byte[] { 67, 38, 11, 115, 49,
    -    -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67,
    -    90, 101, 30, 82, -13, 60, -106, -72, -103, -75, 19, 2, -107, 107, -6, -56,
    -    34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12,
    -    -102, 12, -56, 30, -59, -104, -21, -42, -103, 82 };
    -  
    -  /**
    -   * Init PEPSUtilTestCase class.
    -   */
    -  @BeforeClass
    -  public static void runsBeforeTheTestSuite() {
    -    
    -    CONFIGS1.setProperty("max.attrList.size", "20000");
    -    CONFIGS1.setProperty("attrList.code", "202005");
    -    CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter");
    -    
    -    CONFIGS1.setProperty("max.qaaLevel.size", "1");
    -    CONFIGS1.setProperty("max.spUrl.size", "inv");
    -    CONFIGS1.setProperty("validation.active", "true");
    -    CONFIGS1.setProperty("hashDigest.className",
    -      "org.bouncycastle.crypto.digests.SHA512Digest");
    -    CONFIGS1.setProperty("invalidAgeDateValue.code", "35");
    -    CONFIGS1.setProperty("invalidAttributeValue.code", "34");
    -    CONFIGS1.setProperty("invalidAttributeValue.message",
    -      "Unexpected or invalid content was encountered within a "
    -        + " or  element.");
    -  }
    -   
    -  /**
    -   * Tests the {@link PEPSUtil#createInstance(Properties)} method for the given
    -   * properties object.
    -   */
    -  @Test
    -  public void testCreateInstance() {
    -    Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getConfigs()}.
    -   */
    -  @Test
    -  public void testGetConfigs() {
    -    final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    -    assertEquals(pepsUtils.getConfigs(), CONFIGS1);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getConfigs()}.
    -   */
    -  @Test
    -  public void testGetConfigsDifferent() {
    -    final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    -    assertNotSame(pepsUtils.getConfigs(), CONFIGS2);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getConfig(String)} method for the given existing
    -   * config.
    -   */
    -  @Test
    -  public void testGetConfigExists() {
    -    assertEquals(PEPSUtil.getConfig("hashDigest.className"),
    -      "org.bouncycastle.crypto.digests.SHA512Digest");
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getConfig(String)} method for the given not
    -   * existing config.
    -   */
    -  @Test
    -  public void testGetConfigNoExists() {
    -    assertNull(PEPSUtil.getConfig("doesnt.exists"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getConfig(String)} method for the given null
    -   * value.
    -   */
    -  @Test(expected = NullPointerException.class)
    -  public void testGetConfigNull() {
    -    assertNull(PEPSUtil.getConfig(null));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
    -   * given param values.
    -   */
    -  @Test
    -  public void testIsValidParameterExists() {
    -    assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
    -   * given param values.
    -   */
    -  @Test
    -  public void testIsValidParameterExistsGreat() {
    -    assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
    -   * given param values.
    -   */
    -  @Test
    -  public void testIsValidParameterExistsIvalidConf() {
    -    assertFalse(PEPSUtil
    -      .isValidParameter("spUrl", "http://localhost:8080/SP/"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
    -   * given param values.
    -   */
    -  @Test
    -  public void testIsValidParameterNotExists() {
    -    assertFalse(PEPSUtil.isValidParameter("doesntexists",
    -      "http://localhost:8080/SP/"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
    -   * given param values.
    -   */
    -  @Test
    -  public void testIsValidParameterNullParamName() {
    -    assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
    -   * given param values.
    -   */
    -  @Test
    -  public void testIsValidParameterNullParamValue() {
    -    assertFalse(PEPSUtil.isValidParameter("spUrl", null));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method
    -   * for the given object values.
    -   */
    -  @Test
    -  public void testValidateParameterValid() {
    -    final IPersonalAttributeList persAttrList = new PersonalAttributeList();
    -    persAttrList.populate("isAgeOver:true:[15,]:Available;");
    -    PEPSUtil.validateParameter("ServiceProviderAction",
    -      PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method
    -   * for the given string values.
    -   */
    -  @Test(expected = InvalidParameterPEPSException.class)
    -  public void testValidateParameterNull() {
    -    PEPSUtil.validateParameter("ServiceProviderAction",
    -      PEPSParameters.ATTRIBUTE_LIST.toString(), null);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#validateParameter(String, String, String)} method
    -   * for the given string values.
    -   * 
    -   * The tested class just invokes
    -   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    -   * so further tests will be later.
    -   */
    -  @Test
    -  public void testValidateParameter() {
    -    PEPSUtil.validateParameter("ServiceProviderAction",
    -      PEPSParameters.ATTRIBUTE_LIST.toString(),
    -      "isAgeOver:true:[15,]:Available;");
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)}
    -   * method for the given string value and {@link PEPSErrors} enum.
    -   * 
    -   * The tested class just invokes
    -   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    -   * so further tests will be later.
    -   */
    -  @Test
    -  public void testValidateParameterPEPSErrors() {
    -    PEPSUtil.validateParameter("CountrySelectorAction",
    -      PEPSParameters.ATTRIBUTE_LIST.toString(),
    -      "isAgeOver:true:[15,]:Available;",
    -      PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR);
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    -   * method for the given string values.
    -   */
    -  @Test
    -  public void testValidateParameterValidParams() {
    -    PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1",
    -      "qaaLevel.code", "qaaLevel.message");
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    -   * method for the given string values.
    -   */
    -  @Test(expected = InvalidParameterPEPSException.class)
    -  public void testValidateParameterInvalidParamValue() {
    -    PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10",
    -      "qaaLevel.code", "qaaLevel.message");
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    -   * method for the given string values.
    -   */
    -  @Test(expected = InvalidParameterPEPSException.class)
    -  public void testValidateParameterInvalidParamName() {
    -    PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1",
    -      "qaaLevel.code", "qaaLevel.message");
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    -   * method for the given string values.
    -   */
    -  @Test(expected = InvalidParameterPEPSException.class)
    -  public void testValidateParameterNullParamName() {
    -    PEPSUtil.validateParameter("ServiceProviderAction", null, "1",
    -      "qaaLevel.code", "qaaLevel.message");
    -  }
    -  
    -  /**
    -   * Tests the
    -   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    -   * method for the given string values.
    -   */
    -  @Test(expected = InvalidParameterPEPSException.class)
    -  public void testValidateParameterNullParamValue() {
    -    PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null,
    -      "qaaLevel.code", "qaaLevel.message");
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
    -   * string value.
    -   */
    -  @Test
    -  public void testEncodeSAMLToken() {
    -    assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
    -   * null.
    -   */
    -  @Test(expected = NullPointerException.class)
    -  public void testEncodeSAMLTokenNull() {
    -    assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
    -   * empty byte[] value.
    -   */
    -  @Test
    -  public void testEncodeSAMLTokenEmpty() {
    -    assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
    -   * byte[] value.
    -   */
    -  @Test
    -  public void testDecodeSAMLToken() {
    -    assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE),
    -      SAML_BYTE_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
    -   * null value.
    -   */
    -  @Test(expected = NullPointerException.class)
    -  public void testDecodeSAMLTokenNull() {
    -    assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
    -   * empty string value.
    -   */
    -  @Test(expected = StringIndexOutOfBoundsException.class)
    -  public void testDecodeSAMLTokenEmpty() {
    -    assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
    -   * byte[] value.
    -   */
    -  @Test
    -  public void testHashPersonalToken() {
    -    assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE),
    -      HASH_BYTE_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
    -   * null value.
    -   */
    -  @Test(expected = InternalErrorPEPSException.class)
    -  public void testHashPersonalTokenNull() {
    -    assertNull(PEPSUtil.hashPersonalToken(null));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
    -   * empty value.
    -   */
    -  @Test
    -  public void testHashPersonalTokenEmpty() {
    -    assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    -   * correct message.
    -   */
    -  @Test
    -  public void testGetStorkErrorCodeExists() {
    -    assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    -   * invalid message.
    -   */
    -  @Test
    -  public void testGetStorkErrorCodeNoExists() {
    -    assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    -   * empty message.
    -   */
    -  @Test
    -  public void testGetStorkErrorCodeEmpty() {
    -    assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    -   * null message.
    -   */
    -  @Test
    -  public void testGetStorkErrorCodeNull() {
    -    assertNull(PEPSUtil.getStorkErrorCode(null));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    -   * invalid message.
    -   */
    -  @Test
    -  public void testGetStorkErrorCodeWithSepFake() {
    -    assertNull(PEPSUtil.getStorkErrorCode("-"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    -   * invalid message.
    -   */
    -  @Test
    -  public void testGetStorkErrorCodeWithSepAndCodeFake() {
    -    assertNull(PEPSUtil.getStorkErrorCode("000001 -"));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    -   * given correct message.
    -   */
    -  @Test
    -  public void testGetStorkErrorMessageExists() {
    -    assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE),
    -      ERROR_MESSAGE_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    -   * given invalid message.
    -   */
    -  @Test
    -  public void testGetStorkErrorMessageNoExists() {
    -    assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE),
    -      ERROR_MESSAGE_SAMPLE);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    -   * given empty message.
    -   */
    -  @Test
    -  public void testGetStorkErrorMessageEmpty() {
    -    assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING),
    -      EMPTY_STRING);
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    -   * given null message.
    -   */
    -  @Test
    -  public void testGetStorkErrorMessageNull() {
    -    assertNull(PEPSUtil.getStorkErrorMessage(null));
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    -   * given invalid message.
    -   */
    -  @Test
    -  public void testGetStorkErrorMessageWithSepFake() {
    -    assertEquals(PEPSUtil.getStorkErrorMessage("-"),"-");
    -  }
    -  
    -  /**
    -   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    -   * given invalid message.
    -   */
    -  @Test
    -  public void testGetStorkErrorMessageWithSepAndCodeFake() {
    -    assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"),"000001 -");
    -  }
    -  
    +
    +	/**
    +	 * Message example.
    +	 */
    +	private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed";
    +
    +	/**
    +	 * Error message example.
    +	 */
    +	private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed";
    +
    +	/**
    +	 * Error code example.
    +	 */
    +	private static final String ERROR_CODE_SAMPLE = "003002";
    +
    +	/**
    +	 * Properties values for testing proposes.
    +	 */
    +	private static final Properties CONFIGS1 = new Properties();
    +
    +	/**
    +	 * Properties values for testing proposes.
    +	 */
    +	private static final Properties CONFIGS2 = new Properties();
    +
    +	/**
    +	 * The empty string value: "".
    +	 */
    +	private static final String EMPTY_STRING = "";
    +
    +	/**
    +	 * The empty byte value: [].
    +	 */
    +	private static final byte[] EMPTY_BYTE = new byte[] {};
    +
    +	/**
    +	 * The empty byte hash value.
    +	 */
    +	private static final byte[] EMPTY_HASH_BYTE = new byte[] { -49, -125, -31, 53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28, 5, 11, 87, 21, -36, -125, -12, -87, 33, -45,
    +			108, -23, -50, 71, -48, -47, 60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49, -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62 };
    +
    +	/**
    +	 * The SAML example byte[] value.
    +	 */
    +	private static final byte[] SAML_BYTE_SAMPLE = new byte[] { 60, 115, 97, 109, 108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108 };
    +
    +	/**
    +	 * The SAML's Base64 example value.
    +	 */
    +	private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s";
    +
    +	/**
    +	 * The SAML's Base64 byte[] example value.
    +	 */
    +	private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[] { 80, 72, 78, 104, 98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115 };
    +
    +	/**
    +	 * The SAML's Base64 Hash byte[] example value.
    +	 */
    +	private static byte[] HASH_BYTE_SAMPLE = new byte[] { 67, 38, 11, 115, 49, -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67, 90, 101, 30, 82, -13, 60, -106, -72, -103,
    +			-75, 19, 2, -107, 107, -6, -56, 34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12, -102, 12, -56, 30, -59, -104, -21, -42, -103, 82 };
    +
    +	/**
    +	 * Init PEPSUtilTestCase class.
    +	 */
    +	@BeforeClass
    +	public static void runsBeforeTheTestSuite() {
    +
    +		CONFIGS1.setProperty("max.attrList.size", "20000");
    +		CONFIGS1.setProperty("attrList.code", "202005");
    +		CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter");
    +
    +		CONFIGS1.setProperty("max.qaaLevel.size", "1");
    +		CONFIGS1.setProperty("max.spUrl.size", "inv");
    +		CONFIGS1.setProperty("validation.active", "true");
    +		CONFIGS1.setProperty("hashDigest.className", "org.bouncycastle.crypto.digests.SHA512Digest");
    +		CONFIGS1.setProperty("invalidAgeDateValue.code", "35");
    +		CONFIGS1.setProperty("invalidAttributeValue.code", "34");
    +		CONFIGS1.setProperty("invalidAttributeValue.message", "Unexpected or invalid content was encountered within a " + " or  element.");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#createInstance(Properties)} method for the given properties object.
    +	 */
    +	@Test
    +	public void testCreateInstance() {
    +		Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getConfigs()}.
    +	 */
    +	@Test
    +	public void testGetConfigs() {
    +		final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    +		assertEquals(pepsUtils.getConfigs(), CONFIGS1);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getConfigs()}.
    +	 */
    +	@Test
    +	public void testGetConfigsDifferent() {
    +		final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    +		assertNotSame(pepsUtils.getConfigs(), CONFIGS2);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getConfig(String)} method for the given existing config.
    +	 */
    +	@Test
    +	public void testGetConfigExists() {
    +		assertEquals(PEPSUtil.getConfig("hashDigest.className"), "org.bouncycastle.crypto.digests.SHA512Digest");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getConfig(String)} method for the given not existing config.
    +	 */
    +	@Test
    +	public void testGetConfigNoExists() {
    +		assertNull(PEPSUtil.getConfig("doesnt.exists"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getConfig(String)} method for the given null value.
    +	 */
    +	@Test(expected = NullPointerException.class)
    +	public void testGetConfigNull() {
    +		assertNull(PEPSUtil.getConfig(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    +	 */
    +	@Test
    +	public void testIsValidParameterExists() {
    +		assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    +	 */
    +	@Test
    +	public void testIsValidParameterExistsGreat() {
    +		assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    +	 */
    +	@Test
    +	public void testIsValidParameterExistsIvalidConf() {
    +		assertFalse(PEPSUtil.isValidParameter("spUrl", "http://localhost:8080/SP/"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    +	 */
    +	@Test
    +	public void testIsValidParameterNotExists() {
    +		assertFalse(PEPSUtil.isValidParameter("doesntexists", "http://localhost:8080/SP/"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    +	 */
    +	@Test
    +	public void testIsValidParameterNullParamName() {
    +		assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    +	 */
    +	@Test
    +	public void testIsValidParameterNullParamValue() {
    +		assertFalse(PEPSUtil.isValidParameter("spUrl", null));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method for the given object values.
    +	 */
    +	@Test
    +	public void testValidateParameterValid() {
    +		final IPersonalAttributeList persAttrList = new PersonalAttributeList();
    +		persAttrList.populate("isAgeOver:true:[15,]:Available;");
    +		PEPSUtil.validateParameter("ServiceProviderAction", PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method for the given string values.
    +	 */
    +	@Test(expected = InvalidParameterPEPSException.class)
    +	public void testValidateParameterNull() {
    +		PEPSUtil.validateParameter("ServiceProviderAction", PEPSParameters.ATTRIBUTE_LIST.toString(), null);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, String)} method for the given string values.
    +	 * 
    +	 * The tested class just invokes {@link PEPSUtil#validateParameter(String, String, String, String, String)} so further tests will be later.
    +	 */
    +	@Test
    +	public void testValidateParameter() {
    +		PEPSUtil.validateParameter("ServiceProviderAction", PEPSParameters.ATTRIBUTE_LIST.toString(), "isAgeOver:true:[15,]:Available;");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)} method for the given string value and {@link PEPSErrors} enum.
    +	 * 
    +	 * The tested class just invokes {@link PEPSUtil#validateParameter(String, String, String, String, String)} so further tests will be later.
    +	 */
    +	@Test
    +	public void testValidateParameterPEPSErrors() {
    +		PEPSUtil.validateParameter("CountrySelectorAction", PEPSParameters.ATTRIBUTE_LIST.toString(), "isAgeOver:true:[15,]:Available;", PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    +	 */
    +	@Test
    +	public void testValidateParameterValidParams() {
    +		PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1", "qaaLevel.code", "qaaLevel.message");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    +	 */
    +	@Test(expected = InvalidParameterPEPSException.class)
    +	public void testValidateParameterInvalidParamValue() {
    +		PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10", "qaaLevel.code", "qaaLevel.message");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    +	 */
    +	@Test(expected = InvalidParameterPEPSException.class)
    +	public void testValidateParameterInvalidParamName() {
    +		PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1", "qaaLevel.code", "qaaLevel.message");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    +	 */
    +	@Test(expected = InvalidParameterPEPSException.class)
    +	public void testValidateParameterNullParamName() {
    +		PEPSUtil.validateParameter("ServiceProviderAction", null, "1", "qaaLevel.code", "qaaLevel.message");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    +	 */
    +	@Test(expected = InvalidParameterPEPSException.class)
    +	public void testValidateParameterNullParamValue() {
    +		PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null, "qaaLevel.code", "qaaLevel.message");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given string value.
    +	 */
    +	@Test
    +	public void testEncodeSAMLToken() {
    +		assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given null.
    +	 */
    +	@Test(expected = NullPointerException.class)
    +	public void testEncodeSAMLTokenNull() {
    +		assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given empty byte[] value.
    +	 */
    +	@Test
    +	public void testEncodeSAMLTokenEmpty() {
    +		assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given byte[] value.
    +	 */
    +	@Test
    +	public void testDecodeSAMLToken() {
    +		assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE), SAML_BYTE_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given null value.
    +	 */
    +	@Test(expected = NullPointerException.class)
    +	public void testDecodeSAMLTokenNull() {
    +		assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given empty string value.
    +	 */
    +	@Test(expected = StringIndexOutOfBoundsException.class)
    +	public void testDecodeSAMLTokenEmpty() {
    +		assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given byte[] value.
    +	 */
    +	@Test
    +	public void testHashPersonalToken() {
    +		assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE), HASH_BYTE_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given null value.
    +	 */
    +	@Test(expected = InternalErrorPEPSException.class)
    +	public void testHashPersonalTokenNull() {
    +		assertNull(PEPSUtil.hashPersonalToken(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given empty value.
    +	 */
    +	@Test
    +	public void testHashPersonalTokenEmpty() {
    +		assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given correct message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorCodeExists() {
    +		assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given invalid message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorCodeNoExists() {
    +		assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given empty message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorCodeEmpty() {
    +		assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given null message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorCodeNull() {
    +		assertNull(PEPSUtil.getStorkErrorCode(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given invalid message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorCodeWithSepFake() {
    +		assertNull(PEPSUtil.getStorkErrorCode("-"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given invalid message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorCodeWithSepAndCodeFake() {
    +		assertNull(PEPSUtil.getStorkErrorCode("000001 -"));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given correct message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorMessageExists() {
    +		assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE), ERROR_MESSAGE_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given invalid message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorMessageNoExists() {
    +		assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE), ERROR_MESSAGE_SAMPLE);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given empty message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorMessageEmpty() {
    +		assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING), EMPTY_STRING);
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given null message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorMessageNull() {
    +		assertNull(PEPSUtil.getStorkErrorMessage(null));
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given invalid message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorMessageWithSepFake() {
    +		assertEquals(PEPSUtil.getStorkErrorMessage("-"), "-");
    +	}
    +
    +	/**
    +	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given invalid message.
    +	 */
    +	@Test
    +	public void testGetStorkErrorMessageWithSepAndCodeFake() {
    +		assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"), "000001 -");
    +	}
    +
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
    index 7052b320a..1b6fad6ae 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
    @@ -29,719 +29,654 @@ import eu.stork.peps.auth.commons.STORKStatusCode;
     /**
      * The PersonalAttributeList's Test Case.
      * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    - *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
    - *         paulo.ribeiro@multicert.com
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
      * @version $Revision: 1.5 $, $Date: 2010-11-17 05:17:02 $
      */
     public final class PersonalAttributeListTestCase {
    -  
    -  /**
    -   * isAgeOver constant value.
    -   */
    -  private static final String ISAGEOVER_CONS = "isAgeOver";
    -  
    -  /**
    -   * 1 constant value.
    -   */
    -  private static final int ONE_CONS = 1;
    -  
    -  /**
    -   * 2 constant value.
    -   */
    -  private static final int TWO_CONS = 2;
    -  
    -  /**
    -   * An empty attribute.
    -   */
    -  @SuppressWarnings("unused")
    -  private static final PersonalAttributeList EMPTY_ATTR_LIST =
    -    new PersonalAttributeList(0);
    -  
    -  /**
    -   * An attribute with a complex value (canonicalResidenceAddress).
    -   */
    -  private static PersonalAttribute complexAttrValue = null;
    -  
    -  /**
    -   * Simple attribute value list string.
    -   */
    -  private static final String SIMPLE_ATTRLIST =
    -    "isAgeOver:true:[15,]:Available;";
    -  
    -  /**
    -   * Simple attribute value list string.
    -   */
    -  private static final String SIMPLE_ATTRLIST2 =
    -    "isAgeOver:true:[18,]:Available;";
    -  
    -  /**
    -   * Simple attribute value list string.
    -   */
    -  private static final String SIMPLE_ATTRLIST3 = 
    -    "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    -  
    -  /**
    -   * Simple attribute value list string.
    -   */
    -  private static final String SIMPLE_ATTRLIST3_REVERSE = 
    -    "isAgeOver:true:[18,]:Available;isAgeOver:true:[15,]:Available;";
    -  /**
    -   * Simple attribute value list string.
    -   */
    -  private static final String COMPLEX_ATTRLIST =
    -    "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B,"
    -    + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
    -    + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;";
    -  /**
    -   * Mix attribute list string.
    -   */
    -  private static final String STR_MIX_ATTR_LIST =
    -    "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:["
    -    + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    -    + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:"
    -    + "Available;";
    -  
    -  /**
    -   * Mix attribute list 2 string.
    -   */
    -  private static final String STR_MIX_ATTR_LIST2 =
    -    "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:["
    -    + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    -    + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:Available;"
    -    + "mandateContent:true:["
    -    + "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:"
    -    + "Available;";
    -  
    -  /**
    -   * Attribute List example.
    -   */
    -  @SuppressWarnings({ "serial" })
    -  private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
    -    "age", true, new ArrayList() {
    -      {
    -        add("15");
    -      }
    -    }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -  
    -  /**
    -   * Init PersonalAttributeListTestCase class.
    -   */
    -  @SuppressWarnings("serial")
    -  @BeforeClass
    -  public static void runsBeforeTheTestSuite() {
    -    final Map values = new HashMap() {
    -      {
    -        put("countryCodeAddress", "PT");
    -        put("state", "Porto");
    -        put("town", "Porto");
    -        put("postalCode", "4100");
    -        put("streetName", "Avenida Sidonio Pais");
    -        put("streetNumber", "379");
    -        put("apartmentNumber", "Ed. B");
    -      }
    -    };
    -    
    -    complexAttrValue =
    -      new PersonalAttribute("canonicalResidenceAddress", true, values,
    -        STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List add method. Personal Attribute list must be
    -   * size 1 - Simple attribute.
    -   */
    -  @Test
    -  public void testAddSimpleAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(ATTR_VALUE);
    -    Assert.assertTrue(attrList.size() == 1);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List add method. Personal Attribute list must be
    -   * size 1 - Complex attribute.
    -   */
    -  @Test
    -  public void testAddCompleAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(complexAttrValue);
    -    Assert.assertTrue(attrList.size() == 1);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List add method. Personal Attribute list must be
    -   * size 0 - no attribute.
    -   */
    -  @Test
    -  public void testAddNull() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(null);
    -    Assert.assertTrue(attrList.size() == 0);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List add method. Same attribute name added
    -   * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
    -   * twice.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testAddSameAttrName() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("18");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(attrValueUnder);
    -    attrList.add(attrValueOver);
    -    Assert.assertTrue(attrList.size() == 2);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List add method. Same attribute name added
    -   * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
    -   * twice.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testAddSameAttrNameEmpty() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(attrValueUnder);
    -    attrList.add(attrValueOver);
    -    Assert.assertTrue(attrList.size() == 2);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List put method. Personal Attribute list must be
    -   * size 1 - Simple Value.
    -   */
    -  @Test
    -  public void testPutSimpleAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.put(ATTR_VALUE.getName(), ATTR_VALUE);
    -    Assert.assertTrue(attrList.size() == 1);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List put method. Personal Attribute list must be
    -   * size 1 - Complex Value.
    -   */
    -  @Test
    -  public void testPutComplexAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.put(ATTR_VALUE.getName(), complexAttrValue);
    -    Assert.assertTrue(attrList.size() == 1);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List put method. Personal Attribute list must be
    -   * size 0 - no attribute.
    -   */
    -  @Test
    -  public void testPutNull() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.put("", null);
    -    Assert.assertTrue(attrList.size() == 0);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List put method. Personal Attribute list must be
    -   * size 2 - IsAgeOver attribute added twice.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testPutSameAttrName() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("18");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.put(attrValueUnder.getName(), attrValueUnder);
    -    attrList.put(attrValueOver.getName(), attrValueOver);
    -    Assert.assertTrue(attrList.size() == 2);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List put method. Personal Attribute list must be
    -   * size 2 - IsAgeOver attribute added twice.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testPutSameAttrNameEmpty() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.put(attrValueUnder.getName(), attrValueUnder);
    -    attrList.put(attrValueOver.getName(), attrValueOver);
    -    Assert.assertTrue(attrList.size() == 2);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List get method. Personal Attribute list must be
    -   * size 1 - Simple attribute.
    -   */
    -  @Test
    -  public void testGetSimpleAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(ATTR_VALUE);
    -    Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName()));
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List add method. Personal Attribute list must be
    -   * size 1 - Complex attribute.
    -   */
    -  @Test
    -  public void testGetCompleAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(complexAttrValue);
    -    Assert.assertEquals(complexAttrValue.toString(),
    -      attrList.get(complexAttrValue.getName()).toString());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List get method. Personal Attribute list must be
    -   * size 2 - IsAgeOver attribute.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testGetIsAgeOverAttr() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("18");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(attrValueUnder);
    -    attrList.add(attrValueOver);
    -    Assert.assertEquals(SIMPLE_ATTRLIST,
    -      attrList.get(attrValueUnder.getName()).toString());
    -    Assert.assertEquals(SIMPLE_ATTRLIST2,
    -      attrList.get(attrValueOver.getName()).toString());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List populate method. Personal Attribute list
    -   * must be size 1 - Simple attribute.
    -   */
    -  @Test
    -  public void testPopulateSimpleAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.populate(SIMPLE_ATTRLIST);
    -    Assert.assertTrue(attrList.size() == 1);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List populate method. Personal Attribute list
    -   * must be size 1 - Complex attribute.
    -   */
    -  @Test
    -  public void testPopulateComplexAttr() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.populate(COMPLEX_ATTRLIST);
    -    Assert.assertTrue(attrList.size() == 1);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List populate method. Personal Attribute list
    -   * must be size 1 - Simple and Complex attribute.
    -   */
    -  @Test
    -  public void testPopulateMixAttrs() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.populate(STR_MIX_ATTR_LIST);
    -    Assert.assertTrue(attrList.size() == 2);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List toString method using add.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testToStringFromAdd() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("18");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(attrValueUnder);
    -    attrList.add(attrValueOver);
    -    Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List toString method using put.
    -   * 
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testToStringFromPut() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("18");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.put(attrValueUnder.getName(), attrValueUnder);
    -    attrList.put(attrValueOver.getName(), attrValueOver);
    -    Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List toString method using populate.
    -   */
    -  @Test
    -  public void testToStringFromSimplePopulate() {
    -    final String strAttrList = "isAgeOver:true";
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.populate(strAttrList);
    -    Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List toString method using populate.
    -   */
    -  @Test
    -  public void testToStringFromPopulate() {
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.populate(SIMPLE_ATTRLIST3);
    -    Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List populate method, with invalid values.
    -   */
    -  @Test
    -  public void testPopulateWithInvalidValuesFormat() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate("name:type:values:status;");
    -    Assert.assertEquals(pal, new PersonalAttributeList());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List populate method, with invalid format.
    -   */
    -  @Test
    -  public void testPopulateWithInvalidFormat() {
    -    
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate("name:type::status;");
    -    Assert.assertEquals(pal, new PersonalAttributeList());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List clone method using add.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testCloneFromAdd() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("18");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.add(attrValueUnder);
    -    attrList.add(attrValueOver);
    -    Assert.assertNotSame(attrList, attrList.clone());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List clone method using put.
    -   */
    -  @SuppressWarnings("serial")
    -  @Test
    -  public void testCloneFromPut() {
    -    final PersonalAttribute attrValueUnder =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("15");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -    final PersonalAttribute attrValueOver =
    -      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -        {
    -          add("18");
    -        }
    -      }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -    final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -    attrList.put(attrValueUnder.getName(), attrValueUnder);
    -    attrList.put(attrValueOver.getName(), attrValueOver);
    -    Assert.assertNotSame(attrList, attrList.clone());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List clone method using populate.
    -   */
    -  @Test
    -  public void testCloneFromPopulate() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(SIMPLE_ATTRLIST3);
    -    Assert.assertNotSame(pal, pal.clone());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List iterator.
    -   */
    -  @Test
    -  public void testIterator() {
    -    final String strAttrList =
    -      "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(strAttrList);
    -    final Iterator itAttr = pal.iterator();
    -    while (itAttr.hasNext()) {
    -      final PersonalAttribute attr = itAttr.next();
    -      Assert.assertEquals(ISAGEOVER_CONS, attr.getName());
    -    }
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetOptionalAttributes method with empty attribute list.
    -   */
    -  @Test
    -  public void testGetOptionalAttributesWithEmptyList() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetOptionalAttributes method without optional attributes.
    -   */
    -  @Test
    -  public void testGetOptionalAttributesWithoutOptional() {
    -    final String strAttrList =
    -      "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(strAttrList);
    -    Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetOptionalAttributes method with one optional attribute.
    -   */
    -  @Test
    -  public void testGetOptionalAttributesWithOneOptional() {
    -    final String strAttrList =
    -      "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;";
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(strAttrList);
    -    Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetOptionalAttributes method with two optional attribute.
    -   */
    -  @Test
    -  public void testGetOptionalAttributesWithOnlyOptional() {
    -    final String strAttrList =
    -      "age:false:[]:;isAgeOver:false:[18,]:;";
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(strAttrList);
    -    Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getMandatoryAttributes method with empty attribute list.
    -   */
    -  @Test
    -  public void testGetMandatoryAttributesWithEmptyList() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getMandatoryAttributes method without mandatory attributes.
    -   */
    -  @Test
    -  public void testGetMandatoryAttributesWithoutMandatory() {
    -    final String strAttrList =
    -      "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;";
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(strAttrList);
    -    Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetMandatoryAttributes method with one mandatory attribute.
    -   */
    -  @Test
    -  public void testGetMandatoryAttributesWithOneMandatory() {
    -    final String strAttrList =
    -      "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;";
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(strAttrList);
    -    Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetMandatoryAttributes method with two mandatory attribute.
    -   */
    -  @Test
    -  public void testGetMandatoryAttributesWithOnlyMandatory() {
    -    final String strAttrList =
    -      "age:true:[]:;isAgeOver:true:[18,]:;";
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(strAttrList);
    -    Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getSimpleValueAttributes method with empty attribute list.
    -   */
    -  @Test
    -  public void testGetSimpleValueAttributesWithEmptyList() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getSimpleValueAttributes() method without simple attributes.
    -   */
    -  @Test
    -  public void testGetSimpleValueAttributesWithoutSimple() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(COMPLEX_ATTRLIST);
    -    Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getSimpleValueAttributes() method with one simple attribute.
    -   */
    -  @Test
    -  public void testGetSimpleValueAttributesWithOneSimple() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(STR_MIX_ATTR_LIST);
    -    Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetMandatoryAttributes method with two simple attribute.
    -   */
    -  @Test
    -  public void testGetSimpleValueAttributesWithOnlySimple() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(SIMPLE_ATTRLIST3);
    -    Assert.assertTrue(pal.getSimpleValueAttributes().size() == TWO_CONS);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getComplexValueAttributes method with empty attribute list.
    -   */
    -  @Test
    -  public void testGetComplexAttributesWithEmptyList() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getComplexAttributes() method without complex attributes.
    -   */
    -  @Test
    -  public void testGetComplexAttributesWithoutSimple() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(SIMPLE_ATTRLIST2);
    -    Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's getComplexAttributes() method with one complex attribute.
    -   */
    -  @Test
    -  public void testGetComplexAttributesWithOneComplex() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(STR_MIX_ATTR_LIST);
    -    Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS);
    -  }
    -  
    -  /**
    -   * Testing Personal Attribute List's GetMandatoryAttributes method with only two Complex attribute.
    -   */
    -  @Test
    -  public void testGetComplexAttributesWithOnlyComplex() {
    -    final PersonalAttributeList pal = new PersonalAttributeList();
    -    pal.populate(STR_MIX_ATTR_LIST2);
    -    Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS);
    -  }
    +
    +	/**
    +	 * isAgeOver constant value.
    +	 */
    +	private static final String ISAGEOVER_CONS = "isAgeOver";
    +
    +	/**
    +	 * 1 constant value.
    +	 */
    +	private static final int ONE_CONS = 1;
    +
    +	/**
    +	 * 2 constant value.
    +	 */
    +	private static final int TWO_CONS = 2;
    +
    +	/**
    +	 * An empty attribute.
    +	 */
    +	@SuppressWarnings("unused")
    +	private static final PersonalAttributeList EMPTY_ATTR_LIST = new PersonalAttributeList(0);
    +
    +	/**
    +	 * An attribute with a complex value (canonicalResidenceAddress).
    +	 */
    +	private static PersonalAttribute complexAttrValue = null;
    +
    +	/**
    +	 * Simple attribute value list string.
    +	 */
    +	private static final String SIMPLE_ATTRLIST = "isAgeOver:true:[15,]:Available;";
    +
    +	/**
    +	 * Simple attribute value list string.
    +	 */
    +	private static final String SIMPLE_ATTRLIST2 = "isAgeOver:true:[18,]:Available;";
    +
    +	/**
    +	 * Simple attribute value list string.
    +	 */
    +	private static final String SIMPLE_ATTRLIST3 = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    +
    +	/**
    +	 * Simple attribute value list string.
    +	 */
    +	private static final String SIMPLE_ATTRLIST3_REVERSE = "isAgeOver:true:[18,]:Available;isAgeOver:true:[15,]:Available;";
    +	/**
    +	 * Simple attribute value list string.
    +	 */
    +	private static final String COMPLEX_ATTRLIST = "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B," + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
    +			+ "streetName=Avenida Sidonio Pais,town=Porto,]:Available;";
    +	/**
    +	 * Mix attribute list string.
    +	 */
    +	private static final String STR_MIX_ATTR_LIST = "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    +			+ "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:" + "Available;";
    +
    +	/**
    +	 * Mix attribute list 2 string.
    +	 */
    +	private static final String STR_MIX_ATTR_LIST2 = "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    +			+ "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:Available;" + "mandateContent:true:["
    +			+ "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:" + "Available;";
    +
    +	/**
    +	 * Attribute List example.
    +	 */
    +	@SuppressWarnings({ "serial" })
    +	private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute("age", true, new ArrayList() {
    +		{
    +			add("15");
    +		}
    +	}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +	/**
    +	 * Init PersonalAttributeListTestCase class.
    +	 */
    +	@SuppressWarnings("serial")
    +	@BeforeClass
    +	public static void runsBeforeTheTestSuite() {
    +		final Map values = new HashMap() {
    +			{
    +				put("countryCodeAddress", "PT");
    +				put("state", "Porto");
    +				put("town", "Porto");
    +				put("postalCode", "4100");
    +				put("streetName", "Avenida Sidonio Pais");
    +				put("streetNumber", "379");
    +				put("apartmentNumber", "Ed. B");
    +			}
    +		};
    +
    +		complexAttrValue = new PersonalAttribute("canonicalResidenceAddress", true, values, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List add method. Personal Attribute list must be size 1 - Simple attribute.
    +	 */
    +	@Test
    +	public void testAddSimpleAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(ATTR_VALUE);
    +		Assert.assertTrue(attrList.size() == 1);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List add method. Personal Attribute list must be size 1 - Complex attribute.
    +	 */
    +	@Test
    +	public void testAddCompleAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(complexAttrValue);
    +		Assert.assertTrue(attrList.size() == 1);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List add method. Personal Attribute list must be size 0 - no attribute.
    +	 */
    +	@Test
    +	public void testAddNull() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(null);
    +		Assert.assertTrue(attrList.size() == 0);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List add method. Same attribute name added twice. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testAddSameAttrName() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("18");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(attrValueUnder);
    +		attrList.add(attrValueOver);
    +		Assert.assertTrue(attrList.size() == 2);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List add method. Same attribute name added twice. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testAddSameAttrNameEmpty() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(attrValueUnder);
    +		attrList.add(attrValueOver);
    +		Assert.assertTrue(attrList.size() == 2);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List put method. Personal Attribute list must be size 1 - Simple Value.
    +	 */
    +	@Test
    +	public void testPutSimpleAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.put(ATTR_VALUE.getName(), ATTR_VALUE);
    +		Assert.assertTrue(attrList.size() == 1);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List put method. Personal Attribute list must be size 1 - Complex Value.
    +	 */
    +	@Test
    +	public void testPutComplexAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.put(ATTR_VALUE.getName(), complexAttrValue);
    +		Assert.assertTrue(attrList.size() == 1);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List put method. Personal Attribute list must be size 0 - no attribute.
    +	 */
    +	@Test
    +	public void testPutNull() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.put("", null);
    +		Assert.assertTrue(attrList.size() == 0);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List put method. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testPutSameAttrName() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("18");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.put(attrValueUnder.getName(), attrValueUnder);
    +		attrList.put(attrValueOver.getName(), attrValueOver);
    +		Assert.assertTrue(attrList.size() == 2);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List put method. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testPutSameAttrNameEmpty() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.put(attrValueUnder.getName(), attrValueUnder);
    +		attrList.put(attrValueOver.getName(), attrValueOver);
    +		Assert.assertTrue(attrList.size() == 2);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List get method. Personal Attribute list must be size 1 - Simple attribute.
    +	 */
    +	@Test
    +	public void testGetSimpleAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(ATTR_VALUE);
    +		Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName()));
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List add method. Personal Attribute list must be size 1 - Complex attribute.
    +	 */
    +	@Test
    +	public void testGetCompleAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(complexAttrValue);
    +		Assert.assertEquals(complexAttrValue.toString(), attrList.get(complexAttrValue.getName()).toString());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List get method. Personal Attribute list must be size 2 - IsAgeOver attribute.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testGetIsAgeOverAttr() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("18");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(attrValueUnder);
    +		attrList.add(attrValueOver);
    +		Assert.assertEquals(SIMPLE_ATTRLIST, attrList.get(attrValueUnder.getName()).toString());
    +		Assert.assertEquals(SIMPLE_ATTRLIST2, attrList.get(attrValueOver.getName()).toString());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List populate method. Personal Attribute list must be size 1 - Simple attribute.
    +	 */
    +	@Test
    +	public void testPopulateSimpleAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.populate(SIMPLE_ATTRLIST);
    +		Assert.assertTrue(attrList.size() == 1);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List populate method. Personal Attribute list must be size 1 - Complex attribute.
    +	 */
    +	@Test
    +	public void testPopulateComplexAttr() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.populate(COMPLEX_ATTRLIST);
    +		Assert.assertTrue(attrList.size() == 1);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List populate method. Personal Attribute list must be size 1 - Simple and Complex attribute.
    +	 */
    +	@Test
    +	public void testPopulateMixAttrs() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.populate(STR_MIX_ATTR_LIST);
    +		Assert.assertTrue(attrList.size() == 2);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List toString method using add.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testToStringFromAdd() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("18");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(attrValueUnder);
    +		attrList.add(attrValueOver);
    +		Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List toString method using put.
    +	 * 
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testToStringFromPut() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("18");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.put(attrValueUnder.getName(), attrValueUnder);
    +		attrList.put(attrValueOver.getName(), attrValueOver);
    +		Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List toString method using populate.
    +	 */
    +	@Test
    +	public void testToStringFromSimplePopulate() {
    +		final String strAttrList = "isAgeOver:true";
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.populate(strAttrList);
    +		Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List toString method using populate.
    +	 */
    +	@Test
    +	public void testToStringFromPopulate() {
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.populate(SIMPLE_ATTRLIST3);
    +		Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List populate method, with invalid values.
    +	 */
    +	@Test
    +	public void testPopulateWithInvalidValuesFormat() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate("name:type:values:status;");
    +		Assert.assertEquals(pal, new PersonalAttributeList());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List populate method, with invalid format.
    +	 */
    +	@Test
    +	public void testPopulateWithInvalidFormat() {
    +
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate("name:type::status;");
    +		Assert.assertEquals(pal, new PersonalAttributeList());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List clone method using add.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testCloneFromAdd() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("18");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.add(attrValueUnder);
    +		attrList.add(attrValueOver);
    +		Assert.assertNotSame(attrList, attrList.clone());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List clone method using put.
    +	 */
    +	@SuppressWarnings("serial")
    +	@Test
    +	public void testCloneFromPut() {
    +		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("15");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +			{
    +				add("18");
    +			}
    +		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    +		attrList.put(attrValueUnder.getName(), attrValueUnder);
    +		attrList.put(attrValueOver.getName(), attrValueOver);
    +		Assert.assertNotSame(attrList, attrList.clone());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List clone method using populate.
    +	 */
    +	@Test
    +	public void testCloneFromPopulate() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(SIMPLE_ATTRLIST3);
    +		Assert.assertNotSame(pal, pal.clone());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List iterator.
    +	 */
    +	@Test
    +	public void testIterator() {
    +		final String strAttrList = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(strAttrList);
    +		final Iterator itAttr = pal.iterator();
    +		while (itAttr.hasNext()) {
    +			final PersonalAttribute attr = itAttr.next();
    +			Assert.assertEquals(ISAGEOVER_CONS, attr.getName());
    +		}
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetOptionalAttributes method with empty attribute list.
    +	 */
    +	@Test
    +	public void testGetOptionalAttributesWithEmptyList() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetOptionalAttributes method without optional attributes.
    +	 */
    +	@Test
    +	public void testGetOptionalAttributesWithoutOptional() {
    +		final String strAttrList = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(strAttrList);
    +		Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetOptionalAttributes method with one optional attribute.
    +	 */
    +	@Test
    +	public void testGetOptionalAttributesWithOneOptional() {
    +		final String strAttrList = "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;";
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(strAttrList);
    +		Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetOptionalAttributes method with two optional attribute.
    +	 */
    +	@Test
    +	public void testGetOptionalAttributesWithOnlyOptional() {
    +		final String strAttrList = "age:false:[]:;isAgeOver:false:[18,]:;";
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(strAttrList);
    +		Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getMandatoryAttributes method with empty attribute list.
    +	 */
    +	@Test
    +	public void testGetMandatoryAttributesWithEmptyList() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getMandatoryAttributes method without mandatory attributes.
    +	 */
    +	@Test
    +	public void testGetMandatoryAttributesWithoutMandatory() {
    +		final String strAttrList = "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;";
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(strAttrList);
    +		Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetMandatoryAttributes method with one mandatory attribute.
    +	 */
    +	@Test
    +	public void testGetMandatoryAttributesWithOneMandatory() {
    +		final String strAttrList = "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;";
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(strAttrList);
    +		Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetMandatoryAttributes method with two mandatory attribute.
    +	 */
    +	@Test
    +	public void testGetMandatoryAttributesWithOnlyMandatory() {
    +		final String strAttrList = "age:true:[]:;isAgeOver:true:[18,]:;";
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(strAttrList);
    +		Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getSimpleValueAttributes method with empty attribute list.
    +	 */
    +	@Test
    +	public void testGetSimpleValueAttributesWithEmptyList() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getSimpleValueAttributes() method without simple attributes.
    +	 */
    +	@Test
    +	public void testGetSimpleValueAttributesWithoutSimple() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(COMPLEX_ATTRLIST);
    +		Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getSimpleValueAttributes() method with one simple attribute.
    +	 */
    +	@Test
    +	public void testGetSimpleValueAttributesWithOneSimple() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(STR_MIX_ATTR_LIST);
    +		Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetMandatoryAttributes method with two simple attribute.
    +	 */
    +	@Test
    +	public void testGetSimpleValueAttributesWithOnlySimple() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(SIMPLE_ATTRLIST3);
    +		Assert.assertTrue(pal.getSimpleValueAttributes().size() == TWO_CONS);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getComplexValueAttributes method with empty attribute list.
    +	 */
    +	@Test
    +	public void testGetComplexAttributesWithEmptyList() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getComplexAttributes() method without complex attributes.
    +	 */
    +	@Test
    +	public void testGetComplexAttributesWithoutSimple() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(SIMPLE_ATTRLIST2);
    +		Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's getComplexAttributes() method with one complex attribute.
    +	 */
    +	@Test
    +	public void testGetComplexAttributesWithOneComplex() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(STR_MIX_ATTR_LIST);
    +		Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS);
    +	}
    +
    +	/**
    +	 * Testing Personal Attribute List's GetMandatoryAttributes method with only two Complex attribute.
    +	 */
    +	@Test
    +	public void testGetComplexAttributesWithOnlyComplex() {
    +		final PersonalAttributeList pal = new PersonalAttributeList();
    +		pal.populate(STR_MIX_ATTR_LIST2);
    +		Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS);
    +	}
     
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
    index 458d510e0..0f014d896 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
    @@ -28,155 +28,137 @@ import eu.stork.peps.auth.commons.STORKStatusCode;
     /**
      * The PersonalAttribute's Test Case.
      * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    - *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
    - *         paulo.ribeiro@multicert.com
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
      * @version $Revision: 1.4 $, $Date: 2010-11-17 05:17:03 $
      */
     public final class PersonalAttributeTestCase {
    -  
    -  /**
    -   * An empty attribute.
    -   */
    -  private static final PersonalAttribute EMPTYATTR = new PersonalAttribute();
    -  
    -  /**
    -   * An attribute with a complex value (canonicalResidenceAddress).
    -   */
    -  private static PersonalAttribute complexAttrValue = null;
    -  
    -  /**
    -   * An attribute with a simple value (age).
    -   */
    -  @SuppressWarnings("serial")
    -  private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
    -    "age", true, new ArrayList() {
    -      {
    -        add("15");
    -      }
    -    }, STORKStatusCode.STATUS_AVAILABLE.toString());
    -  
    -  /**
    -   * Init PersonalAttributeTestCase class.
    -   */
    -  @SuppressWarnings("serial")
    -  @BeforeClass
    -  public static void runsBeforeTheTestSuite() {
    -    final Map values = new HashMap() {
    -      {
    -        put("countryCodeAddress", "PT");
    -        put("state", "Porto");
    -        put("town", "Porto");
    -        put("postalCode", "4100");
    -        put("streetName", "Avenida Sidonio Pais");
    -        put("streetNumber", "379");
    -        put("apartmentNumber", "B");
    -      }
    -    };
    -    
    -    complexAttrValue =
    -      new PersonalAttribute("canonicalResidenceAddress", true, values,
    -        STORKStatusCode.STATUS_AVAILABLE.toString());
    -    
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#toString()} method for the given simple
    -   * attribute value. Values must match.
    -   */
    -  @Test
    -  public void testToStringValues() {
    -    Assert.assertEquals("age:true:[15,]:Available;", ATTR_VALUE.toString());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#toString()} method for the given complex
    -   * attribute value. Values must match.
    -   */
    -  @Test
    -  public void testToStringComplexValues() {
    -    Assert.assertEquals(
    -      "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=B,"
    -        + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
    -        + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;",
    -      complexAttrValue.toString());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
    -   * empty attribute. Must return true.
    -   */
    -  @Test
    -  public void testToIsEmptyStatusWithNull() {
    -    Assert.assertTrue(EMPTYATTR.isEmptyStatus());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
    -   * new attribute. Must return true.
    -   */
    -  @Test
    -  public void testToIsEmptyStatusWithEmptyString() {
    -    final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    -    attr.setStatus("");
    -    Assert.assertTrue(attr.isEmptyStatus());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
    -   * empty attribute. Must return true.
    -   */
    -  @Test
    -  public void testToIsEmptyValueWithNull() {
    -    final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    -    attr.setValue(null);
    -    Assert.assertTrue(attr.isEmptyValue());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
    -   * empty attribute. Must return true.
    -   */
    -  @Test
    -  public void testToIsEmptyValue() {
    -    Assert.assertTrue(EMPTYATTR.isEmptyValue());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
    -   * given empty attribute. Must return true.
    -   */
    -  @Test
    -  public void testToIsEmptyComplexValueWithNull() {
    -    final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    -    attr.setComplexValue(null);
    -    Assert.assertTrue(attr.isEmptyComplexValue());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
    -   * given empty attribute. Must return true.
    -   */
    -  @Test
    -  public void testToIsEmptyComplexValueWithEmptyComplexValue() {
    -    Assert.assertTrue(EMPTYATTR.isEmptyComplexValue());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#clone()} method for the given attribute.
    -   * Must return true.
    -   */
    -  @Test
    -  public void testCloneToComplexValue() {
    -    Assert.assertNotSame(complexAttrValue, complexAttrValue.clone());
    -  }
    -  
    -  /**
    -   * Tests the {@link PersonalAttribute#clone()} method for the given attribute.
    -   * Must return true.
    -   */
    -  @Test
    -  public void testCloneToValue() {
    -    Assert.assertNotSame(ATTR_VALUE, ATTR_VALUE.clone());
    -  }
    +
    +	/**
    +	 * An empty attribute.
    +	 */
    +	private static final PersonalAttribute EMPTYATTR = new PersonalAttribute();
    +
    +	/**
    +	 * An attribute with a complex value (canonicalResidenceAddress).
    +	 */
    +	private static PersonalAttribute complexAttrValue = null;
    +
    +	/**
    +	 * An attribute with a simple value (age).
    +	 */
    +	@SuppressWarnings("serial")
    +	private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute("age", true, new ArrayList() {
    +		{
    +			add("15");
    +		}
    +	}, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +	/**
    +	 * Init PersonalAttributeTestCase class.
    +	 */
    +	@SuppressWarnings("serial")
    +	@BeforeClass
    +	public static void runsBeforeTheTestSuite() {
    +		final Map values = new HashMap() {
    +			{
    +				put("countryCodeAddress", "PT");
    +				put("state", "Porto");
    +				put("town", "Porto");
    +				put("postalCode", "4100");
    +				put("streetName", "Avenida Sidonio Pais");
    +				put("streetNumber", "379");
    +				put("apartmentNumber", "B");
    +			}
    +		};
    +
    +		complexAttrValue = new PersonalAttribute("canonicalResidenceAddress", true, values, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#toString()} method for the given simple attribute value. Values must match.
    +	 */
    +	@Test
    +	public void testToStringValues() {
    +		Assert.assertEquals("age:true:[15,]:Available;", ATTR_VALUE.toString());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#toString()} method for the given complex attribute value. Values must match.
    +	 */
    +	@Test
    +	public void testToStringComplexValues() {
    +		Assert.assertEquals("canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=B," + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
    +				+ "streetName=Avenida Sidonio Pais,town=Porto,]:Available;", complexAttrValue.toString());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given empty attribute. Must return true.
    +	 */
    +	@Test
    +	public void testToIsEmptyStatusWithNull() {
    +		Assert.assertTrue(EMPTYATTR.isEmptyStatus());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given new attribute. Must return true.
    +	 */
    +	@Test
    +	public void testToIsEmptyStatusWithEmptyString() {
    +		final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    +		attr.setStatus("");
    +		Assert.assertTrue(attr.isEmptyStatus());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given empty attribute. Must return true.
    +	 */
    +	@Test
    +	public void testToIsEmptyValueWithNull() {
    +		final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    +		attr.setValue(null);
    +		Assert.assertTrue(attr.isEmptyValue());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given empty attribute. Must return true.
    +	 */
    +	@Test
    +	public void testToIsEmptyValue() {
    +		Assert.assertTrue(EMPTYATTR.isEmptyValue());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the given empty attribute. Must return true.
    +	 */
    +	@Test
    +	public void testToIsEmptyComplexValueWithNull() {
    +		final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    +		attr.setComplexValue(null);
    +		Assert.assertTrue(attr.isEmptyComplexValue());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the given empty attribute. Must return true.
    +	 */
    +	@Test
    +	public void testToIsEmptyComplexValueWithEmptyComplexValue() {
    +		Assert.assertTrue(EMPTYATTR.isEmptyComplexValue());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#clone()} method for the given attribute. Must return true.
    +	 */
    +	@Test
    +	public void testCloneToComplexValue() {
    +		Assert.assertNotSame(complexAttrValue, complexAttrValue.clone());
    +	}
    +
    +	/**
    +	 * Tests the {@link PersonalAttribute#clone()} method for the given attribute. Must return true.
    +	 */
    +	@Test
    +	public void testCloneToValue() {
    +		Assert.assertNotSame(ATTR_VALUE, ATTR_VALUE.clone());
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
    index 26635e337..f4d084a79 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
    @@ -64,10 +64,8 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
     import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
     
     /**
    - * Class that wraps the operations over SAML tokens, both generation and
    - * validation of SAML requests and SAML responses. Compliant with "OASIS Secure
    - * Assertion Markup Language (SAML) 2.0, May 2005", but taking into account
    - * STORK specific requirements.
    + * Class that wraps the operations over SAML tokens, both generation and validation of SAML requests and SAML responses. Compliant with "OASIS Secure Assertion Markup Language (SAML) 2.0, May 2005",
    + * but taking into account STORK specific requirements.
      * 
      * @author fjquevedo
      * @author iinigo
    @@ -85,8 +83,7 @@ public class SAMLEngine {
     	private static Map> instances;
     
     	/** The logger. */
    -	private static final Logger LOG = LoggerFactory.getLogger(SAMLEngine.class
    -			.getName());
    +	private static final Logger LOG = LoggerFactory.getLogger(SAMLEngine.class.getName());
     
     	/** The Constant MODULE_SIGN_CONF. */
     	private static final String MODULE_SIGN_CONF = "SignatureConf";
    @@ -109,7 +106,6 @@ public class SAMLEngine {
     	/** The Module of Signature. */
     	private SAMLEngineSignI signer;
     
    -
     	/** Initializes the SAML engine. */
     	/** Configure Document Builder Factory. */
     
    @@ -134,23 +130,16 @@ public class SAMLEngine {
     	}
     
     	/**
    -	 * Method that initializes the basic services for the SAML Engine, like the
    -	 * OpenSAML library and the BouncyCastle provider.
    +	 * Method that initializes the basic services for the SAML Engine, like the OpenSAML library and the BouncyCastle provider.
     	 */
     	private static void startUp() {
     
     		LOG.info("SAMLEngine: Initialize OpenSAML");
     
    -
    -
    -/* Commented because it makes a problems with PVP2 MOA-ID
    -		try {
    -			DefaultBootstrap.bootstrap();
    -		} catch (ConfigurationException e) {
    -			LOG.error("Problem initializing the OpenSAML library.");
    -			throw new STORKSAMLEngineRuntimeException(e);
    -		}
    -*/
    +		/*
    +		 * Commented because it makes a problems with PVP2 MOA-ID try { DefaultBootstrap.bootstrap(); } catch (ConfigurationException e) { LOG.error("Problem initializing the OpenSAML library.");
    +		 * throw new STORKSAMLEngineRuntimeException(e); }
    +		 */
     
     		LOG.debug("Read all file configurations. (instances of SAMLEngine)");
     		try {
    @@ -162,8 +151,7 @@ public class SAMLEngine {
     
     		LOG.debug("Create all instances of saml engine. (instances of SAMLEngine)");
     		try {
    -			instances = ConfigurationCreator
    -					.createConfiguration(instanceConfigs);
    +			instances = ConfigurationCreator.createConfiguration(instanceConfigs);
     		} catch (STORKSAMLEngineException e) {
     			LOG.error("Error initializing instances from Stork SAML engine.");
     			throw new STORKSAMLEngineRuntimeException(e);
    @@ -173,12 +161,13 @@ public class SAMLEngine {
     	/**
     	 * Instantiates a new SAML engine.
     	 * 
    -	 * @param nameInstance the name instance
    +	 * @param nameInstance
    +	 *            the name instance
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	protected SAMLEngine(final String nameInstance)
    -			throws STORKSAMLEngineException {
    +	protected SAMLEngine(final String nameInstance) throws STORKSAMLEngineException {
     		LOG.info("Loading Specific Configuration.");
     
     		LOG.debug("Create intance of saml messages.");
    @@ -187,8 +176,7 @@ public class SAMLEngine {
     
     		if (instance == null || instance.isEmpty()) {
     			LOG.error("Instance: " + nameInstance + " not exist.");
    -			throw new STORKSAMLEngineException("Instance: " + nameInstance
    -					+ " not exist.");
    +			throw new STORKSAMLEngineException("Instance: " + nameInstance + " not exist.");
     		}
     
     		Properties properties = (Properties) instance.get(SAML_ENGINE_CONF);
    @@ -200,12 +188,10 @@ public class SAMLEngine {
     
     		samlCore = new STORKSAMLCore(properties);
     
    -		final HashMap propertiesSign = (HashMap) instance
    -				.get(MODULE_SIGN_CONF);
    +		final HashMap propertiesSign = (HashMap) instance.get(MODULE_SIGN_CONF);
     
     		LOG.debug("Loading Module of sign.");
    -		signer = SignModuleFactory.getInstance(propertiesSign
    -				.get(SAML_ENGINE_SIGN_CLASS));
    +		signer = SignModuleFactory.getInstance(propertiesSign.get(SAML_ENGINE_SIGN_CLASS));
     
     		try {
     			LOG.info("Initialize module of sign.");
    @@ -213,8 +199,7 @@ public class SAMLEngine {
     			LOG.info("Load cryptographic service provider of module of sign.");
     			signer.loadCryptServiceProvider();
     		} catch (SAMLEngineException e) {
    -			LOG.error("Error create signature module: "
    -					+ propertiesSign.get(SAML_ENGINE_FILE_CONF));
    +			LOG.error("Error create signature module: " + propertiesSign.get(SAML_ENGINE_FILE_CONF));
     			LOG.info("Exception" + e);
     			throw new STORKSAMLEngineException(e);
     		}
    @@ -239,30 +224,28 @@ public class SAMLEngine {
     	}
     
     	/**
    -	 * Method that transform the received SAML object into a byte array
    -	 * representation.
    +	 * Method that transform the received SAML object into a byte array representation.
     	 * 
    -	 * @param samlToken the SAML token.
    +	 * @param samlToken
    +	 *            the SAML token.
     	 * 
     	 * @return the byte[] of the SAML token.
     	 * 
    -	 * @throws SAMLEngineException the SAML engine exception
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
     	 */
    -	private byte[] marshall(final XMLObject samlToken)
    -			throws SAMLEngineException {
    +	private byte[] marshall(final XMLObject samlToken) throws SAMLEngineException {
     
     		try {
     			javax.xml.parsers.DocumentBuilder docBuilder = null;
     
    -			final MarshallerFactory marshallerFactory = Configuration
    -					.getMarshallerFactory();
    +			final MarshallerFactory marshallerFactory = Configuration.getMarshallerFactory();
     
     			final Marshaller marshaller;
     			if (samlToken.getElementQName().toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
     				marshaller = new CustomAttributeQueryMarshaller();
     			else
    -				marshaller = marshallerFactory
    -				.getMarshaller(samlToken);
    +				marshaller = marshallerFactory.getMarshaller(samlToken);
     
     			docBuilder = dbf.newDocumentBuilder();
     
    @@ -274,13 +257,12 @@ public class SAMLEngine {
     			final DOMSource domSource = new DOMSource(doc);
     			final StringWriter writer = new StringWriter();
     			final StreamResult result = new StreamResult(writer);
    -			final TransformerFactory transFactory = TransformerFactory
    -					.newInstance();
    +			final TransformerFactory transFactory = TransformerFactory.newInstance();
     			Transformer transformer;
     
     			transformer = transFactory.newTransformer();
     			transformer.transform(domSource, result);
    -			LOG.debug("SAML request \n"+ writer.toString());
    +			LOG.debug("SAML request \n" + writer.toString());
     			return writer.toString().getBytes(CHARACTER_ENCODING);
     
     		} catch (ParserConfigurationException e) {
    @@ -304,14 +286,15 @@ public class SAMLEngine {
     	/**
     	 * Method that signs a SAML Token.
     	 * 
    -	 * @param tokenSaml the token SAML
    +	 * @param tokenSaml
    +	 *            the token SAML
     	 * 
     	 * @return the SAML object sign
     	 * 
    -	 * @throws SAMLEngineException the SAML engine exception
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
     	 */
    -	private SignableSAMLObject sign(final SignableSAMLObject tokenSaml)
    -			throws SAMLEngineException {
    +	private SignableSAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
     		LOG.debug("Sign SamlToken.");
     		signer.sign(tokenSaml);
     		return tokenSaml;
    @@ -320,31 +303,32 @@ public class SAMLEngine {
     	/**
     	 * Sign and transform to byte array.
     	 * 
    -	 * @param samlToken the SAML token
    +	 * @param samlToken
    +	 *            the SAML token
     	 * 
     	 * @return the byte[] of the SAML token
     	 * 
    -	 * @throws SAMLEngineException the SAML engine exception
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
     	 */
    -	protected final byte[] signAndMarshall(final SignableSAMLObject samlToken)
    -			throws SAMLEngineException {
    +	protected final byte[] signAndMarshall(final SignableSAMLObject samlToken) throws SAMLEngineException {
     		LOG.debug("Marshall Saml Token.");
     		SignableSAMLObject signElement = sign(samlToken);
     		return marshall(signElement);
     	}
     
     	/**
    -	 * Method that unmarshalls a SAML Object from a byte array representation to
    -	 * an XML Object.
    +	 * Method that unmarshalls a SAML Object from a byte array representation to an XML Object.
     	 * 
    -	 * @param samlToken Byte array representation of a SAML Object
    +	 * @param samlToken
    +	 *            Byte array representation of a SAML Object
     	 * 
     	 * @return XML Object (superclass of SAMLObject)
     	 * 
    -	 * @throws SAMLEngineException the SAML engine exception
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
     	 */
    -	protected final XMLObject unmarshall(final byte[] samlToken)
    -			throws SAMLEngineException {
    +	protected final XMLObject unmarshall(final byte[] samlToken) throws SAMLEngineException {
     		try {
     			// Get parser pool manager
     			final BasicParserPool ppMgr = new BasicParserPool();
    @@ -358,12 +342,12 @@ public class SAMLEngine {
     
     			// Parse SAMLToken
     			Document document = ppMgr.parse(new ByteArrayInputStream(samlToken));
    -			if (document != null){
    +			if (document != null) {
     				final Element root = document.getDocumentElement();
     				// Get appropriate unmarshaller
     				final UnmarshallerFactory unmarshallerFact = Configuration.getUnmarshallerFactory();
     				// Unmarshall using the SAML Token root element
    -				if (unmarshallerFact != null && root != null){
    +				if (unmarshallerFact != null && root != null) {
     					final Unmarshaller unmarshaller;
     					if (root.getLocalName().equals(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
     						unmarshaller = new CustomAttributeQueryUnmarshaller();
    @@ -371,7 +355,7 @@ public class SAMLEngine {
     						unmarshaller = unmarshallerFact.getUnmarshaller(root);
     					try {
     						return unmarshaller.unmarshall(root);
    -					} catch (NullPointerException e){
    +					} catch (NullPointerException e) {
     						LOG.error("Error element tag incomplet or null.");
     						throw new SAMLEngineException("NullPointerException", e);
     					}
    @@ -398,14 +382,15 @@ public class SAMLEngine {
     	/**
     	 * Method that validates an XML Signature contained in a SAML Token.
     	 * 
    -	 * @param samlToken the SAML token
    +	 * @param samlToken
    +	 *            the SAML token
     	 * 
     	 * @return the SAML object
     	 * 
    -	 * @throws SAMLEngineException the SAML engine exception
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
     	 */
    -	protected final SAMLObject validateSignature(
    -			final SignableSAMLObject samlToken) throws SAMLEngineException {
    +	protected final SAMLObject validateSignature(final SignableSAMLObject samlToken) throws SAMLEngineException {
     
     		LOG.info("Validate Signature");
     		signer.validateSignature(samlToken);
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java
    index 1efbb8b32..3cc323c96 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java
    @@ -96,72 +96,37 @@ public final class SAMLEngineUtils {
     	private static SecureRandomIdentifierGenerator generator;
     
     	/** The Constant LOG. */
    -	private static final Logger LOG = LoggerFactory
    -			.getLogger(SAMLEngineUtils.class.getName());
    +	private static final Logger LOG = LoggerFactory.getLogger(SAMLEngineUtils.class.getName());
     
     	/**
     	 * Method that generates a random value according to NCName grammar.
     	 * 
    -	 * NCName ::= NCNameStartChar NCNameChar* NCNameChar ::= NameChar - ':'
    -	 * NCNameStartChar ::= Letter | '_' NameStartChar ::= ":" | [A-Z] | "_" |
    -	 * [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] |
    -	 * [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] |
    -	 * [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
    -	 * NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] |
    -	 * [#x203F-#x2040] Name ::= NameStartChar (NameChar)* Letter ::= BaseChar |
    -	 * Ideographic BaseChar ::= [#x0041-#x005A] | [#x0061-#x007A] |
    -	 * [#x00C0-#x00D6] | [#x00D8-#x00F6] | [#x00F8-#x00FF] | [#x0100-#x0131] |
    -	 * [#x0134-#x013E] | [#x0141-#x0148] | [#x014A-#x017E] | [#x0180-#x01C3] |
    -	 * [#x01CD-#x01F0] | [#x01F4-#x01F5] | [#x01FA-#x0217] | [#x0250-#x02A8] |
    -	 * [#x02BB-#x02C1] | #x0386 | [#x0388-#x038A] | #x038C | [#x038E-#x03A1] |
    -	 * [#x03A3-#x03CE] | [#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 |
    -	 * [#x03E2-#x03F3] | [#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] |
    -	 * [#x045E-#x0481] | [#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] |
    -	 * [#x04D0-#x04EB] | [#x04EE-#x04F5] | [#x04F8-#x04F9] | [#x0531-#x0556] |
    -	 * #x0559 | [#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] |
    -	 * [#x0621-#x063A] | [#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] |
    -	 * [#x06C0-#x06CE] | [#x06D0-#x06D3] | #x06D5 | [#x06E5-#x06E6] |
    -	 * [#x0905-#x0939] | #x093D | [#x0958-#x0961] | [#x0985-#x098C] |
    -	 * [#x098F-#x0990] | [#x0993-#x09A8] | [#x09AA-#x09B0] | #x09B2 |
    -	 * [#x09B6-#x09B9] | [#x09DC-#x09DD] | [#x09DF-#x09E1] | [#x09F0-#x09F1] |
    -	 * [#x0A05-#x0A0A] | [#x0A0F-#x0A10] | [#x0A13-#x0A28] | [#x0A2A-#x0A30] |
    -	 * [#x0A32-#x0A33] | [#x0A35-#x0A36] | [#x0A38-#x0A39] | [#x0A59-#x0A5C] |
    -	 * #x0A5E | [#x0A72-#x0A74] | [#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] |
    -	 * [#x0A93-#x0AA8] | [#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] |
    -	 * #x0ABD | #x0AE0 | [#x0B05-#x0B0C] | [#x0B0F-#x0B10] | [#x0B13-#x0B28] |
    -	 * [#x0B2A-#x0B30] | [#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D |
    -	 * [#x0B5C-#x0B5D] | [#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] |
    -	 * [#x0B92-#x0B95] | [#x0B99-#x0B9A] | #x0B9C | [#x0B9E-#x0B9F] |
    -	 * [#x0BA3-#x0BA4] | [#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] |
    -	 * [#x0C05-#x0C0C] | [#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] |
    -	 * [#x0C35-#x0C39] | [#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] |
    -	 * [#x0C92-#x0CA8] | [#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE |
    -	 * [#x0CE0-#x0CE1] | [#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] |
    -	 * [#x0D2A-#x0D39] | [#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 |
    -	 * [#x0E32-#x0E33] | [#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 |
    -	 * [#x0E87-#x0E88] | #x0E8A | #x0E8D | [#x0E94-#x0E97] | [#x0E99-#x0E9F] |
    -	 * [#x0EA1-#x0EA3] | #x0EA5 | #x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] |
    -	 * #x0EB0 | [#x0EB2-#x0EB3] | #x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] |
    -	 * [#x0F49-#x0F69] | [#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 |
    -	 * [#x1102-#x1103] | [#x1105-#x1107] | #x1109 | [#x110B-#x110C] |
    -	 * [#x110E-#x1112] | #x113C | #x113E | #x1140 | #x114C | #x114E | #x1150 |
    -	 * [#x1154-#x1155] | #x1159 | [#x115F-#x1161] | #x1163 | #x1165 | #x1167 |
    -	 * #x1169 | [#x116D-#x116E] | [#x1172-#x1173] | #x1175 | #x119E | #x11A8 |
    -	 * #x11AB | [#x11AE-#x11AF] | [#x11B7-#x11B8] | #x11BA | [#x11BC-#x11C2] |
    -	 * #x11EB | #x11F0 | #x11F9 | [#x1E00-#x1E9B] | [#x1EA0-#x1EF9] |
    -	 * [#x1F00-#x1F15] | [#x1F18-#x1F1D] | [#x1F20-#x1F45] | [#x1F48-#x1F4D] |
    -	 * [#x1F50-#x1F57] | #x1F59 | #x1F5B | #x1F5D | [#x1F5F-#x1F7D] |
    -	 * [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE | [#x1FC2-#x1FC4] |
    -	 * [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] | [#x1FE0-#x1FEC] |
    -	 * [#x1FF2-#x1FF4] | [#x1FF6-#x1FFC] | #x2126 | [#x212A-#x212B] | #x212E |
    -	 * [#x2180-#x2182] | [#x3041-#x3094] | [#x30A1-#x30FA] | [#x3105-#x312C] |
    -	 * [#xAC00-#xD7A3] Ideographic ::= [#x4E00-#x9FA5] | #x3007 |
    +	 * NCName ::= NCNameStartChar NCNameChar* NCNameChar ::= NameChar - ':' NCNameStartChar ::= Letter | '_' NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] |
    +	 * [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] NameChar ::= NameStartChar | "-" |
    +	 * "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] Name ::= NameStartChar (NameChar)* Letter ::= BaseChar | Ideographic BaseChar ::= [#x0041-#x005A] | [#x0061-#x007A] | [#x00C0-#x00D6] |
    +	 * [#x00D8-#x00F6] | [#x00F8-#x00FF] | [#x0100-#x0131] | [#x0134-#x013E] | [#x0141-#x0148] | [#x014A-#x017E] | [#x0180-#x01C3] | [#x01CD-#x01F0] | [#x01F4-#x01F5] | [#x01FA-#x0217] |
    +	 * [#x0250-#x02A8] | [#x02BB-#x02C1] | #x0386 | [#x0388-#x038A] | #x038C | [#x038E-#x03A1] | [#x03A3-#x03CE] | [#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 | [#x03E2-#x03F3] |
    +	 * [#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] | [#x045E-#x0481] | [#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] | [#x04D0-#x04EB] | [#x04EE-#x04F5] | [#x04F8-#x04F9] |
    +	 * [#x0531-#x0556] | #x0559 | [#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] | [#x0621-#x063A] | [#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] | [#x06C0-#x06CE] | [#x06D0-#x06D3] |
    +	 * #x06D5 | [#x06E5-#x06E6] | [#x0905-#x0939] | #x093D | [#x0958-#x0961] | [#x0985-#x098C] | [#x098F-#x0990] | [#x0993-#x09A8] | [#x09AA-#x09B0] | #x09B2 | [#x09B6-#x09B9] | [#x09DC-#x09DD] |
    +	 * [#x09DF-#x09E1] | [#x09F0-#x09F1] | [#x0A05-#x0A0A] | [#x0A0F-#x0A10] | [#x0A13-#x0A28] | [#x0A2A-#x0A30] | [#x0A32-#x0A33] | [#x0A35-#x0A36] | [#x0A38-#x0A39] | [#x0A59-#x0A5C] | #x0A5E |
    +	 * [#x0A72-#x0A74] | [#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] | [#x0A93-#x0AA8] | [#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] | #x0ABD | #x0AE0 | [#x0B05-#x0B0C] | [#x0B0F-#x0B10] |
    +	 * [#x0B13-#x0B28] | [#x0B2A-#x0B30] | [#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D | [#x0B5C-#x0B5D] | [#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] | [#x0B92-#x0B95] | [#x0B99-#x0B9A] |
    +	 * #x0B9C | [#x0B9E-#x0B9F] | [#x0BA3-#x0BA4] | [#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] | [#x0C05-#x0C0C] | [#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] | [#x0C35-#x0C39] |
    +	 * [#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] | [#x0C92-#x0CA8] | [#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE | [#x0CE0-#x0CE1] | [#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] |
    +	 * [#x0D2A-#x0D39] | [#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 | [#x0E32-#x0E33] | [#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 | [#x0E87-#x0E88] | #x0E8A | #x0E8D | [#x0E94-#x0E97] |
    +	 * [#x0E99-#x0E9F] | [#x0EA1-#x0EA3] | #x0EA5 | #x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] | #x0EB0 | [#x0EB2-#x0EB3] | #x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] | [#x0F49-#x0F69] |
    +	 * [#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 | [#x1102-#x1103] | [#x1105-#x1107] | #x1109 | [#x110B-#x110C] | [#x110E-#x1112] | #x113C | #x113E | #x1140 | #x114C | #x114E | #x1150 |
    +	 * [#x1154-#x1155] | #x1159 | [#x115F-#x1161] | #x1163 | #x1165 | #x1167 | #x1169 | [#x116D-#x116E] | [#x1172-#x1173] | #x1175 | #x119E | #x11A8 | #x11AB | [#x11AE-#x11AF] | [#x11B7-#x11B8] |
    +	 * #x11BA | [#x11BC-#x11C2] | #x11EB | #x11F0 | #x11F9 | [#x1E00-#x1E9B] | [#x1EA0-#x1EF9] | [#x1F00-#x1F15] | [#x1F18-#x1F1D] | [#x1F20-#x1F45] | [#x1F48-#x1F4D] | [#x1F50-#x1F57] | #x1F59 |
    +	 * #x1F5B | #x1F5D | [#x1F5F-#x1F7D] | [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE | [#x1FC2-#x1FC4] | [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] | [#x1FE0-#x1FEC] | [#x1FF2-#x1FF4] |
    +	 * [#x1FF6-#x1FFC] | #x2126 | [#x212A-#x212B] | #x212E | [#x2180-#x2182] | [#x3041-#x3094] | [#x30A1-#x30FA] | [#x3105-#x312C] | [#xAC00-#xD7A3] Ideographic ::= [#x4E00-#x9FA5] | #x3007 |
     	 * [#x3021-#x3029]
     	 * 
     	 * @return Random ID value
     	 */
     
    -	//Initialization of a generator of identifiers for all token SAML.
    +	// Initialization of a generator of identifiers for all token SAML.
     	static {
     		loadRandomIdentifierGenerator();
     	}
    @@ -169,7 +134,8 @@ public final class SAMLEngineUtils {
     	/**
     	 * Load random identifier generator.
     	 *
    -	 *@throws STORKSAMLEngineRuntimeException the STORKSAML engine runtime exception
    +	 * @throws STORKSAMLEngineRuntimeException
    +	 *             the STORKSAML engine runtime exception
     	 */
     	private static void loadRandomIdentifierGenerator() {
     		try {
    @@ -184,49 +150,48 @@ public final class SAMLEngineUtils {
     	/**
     	 * Creates the SAML object.
     	 * 
    -	 * @param qname the QName
    +	 * @param qname
    +	 *            the QName
     	 * 
     	 * @return the XML object
     	 */
     	public static XMLObject createSamlObject(final QName qname) {
    -		if (qname.toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
    -		{
    +		if (qname.toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
     			CustomAttributeQueryBuilder builder = new CustomAttributeQueryBuilder();
     			return builder.buildObject(qname);
    -		}
    -		else
    -		{
    -			return Configuration.getBuilderFactory().getBuilder(qname).buildObject(
    -					qname);
    +		} else {
    +			return Configuration.getBuilderFactory().getBuilder(qname).buildObject(qname);
     		}
     	}
     
     	/**
     	 * Creates the SAML object.
     	 * 
    -	 * @param qname the quality name
    -	 * @param qname1 the qname1
    +	 * @param qname
    +	 *            the quality name
    +	 * @param qname1
    +	 *            the qname1
     	 * 
     	 * @return the xML object
     	 */
    -	public static XMLObject createSamlObject(final QName qname,
    -			final QName qname1) {
    -		return Configuration.getBuilderFactory().getBuilder(qname1)
    -				.buildObject(qname, qname1);
    +	public static XMLObject createSamlObject(final QName qname, final QName qname1) {
    +		return Configuration.getBuilderFactory().getBuilder(qname1).buildObject(qname, qname1);
     	}
     
     	/**
     	 * Encode value with an specific algorithm.
     	 * 
    -	 * @param value the value
    -	 * @param alg the algorithm
    +	 * @param value
    +	 *            the value
    +	 * @param alg
    +	 *            the algorithm
     	 * 
     	 * @return the string
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public static String encode(final String value, final String alg)
    -			throws STORKSAMLEngineException {
    +	public static String encode(final String value, final String alg) throws STORKSAMLEngineException {
     		LOG.debug("Encode value with  " + alg + " algorithm.");
     		byte[] buffer;
     		final StringBuffer hash = new StringBuffer("");
    @@ -257,16 +222,18 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate assertion.
     	 * 
    -	 * @param version the version
    -	 * @param identifier the identifier
    -	 * @param issueInstant the issue instant
    -	 * @param issuer the issuer
    +	 * @param version
    +	 *            the version
    +	 * @param identifier
    +	 *            the identifier
    +	 * @param issueInstant
    +	 *            the issue instant
    +	 * @param issuer
    +	 *            the issuer
     	 * 
     	 * @return the assertion
     	 */
    -	public static Assertion generateAssertion(final SAMLVersion version,
    -			final String identifier, final DateTime issueInstant,
    -			final Issuer issuer) {
    +	public static Assertion generateAssertion(final SAMLVersion version, final String identifier, final DateTime issueInstant, final Issuer issuer) {
     		final AssertionBuilder assertionBuilder = new AssertionBuilder();
     		final Assertion assertion = assertionBuilder.buildObject();
     		assertion.setVersion(version);
    @@ -280,16 +247,16 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate authentication statement.
     	 * 
    -	 * @param authnInstant the authentication instant
    -	 * @param authnContext the authentication context
    +	 * @param authnInstant
    +	 *            the authentication instant
    +	 * @param authnContext
    +	 *            the authentication context
     	 * 
     	 * @return the authentication statement
     	 */
    -	public static AuthnStatement generateAthnStatement(final DateTime authnInstant,
    -			final AuthnContext authnContext) {
    +	public static AuthnStatement generateAthnStatement(final DateTime authnInstant, final AuthnContext authnContext) {
     		// 
    -		final AuthnStatement authnStatement = (AuthnStatement) SAMLEngineUtils
    -				.createSamlObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
    +		final AuthnStatement authnStatement = (AuthnStatement) SAMLEngineUtils.createSamlObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
     		authnStatement.setAuthnInstant(authnInstant);
     		authnStatement.setAuthnContext(authnContext);
     		return authnStatement;
    @@ -298,51 +265,45 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate attribute from a list of values.
     	 *
    -	 * @param name the name of the attribute.
    -	 * @param status the status of the parameter: "Available", "NotAvailable" or
    -	 * "Withheld".
    -	 * @param values the value of the attribute.
    -	 * @param isHashing the is hashing with "SHA-512" algorithm.
    +	 * @param name
    +	 *            the name of the attribute.
    +	 * @param status
    +	 *            the status of the parameter: "Available", "NotAvailable" or "Withheld".
    +	 * @param values
    +	 *            the value of the attribute.
    +	 * @param isHashing
    +	 *            the is hashing with "SHA-512" algorithm.
     	 * @return the attribute
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public static Attribute generateAttrComplex(final String name,
    -			final String status, final Map values,
    -			final boolean isHashing) throws STORKSAMLEngineException {
    +	public static Attribute generateAttrComplex(final String name, final String status, final Map values, final boolean isHashing) throws STORKSAMLEngineException {
     		LOG.debug("Generate attribute complex: " + name);
    -		final Attribute attribute = (Attribute) SAMLEngineUtils
    -				.createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
    +		final Attribute attribute = (Attribute) SAMLEngineUtils.createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
     
     		attribute.setName(name);
     		attribute.setNameFormat(Attribute.URI_REFERENCE);
    -		attribute.getUnknownAttributes().put(
    -				new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus",
    -						SAMLCore.STORK10_PREFIX.getValue()), status);
    +		attribute.getUnknownAttributes().put(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus", SAMLCore.STORK10_PREFIX.getValue()), status);
     
     		if (!values.isEmpty()) {
     			LOG.debug("Add attribute values.");
     			// Create an attribute that contains all XSAny elements.
    -			final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(
    -					AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
    -			final Iterator> iterator = values.entrySet()
    -					.iterator();
    +			final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
    +			final Iterator> iterator = values.entrySet().iterator();
     			while (iterator.hasNext()) {
     				final Map.Entry pairs = iterator.next();
     				final String value = pairs.getValue();
     
     				if (StringUtils.isNotBlank(value)) {
     					// Create the attribute statement
    -					final XSAny attrValueSimple = (XSAny) SAMLEngineUtils
    -							.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(),
    -									pairs.getKey().toString(),
    -									SAMLCore.STORK10_PREFIX.getValue()), XSAny.TYPE_NAME);
    +					final XSAny attrValueSimple = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), pairs.getKey().toString(), SAMLCore.STORK10_PREFIX.getValue()),
    +							XSAny.TYPE_NAME);
     					// if it's necessary encode the information.
     					if (isHashing) {
    -						attrValueSimple
    -						.setTextContent(encode(value, SHA_512));
    +						attrValueSimple.setTextContent(encode(value, SHA_512));
     					} else {
     						attrValueSimple.setTextContent(value);
    -					}		    
    +					}
     					attrValue.getUnknownXMLObjects().add(attrValueSimple);
     					attribute.getAttributeValues().add(attrValue);
     				}
    @@ -359,8 +320,7 @@ public final class SAMLEngineUtils {
     	 */
     	public static Extensions generateExtension() {
     		final ExtensionsBuilder extensionsBuilder = new ExtensionsBuilder();
    -		return extensionsBuilder.buildObject(
    -				"urn:oasis:names:tc:SAML:2.0:protocol", "Extensions", "saml2p");
    +		return extensionsBuilder.buildObject("urn:oasis:names:tc:SAML:2.0:protocol", "Extensions", "saml2p");
     	}
     
     	/**
    @@ -369,8 +329,7 @@ public final class SAMLEngineUtils {
     	 * @return the issuer
     	 */
     	public static Issuer generateIssuer() {
    -		return (Issuer) SAMLEngineUtils
    -				.createSamlObject(Issuer.DEFAULT_ELEMENT_NAME);
    +		return (Issuer) SAMLEngineUtils.createSamlObject(Issuer.DEFAULT_ELEMENT_NAME);
     	}
     
     	/**
    @@ -379,8 +338,7 @@ public final class SAMLEngineUtils {
     	 * @return the key info
     	 */
     	public static KeyInfo generateKeyInfo() {
    -		return (KeyInfo) SAMLEngineUtils
    -				.createSamlObject(KeyInfo.DEFAULT_ELEMENT_NAME);
    +		return (KeyInfo) SAMLEngineUtils.createSamlObject(KeyInfo.DEFAULT_ELEMENT_NAME);
     	}
     
     	/**
    @@ -389,25 +347,24 @@ public final class SAMLEngineUtils {
     	 * @return the name id
     	 */
     	public static NameID generateNameID() {
    -		return (NameID) SAMLEngineUtils
    -				.createSamlObject(NameID.DEFAULT_ELEMENT_NAME);
    +		return (NameID) SAMLEngineUtils.createSamlObject(NameID.DEFAULT_ELEMENT_NAME);
     	}
     
     	/**
     	 * Generate name id.
     	 * 
    -	 * @param nameQualifier the name qualifier
    -	 * @param format the format
    -	 * @param spNameQualifier the sP name qualifier
    +	 * @param nameQualifier
    +	 *            the name qualifier
    +	 * @param format
    +	 *            the format
    +	 * @param spNameQualifier
    +	 *            the sP name qualifier
     	 * 
     	 * @return the name id
     	 */
    -	public static NameID generateNameID(final String nameQualifier,
    -			final String format, final String spNameQualifier) {
    +	public static NameID generateNameID(final String nameQualifier, final String format, final String spNameQualifier) {
     		// 
    -		final NameID nameId = (NameID) Configuration.getBuilderFactory()
    -				.getBuilder(NameID.DEFAULT_ELEMENT_NAME).buildObject(
    -						NameID.DEFAULT_ELEMENT_NAME);
    +		final NameID nameId = (NameID) Configuration.getBuilderFactory().getBuilder(NameID.DEFAULT_ELEMENT_NAME).buildObject(NameID.DEFAULT_ELEMENT_NAME);
     		// optional
     		nameId.setNameQualifier(nameQualifier);
     		// optional
    @@ -429,18 +386,18 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate the quality authentication assurance level.
     	 * 
    -	 * @param qaal the level of quality authentication assurance.
    +	 * @param qaal
    +	 *            the level of quality authentication assurance.
     	 * 
     	 * @return the quality authentication assurance attribute
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public static QAAAttribute generateQAAAttribute(final int qaal)
    -			throws STORKSAMLEngineException {
    +	public static QAAAttribute generateQAAAttribute(final int qaal) throws STORKSAMLEngineException {
     		LOG.debug("Generate QAAAttribute.");
     
    -		final QAAAttribute qaaAttribute = (QAAAttribute) SAMLEngineUtils
    -				.createSamlObject(QAAAttribute.DEF_ELEMENT_NAME);
    +		final QAAAttribute qaaAttribute = (QAAAttribute) SAMLEngineUtils.createSamlObject(QAAAttribute.DEF_ELEMENT_NAME);
     		qaaAttribute.setQaaLevel(String.valueOf(qaal));
     		return qaaAttribute;
     	}
    @@ -448,20 +405,21 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate requested attribute.
     	 * 
    -	 * @param name the name
    -	 * @param friendlyName the friendly name
    -	 * @param isRequired the is required
    -	 * @param value the value
    +	 * @param name
    +	 *            the name
    +	 * @param friendlyName
    +	 *            the friendly name
    +	 * @param isRequired
    +	 *            the is required
    +	 * @param value
    +	 *            the value
     	 * 
     	 * @return the requested attribute
     	 */
    -	public static RequestedAttribute generateReqAuthnAttributeSimple(
    -			final String name, final String friendlyName,
    -			final String isRequired, final List value) {
    +	public static RequestedAttribute generateReqAuthnAttributeSimple(final String name, final String friendlyName, final String isRequired, final List value) {
     		LOG.debug("Generate the requested attribute.");
     
    -		final RequestedAttribute requested = (RequestedAttribute) SAMLEngineUtils
    -				.createSamlObject(RequestedAttribute.DEF_ELEMENT_NAME);
    +		final RequestedAttribute requested = (RequestedAttribute) SAMLEngineUtils.createSamlObject(RequestedAttribute.DEF_ELEMENT_NAME);
     		requested.setName(name);
     		requested.setNameFormat(RequestedAttribute.URI_REFERENCE);
     
    @@ -473,26 +431,22 @@ public final class SAMLEngineUtils {
     		if (!value.isEmpty()) {
     			for (int nextValue = 0; nextValue < value.size(); nextValue++) {
     				final String valor = value.get(nextValue);
    -				if (StringUtils.isNotBlank(valor)) {			
    +				if (StringUtils.isNotBlank(valor)) {
     
    -					if(!name.equals("http://www.stork.gov.eu/1.0/signedDoc")){
    +					if (!name.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
     
     						// Create the attribute statement
    -						final XSAny attrValue = (XSAny) SAMLEngineUtils
    -								.createSamlObject(
    -										new QName(SAMLCore.STORK10_NS.getValue(),
    -												"AttributeValue",
    -												SAMLCore.STORK10_PREFIX.getValue()),
    -												XSAny.TYPE_NAME);
    +						final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeValue", SAMLCore.STORK10_PREFIX.getValue()),
    +								XSAny.TYPE_NAME);
     
     						attrValue.setTextContent(valor.trim());
     						requested.getAttributeValues().add(attrValue);
     
    -					}else{		    	
    +					} else {
     
     						DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
    -						domFactory.setNamespaceAware(true); 		 
    -						Document document = null;				
    +						domFactory.setNamespaceAware(true);
    +						Document document = null;
     						DocumentBuilder builder;
     
     						// Parse the signedDoc value into an XML DOM Document
    @@ -501,7 +455,7 @@ public final class SAMLEngineUtils {
     							InputStream is;
     							is = new ByteArrayInputStream(valor.trim().getBytes(UTF_8));
     							document = builder.parse(is);
    -							is.close();						
    +							is.close();
     						} catch (SAXException e1) {
     							LOG.error("SAX Error while parsing signModule attribute", e1);
     							throw new STORKSAMLEngineRuntimeException(e1);
    @@ -517,31 +471,21 @@ public final class SAMLEngineUtils {
     						}
     
     						// Create the XML statement(this will be overwritten with the previous DOM structure)
    -						final XSAny xmlValue = (XSAny) SAMLEngineUtils
    -								.createSamlObject(
    -										new QName(SAMLCore.STORK10_NS.getValue(),
    -												"XMLValue",
    -												SAMLCore.STORK10_PREFIX.getValue()),
    -												XSAny.TYPE_NAME);	
    -
    -						//Set the signedDoc XML content to this element
    +						final XSAny xmlValue = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), "XMLValue", SAMLCore.STORK10_PREFIX.getValue()), XSAny.TYPE_NAME);
    +
    +						// Set the signedDoc XML content to this element
     						xmlValue.setDOM(document.getDocumentElement());
     
     						// Create the attribute statement
    -						final XSAny attrValue = (XSAny) SAMLEngineUtils
    -								.createSamlObject(
    -										new QName(SAMLCore.STORK10_NS.getValue(),
    -												"AttributeValue",
    -												SAMLCore.STORK10_PREFIX.getValue()),
    -												XSAny.TYPE_NAME);	
    -
    -						//Add previous signedDocXML to the AttributeValue Element
    +						final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeValue", SAMLCore.STORK10_PREFIX.getValue()),
    +								XSAny.TYPE_NAME);
    +
    +						// Add previous signedDocXML to the AttributeValue Element
     						attrValue.getUnknownXMLObjects().add(xmlValue);
     
    -						requested.getAttributeValues().add(attrValue);		    	
    +						requested.getAttributeValues().add(attrValue);
     					}
     
    -
     				}
     			}
     		}
    @@ -552,18 +496,19 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate response.
     	 * 
    -	 * @param version the version
    -	 * @param identifier the identifier
    -	 * @param issueInstant the issue instant
    -	 * @param status the status
    +	 * @param version
    +	 *            the version
    +	 * @param identifier
    +	 *            the identifier
    +	 * @param issueInstant
    +	 *            the issue instant
    +	 * @param status
    +	 *            the status
     	 * 
     	 * @return the response
     	 */
    -	public static Response generateResponse(final SAMLVersion version,
    -			final String identifier, final DateTime issueInstant,
    -			final Status status) {
    -		final Response response = (Response) SAMLEngineUtils
    -				.createSamlObject(Response.DEFAULT_ELEMENT_NAME);
    +	public static Response generateResponse(final SAMLVersion version, final String identifier, final DateTime issueInstant, final Status status) {
    +		final Response response = (Response) SAMLEngineUtils.createSamlObject(Response.DEFAULT_ELEMENT_NAME);
     		response.setID(identifier);
     		response.setIssueInstant(issueInstant);
     		response.setStatus(status);
    @@ -571,20 +516,20 @@ public final class SAMLEngineUtils {
     	}
     
     	/**
    -	 * Method that generates a SAML Authentication Request basing on the
    -	 * provided information.
    +	 * Method that generates a SAML Authentication Request basing on the provided information.
     	 * 
    -	 * @param identifier the identifier
    -	 * @param version the version
    -	 * @param issueInstant the issue instant
    +	 * @param identifier
    +	 *            the identifier
    +	 * @param version
    +	 *            the version
    +	 * @param issueInstant
    +	 *            the issue instant
     	 * 
     	 * @return the authentication request
     	 */
    -	public static AuthnRequest generateSAMLAuthnRequest(final String identifier,
    -			final SAMLVersion version, final DateTime issueInstant) {
    +	public static AuthnRequest generateSAMLAuthnRequest(final String identifier, final SAMLVersion version, final DateTime issueInstant) {
     		LOG.debug("Generate basic authentication request.");
    -		final AuthnRequest authnRequest = (AuthnRequest) SAMLEngineUtils
    -				.createSamlObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
    +		final AuthnRequest authnRequest = (AuthnRequest) SAMLEngineUtils.createSamlObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
     
     		authnRequest.setID(identifier);
     		authnRequest.setVersion(version);
    @@ -592,11 +537,9 @@ public final class SAMLEngineUtils {
     		return authnRequest;
     	}
     
    -	public static CustomAttributeQuery generateSAMLAttrQueryRequest(final String identifier,
    -			final SAMLVersion version, final DateTime issueInstant) {
    +	public static CustomAttributeQuery generateSAMLAttrQueryRequest(final String identifier, final SAMLVersion version, final DateTime issueInstant) {
     		LOG.debug("Generate attribute query request.");
    -		final CustomAttributeQuery attrQueryRequest = (CustomAttributeQuery) SAMLEngineUtils
    -				.createSamlObject(CustomAttributeQuery.DEFAULT_ELEMENT_NAME);
    +		final CustomAttributeQuery attrQueryRequest = (CustomAttributeQuery) SAMLEngineUtils.createSamlObject(CustomAttributeQuery.DEFAULT_ELEMENT_NAME);
     
     		attrQueryRequest.setID(identifier);
     		attrQueryRequest.setVersion(version);
    @@ -604,12 +547,9 @@ public final class SAMLEngineUtils {
     		return attrQueryRequest;
     	}
     
    -	public static LogoutRequest generateSAMLLogoutRequest(final String identifier,
    -			final SAMLVersion version, final DateTime issueInstant) {
    +	public static LogoutRequest generateSAMLLogoutRequest(final String identifier, final SAMLVersion version, final DateTime issueInstant) {
     		LOG.debug("Generate logout request.");
    -		final LogoutRequest logoutRequest = (LogoutRequest)SAMLEngineUtils.
    -				createSamlObject(LogoutRequest.DEFAULT_ELEMENT_NAME);
    -
    +		final LogoutRequest logoutRequest = (LogoutRequest) SAMLEngineUtils.createSamlObject(LogoutRequest.DEFAULT_ELEMENT_NAME);
     
     		logoutRequest.setID(identifier);
     		logoutRequest.setVersion(version);
    @@ -617,12 +557,9 @@ public final class SAMLEngineUtils {
     		return logoutRequest;
     	}
     
    -	public static LogoutResponse generateSAMLLogoutResponse(final String identifier,
    -			final SAMLVersion version, final DateTime issueInstant, 
    -			final Status status, final String inResponseTo) {
    +	public static LogoutResponse generateSAMLLogoutResponse(final String identifier, final SAMLVersion version, final DateTime issueInstant, final Status status, final String inResponseTo) {
     		LOG.debug("Generate logout response.");
    -		final LogoutResponse logoutResponse = (LogoutResponse)SAMLEngineUtils.
    -				createSamlObject(LogoutResponse.DEFAULT_ELEMENT_NAME);
    +		final LogoutResponse logoutResponse = (LogoutResponse) SAMLEngineUtils.createSamlObject(LogoutResponse.DEFAULT_ELEMENT_NAME);
     
     		logoutResponse.setInResponseTo(inResponseTo);
     		logoutResponse.setStatus(status);
    @@ -635,18 +572,18 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate service provider application.
     	 * 
    -	 * @param spApplication the service provider application
    +	 * @param spApplication
    +	 *            the service provider application
     	 * 
     	 * @return the sP application
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public static SPApplication generateSPApplication(final String spApplication)
    -			throws STORKSAMLEngineException {
    +	public static SPApplication generateSPApplication(final String spApplication) throws STORKSAMLEngineException {
     		LOG.debug("Generate SPApplication.");
     
    -		final SPApplication applicationAttr = (SPApplication) SAMLEngineUtils
    -				.createSamlObject(SPApplication.DEF_ELEMENT_NAME);
    +		final SPApplication applicationAttr = (SPApplication) SAMLEngineUtils.createSamlObject(SPApplication.DEF_ELEMENT_NAME);
     		applicationAttr.setSPApplication(spApplication);
     		return applicationAttr;
     	}
    @@ -654,18 +591,18 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate service provider country.
     	 * 
    -	 * @param spCountry the service provider country
    +	 * @param spCountry
    +	 *            the service provider country
     	 * 
     	 * @return the service provider country
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public static SPCountry generateSPCountry(final String spCountry)
    -			throws STORKSAMLEngineException {
    +	public static SPCountry generateSPCountry(final String spCountry) throws STORKSAMLEngineException {
     		LOG.debug("Generate SPApplication.");
     
    -		final SPCountry countryAttribute = (SPCountry) SAMLEngineUtils
    -				.createSamlObject(SPCountry.DEF_ELEMENT_NAME);
    +		final SPCountry countryAttribute = (SPCountry) SAMLEngineUtils.createSamlObject(SPCountry.DEF_ELEMENT_NAME);
     		countryAttribute.setSPCountry(spCountry);
     		return countryAttribute;
     	}
    @@ -673,18 +610,18 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate service provider institution.
     	 * 
    -	 * @param spInstitution the service provider institution
    +	 * @param spInstitution
    +	 *            the service provider institution
     	 * 
     	 * @return the service provider institution
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public static SPInstitution generateSPInstitution(final String spInstitution)
    -			throws STORKSAMLEngineException {
    +	public static SPInstitution generateSPInstitution(final String spInstitution) throws STORKSAMLEngineException {
     		LOG.debug("Generate SPInstitution.");
     
    -		final SPInstitution institutionAttr = (SPInstitution) SAMLEngineUtils
    -				.createSamlObject(SPInstitution.DEF_ELEMENT_NAME);
    +		final SPInstitution institutionAttr = (SPInstitution) SAMLEngineUtils.createSamlObject(SPInstitution.DEF_ELEMENT_NAME);
     		institutionAttr.setSPInstitution(spInstitution);
     		return institutionAttr;
     	}
    @@ -692,18 +629,18 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate service provider sector.
     	 * 
    -	 * @param spSector the service provider sector
    +	 * @param spSector
    +	 *            the service provider sector
     	 * 
     	 * @return the service provider sector
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public static SPSector generateSPSector(final String spSector)
    -			throws STORKSAMLEngineException {
    +	public static SPSector generateSPSector(final String spSector) throws STORKSAMLEngineException {
     		LOG.debug("Generate SPSector.");
     
    -		final SPSector sectorAttribute = (SPSector) SAMLEngineUtils
    -				.createSamlObject(SPSector.DEF_ELEMENT_NAME);
    +		final SPSector sectorAttribute = (SPSector) SAMLEngineUtils.createSamlObject(SPSector.DEF_ELEMENT_NAME);
     		sectorAttribute.setSPSector(spSector);
     		return sectorAttribute;
     	}
    @@ -711,13 +648,13 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate status.
     	 * 
    -	 * @param statusCode the status code
    +	 * @param statusCode
    +	 *            the status code
     	 * 
     	 * @return the status
     	 */
     	public static Status generateStatus(final StatusCode statusCode) {
    -		final Status status = (Status) SAMLEngineUtils
    -				.createSamlObject(Status.DEFAULT_ELEMENT_NAME);
    +		final Status status = (Status) SAMLEngineUtils.createSamlObject(Status.DEFAULT_ELEMENT_NAME);
     		status.setStatusCode(statusCode);
     		return status;
     	}
    @@ -725,13 +662,13 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate status code.
     	 * 
    -	 * @param value the value
    +	 * @param value
    +	 *            the value
     	 * 
     	 * @return the status code
     	 */
     	public static StatusCode generateStatusCode(final String value) {
    -		final StatusCode statusCode = (StatusCode) SAMLEngineUtils
    -				.createSamlObject(StatusCode.DEFAULT_ELEMENT_NAME);
    +		final StatusCode statusCode = (StatusCode) SAMLEngineUtils.createSamlObject(StatusCode.DEFAULT_ELEMENT_NAME);
     		statusCode.setValue(value);
     		return statusCode;
     	}
    @@ -739,13 +676,13 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate status message.
     	 * 
    -	 * @param message the message
    +	 * @param message
    +	 *            the message
     	 * 
     	 * @return the status message
     	 */
     	public static StatusMessage generateStatusMessage(final String message) {
    -		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -				.createSamlObject(StatusMessage.DEFAULT_ELEMENT_NAME);
    +		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.createSamlObject(StatusMessage.DEFAULT_ELEMENT_NAME);
     		statusMessage.setMessage(message);
     		return statusMessage;
     	}
    @@ -756,24 +693,22 @@ public final class SAMLEngineUtils {
     	 * @return the subject
     	 */
     	public static Subject generateSubject() {
    -		return (Subject) SAMLEngineUtils
    -				.createSamlObject(Subject.DEFAULT_ELEMENT_NAME);
    +		return (Subject) SAMLEngineUtils.createSamlObject(Subject.DEFAULT_ELEMENT_NAME);
     	}
     
     	/**
     	 * Generate subject confirmation.
     	 * 
    -	 * @param method the method
    -	 * @param data the data
    +	 * @param method
    +	 *            the method
    +	 * @param data
    +	 *            the data
     	 * 
     	 * @return the subject confirmation
     	 */
    -	public static SubjectConfirmation generateSubjectConfirmation(
    -			final String method, final SubjectConfirmationData data) {	
    -		final SubjectConfirmation subjectConf = (SubjectConfirmation) Configuration
    -				.getBuilderFactory().getBuilder(
    -						SubjectConfirmation.DEFAULT_ELEMENT_NAME).buildObject(
    -								SubjectConfirmation.DEFAULT_ELEMENT_NAME);
    +	public static SubjectConfirmation generateSubjectConfirmation(final String method, final SubjectConfirmationData data) {
    +		final SubjectConfirmation subjectConf = (SubjectConfirmation) Configuration.getBuilderFactory().getBuilder(SubjectConfirmation.DEFAULT_ELEMENT_NAME)
    +				.buildObject(SubjectConfirmation.DEFAULT_ELEMENT_NAME);
     
     		subjectConf.setMethod(method);
     
    @@ -785,17 +720,17 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate subject confirmation data.
     	 * 
    -	 * @param notOnOrAfter the not on or after
    -	 * @param recipient the recipient
    -	 * @param inResponseTo the in response to
    +	 * @param notOnOrAfter
    +	 *            the not on or after
    +	 * @param recipient
    +	 *            the recipient
    +	 * @param inResponseTo
    +	 *            the in response to
     	 * 
     	 * @return the subject confirmation data
     	 */
    -	public static SubjectConfirmationData generateSubjectConfirmationData(
    -			final DateTime notOnOrAfter, final String recipient,
    -			final String inResponseTo) {
    -		final SubjectConfirmationData subjectConfData = (SubjectConfirmationData) SAMLEngineUtils
    -				.createSamlObject(SubjectConfirmationData.DEFAULT_ELEMENT_NAME);
    +	public static SubjectConfirmationData generateSubjectConfirmationData(final DateTime notOnOrAfter, final String recipient, final String inResponseTo) {
    +		final SubjectConfirmationData subjectConfData = (SubjectConfirmationData) SAMLEngineUtils.createSamlObject(SubjectConfirmationData.DEFAULT_ELEMENT_NAME);
     		subjectConfData.setNotOnOrAfter(notOnOrAfter);
     		subjectConfData.setRecipient(recipient);
     		subjectConfData.setInResponseTo(inResponseTo);
    @@ -805,13 +740,13 @@ public final class SAMLEngineUtils {
     	/**
     	 * Generate subject locality.
     	 * 
    -	 * @param address the address
    +	 * @param address
    +	 *            the address
     	 * 
     	 * @return the subject locality
     	 */
     	public static SubjectLocality generateSubjectLocality(final String address) {
    -		final SubjectLocality subjectLocality = (SubjectLocality) SAMLEngineUtils
    -				.createSamlObject(SubjectLocality.DEFAULT_ELEMENT_NAME);
    +		final SubjectLocality subjectLocality = (SubjectLocality) SAMLEngineUtils.createSamlObject(SubjectLocality.DEFAULT_ELEMENT_NAME);
     		subjectLocality.setAddress(address);
     		return subjectLocality;
     	}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
    index 6bdf7b320..6a7e1f7c0 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
    @@ -175,10 +175,8 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
     import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
     
     /**
    - * Class that wraps the operations over SAML tokens, both generation and
    - * validation of SAML STORK requests and SAML STORK responses. Complaint with
    - * "OASIS Secure Assertion Markup Language (SAML) 2.0, May 2005", but taking
    - * into account STORK specific requirements.
    + * Class that wraps the operations over SAML tokens, both generation and validation of SAML STORK requests and SAML STORK responses. Complaint with
    + * "OASIS Secure Assertion Markup Language (SAML) 2.0, May 2005", but taking into account STORK specific requirements.
      * 
      * @author fjquevedo
      * @author iinigo
    @@ -186,26 +184,26 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
     public final class STORKSAMLEngine extends SAMLEngine {
     
     	/** The Constant LOG. */
    -	private static final Logger LOG = LoggerFactory
    -	.getLogger(STORKSAMLEngine.class.getName());
    +	private static final Logger LOG = LoggerFactory.getLogger(STORKSAMLEngine.class.getName());
    +
    +	private static final String ATTRIBUTE_EMPTY_LITERAL = "Attribute name is null or empty.";
     
    -    private static final String ATTRIBUTE_EMPTY_LITERAL = "Attribute name is null or empty.";
     	/**
     	 * Gets the single instance of STORKSAMLEngine.
     	 * 
    -	 * @param nameInstance the name instance
    +	 * @param nameInstance
    +	 *            the name instance
     	 * 
     	 * @return single instance of STORKSAMLEngine
     	 */
    -	public static synchronized STORKSAMLEngine getInstance(
    -			final String nameInstance) {
    +	public static synchronized STORKSAMLEngine getInstance(final String nameInstance) {
     		STORKSAMLEngine engine = null;
     		LOG.info("Get instance: " + nameInstance);
     		try {
     			engine = new STORKSAMLEngine(nameInstance.trim());
     		} catch (Exception e) {
     			LOG.error("Error getting instance: " + nameInstance);
    -            e.printStackTrace();
    +			e.printStackTrace();
     		}
     		return engine;
     	}
    @@ -213,130 +211,79 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Instantiate a new STORKSAML engine.
     	 * 
    -	 * @param nameInstance the name instance
    +	 * @param nameInstance
    +	 *            the name instance
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private STORKSAMLEngine(final String nameInstance)
    -	throws STORKSAMLEngineException {
    +	private STORKSAMLEngine(final String nameInstance) throws STORKSAMLEngineException {
     		// Initialization OpenSAML.
     		super(nameInstance);
     		LOG.info("Register STORK objects provider.");
    -		Configuration.registerObjectProvider(QAAAttribute.DEF_ELEMENT_NAME,
    -				new QAAAttributeBuilder(), new QAAAttributeMarshaller(),
    -				new QAAAttributeUnmarshaller());
    -
    -		Configuration.registerObjectProvider(EIDSectorShare.DEF_ELEMENT_NAME,
    -				new EIDSectorShareBuilder(), new EIDSectorShareMarshaller(),
    -				new EIDSectorShareUnmarshaller());
    -
    -		Configuration.registerObjectProvider(
    -				EIDCrossSectorShare.DEF_ELEMENT_NAME,
    -				new EIDCrossSectorShareBuilder(),
    -				new EIDCrossSectorShareMarshaller(),
    -				new EIDCrossSectorShareUnmarshaller());
    -
    -		Configuration.registerObjectProvider(
    -				EIDCrossBorderShare.DEF_ELEMENT_NAME,
    -				new EIDCrossBorderShareBuilder(),
    -				new EIDCrossBorderShareMarshaller(),
    -				new EIDCrossBorderShareUnmarshaller());
    -
    -		Configuration.registerObjectProvider(SPSector.DEF_ELEMENT_NAME,
    -				new SPSectorBuilder(), new SPSectorMarshaller(),
    -				new SPSectorUnmarshaller());
    -
    -		Configuration.registerObjectProvider(SPInstitution.DEF_ELEMENT_NAME,
    -				new SPInstitutionBuilder(), new SPInstitutionMarshaller(),
    -				new SPInstitutionUnmarshaller());
    -
    -		Configuration.registerObjectProvider(SPApplication.DEF_ELEMENT_NAME,
    -				new SPApplicationBuilder(), new SPApplicationMarshaller(),
    -				new SPApplicationUnmarshaller());
    -
    -		Configuration.registerObjectProvider(SPCountry.DEF_ELEMENT_NAME,
    -				new SPCountryBuilder(), new SPCountryMarshaller(),
    -				new SPCountryUnmarshaller());
    -
    -		Configuration.registerObjectProvider(XSAny.TYPE_NAME,
    -				new XSAnyBuilder(), new XSAnyMarshaller(),
    -				new XSAnyUnmarshaller());
    -
    -		Configuration.registerObjectProvider(
    -				RequestedAttribute.DEF_ELEMENT_NAME,
    -				new RequestedAttributeBuilder(),
    -				new RequestedAttributeMarshaller(),
    -				new RequestedAttributeUnmarshaller());
    -
    -		Configuration.registerObjectProvider(
    -				RequestedAttributes.DEF_ELEMENT_NAME,
    -				new RequestedAttributesBuilder(),
    -				new RequestedAttributesMarshaller(),
    -				new RequestedAttributesUnmarshaller());
    -
    -		Configuration.registerObjectProvider(
    -				AuthenticationAttributes.DEF_ELEMENT_NAME,
    -				new AuthenticationAttributesBuilder(),
    -				new AuthenticationAttributesMarshaller(),
    +		Configuration.registerObjectProvider(QAAAttribute.DEF_ELEMENT_NAME, new QAAAttributeBuilder(), new QAAAttributeMarshaller(), new QAAAttributeUnmarshaller());
    +
    +		Configuration.registerObjectProvider(EIDSectorShare.DEF_ELEMENT_NAME, new EIDSectorShareBuilder(), new EIDSectorShareMarshaller(), new EIDSectorShareUnmarshaller());
    +
    +		Configuration.registerObjectProvider(EIDCrossSectorShare.DEF_ELEMENT_NAME, new EIDCrossSectorShareBuilder(), new EIDCrossSectorShareMarshaller(), new EIDCrossSectorShareUnmarshaller());
    +
    +		Configuration.registerObjectProvider(EIDCrossBorderShare.DEF_ELEMENT_NAME, new EIDCrossBorderShareBuilder(), new EIDCrossBorderShareMarshaller(), new EIDCrossBorderShareUnmarshaller());
    +
    +		Configuration.registerObjectProvider(SPSector.DEF_ELEMENT_NAME, new SPSectorBuilder(), new SPSectorMarshaller(), new SPSectorUnmarshaller());
    +
    +		Configuration.registerObjectProvider(SPInstitution.DEF_ELEMENT_NAME, new SPInstitutionBuilder(), new SPInstitutionMarshaller(), new SPInstitutionUnmarshaller());
    +
    +		Configuration.registerObjectProvider(SPApplication.DEF_ELEMENT_NAME, new SPApplicationBuilder(), new SPApplicationMarshaller(), new SPApplicationUnmarshaller());
    +
    +		Configuration.registerObjectProvider(SPCountry.DEF_ELEMENT_NAME, new SPCountryBuilder(), new SPCountryMarshaller(), new SPCountryUnmarshaller());
    +
    +		Configuration.registerObjectProvider(XSAny.TYPE_NAME, new XSAnyBuilder(), new XSAnyMarshaller(), new XSAnyUnmarshaller());
    +
    +		Configuration.registerObjectProvider(RequestedAttribute.DEF_ELEMENT_NAME, new RequestedAttributeBuilder(), new RequestedAttributeMarshaller(), new RequestedAttributeUnmarshaller());
    +
    +		Configuration.registerObjectProvider(RequestedAttributes.DEF_ELEMENT_NAME, new RequestedAttributesBuilder(), new RequestedAttributesMarshaller(), new RequestedAttributesUnmarshaller());
    +
    +		Configuration.registerObjectProvider(AuthenticationAttributes.DEF_ELEMENT_NAME, new AuthenticationAttributesBuilder(), new AuthenticationAttributesMarshaller(),
     				new AuthenticationAttributesUnmarshaller());
     
    -		Configuration.registerObjectProvider(
    -				VIDPAuthenticationAttributes.DEF_ELEMENT_NAME,
    -				new VIDPAuthenticationAttributesBuilder(),
    -				new VIDPAuthenticationAttributesMarshaller(),
    +		Configuration.registerObjectProvider(VIDPAuthenticationAttributes.DEF_ELEMENT_NAME, new VIDPAuthenticationAttributesBuilder(), new VIDPAuthenticationAttributesMarshaller(),
     				new VIDPAuthenticationAttributesUnmarshaller());
     
    -		Configuration.registerObjectProvider(
    -				CitizenCountryCode.DEF_ELEMENT_NAME,
    -				new CitizenCountryCodeBuilder(),
    -				new CitizenCountryCodeMarshaller(),
    -				new CitizenCountryCodeUnmarshaller());
    +		Configuration.registerObjectProvider(CitizenCountryCode.DEF_ELEMENT_NAME, new CitizenCountryCodeBuilder(), new CitizenCountryCodeMarshaller(), new CitizenCountryCodeUnmarshaller());
     
    -		Configuration.registerObjectProvider(
    -				SPID.DEF_ELEMENT_NAME,
    -				new SPIDBuilder(),
    -				new SPIDMarshaller(),
    -				new SPIDUnmarshaller());
    +		Configuration.registerObjectProvider(SPID.DEF_ELEMENT_NAME, new SPIDBuilder(), new SPIDMarshaller(), new SPIDUnmarshaller());
     
    -		Configuration.registerObjectProvider(
    -				SPInformation.DEF_ELEMENT_NAME,
    -				new SPInformationBuilder(),
    -				new SPInformationMarshaller(),
    -				new SPInformationUnmarshaller());
    +		Configuration.registerObjectProvider(SPInformation.DEF_ELEMENT_NAME, new SPInformationBuilder(), new SPInformationMarshaller(), new SPInformationUnmarshaller());
     
     		LOG.info("Register STORK object validators.");
    -		final ValidatorSuite validatorSuite = new ValidatorSuite(
    -				QAAAttribute.DEF_LOCAL_NAME);
    +		final ValidatorSuite validatorSuite = new ValidatorSuite(QAAAttribute.DEF_LOCAL_NAME);
     
    -		validatorSuite.registerValidator(QAAAttribute.DEF_ELEMENT_NAME,
    -				new QAAAttributeSchemaValidator());
    +		validatorSuite.registerValidator(QAAAttribute.DEF_ELEMENT_NAME, new QAAAttributeSchemaValidator());
     		final Extensions extensions = SAMLEngineUtils.generateExtension();
    -		validatorSuite.registerValidator(extensions.getElementQName(),
    -				new ExtensionsSchemaValidator());
    +		validatorSuite.registerValidator(extensions.getElementQName(), new ExtensionsSchemaValidator());
     
    -		Configuration.registerValidatorSuite(
    -				"stork:QualityAuthenticationAssuranceLevel", validatorSuite);
    +		Configuration.registerValidatorSuite("stork:QualityAuthenticationAssuranceLevel", validatorSuite);
     
     	}
     
     	/**
     	 * Generate authentication response base.
     	 * 
    -	 * @param status the status
    -	 * @param assertConsumerURL the assert consumer URL.
    -	 * @param inResponseTo the in response to
    +	 * @param status
    +	 *            the status
    +	 * @param assertConsumerURL
    +	 *            the assert consumer URL.
    +	 * @param inResponseTo
    +	 *            the in response to
     	 * 
     	 * @return the response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private Response genAuthnRespBase(final Status status,
    -			final String assertConsumerURL, final String inResponseTo)
    -	throws STORKSAMLEngineException {
    +	private Response genAuthnRespBase(final Status status, final String assertConsumerURL, final String inResponseTo) throws STORKSAMLEngineException {
     		LOG.debug("Generate Authentication Response base.");
    -		final Response response = SAMLEngineUtils.generateResponse(
    -				SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(),
    -				SAMLEngineUtils.getCurrentTime(), status);
    +		final Response response = SAMLEngineUtils.generateResponse(SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(), SAMLEngineUtils.getCurrentTime(), status);
     
     		// Set name Spaces
     		this.setNameSpaces(response);
    @@ -358,30 +305,29 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		response.setInResponseTo(inResponseTo.trim());
     
     		// Optional STORK
    -		response.setConsent(super.getSamlCoreProperties()
    -				.getConsentAuthnResponse());
    +		response.setConsent(super.getSamlCoreProperties().getConsentAuthnResponse());
     
     		return response;
     	}
    -	
    +
     	/**
     	 * Generate attribute query response base.
     	 * 
    -	 * @param status the status
    -	 * @param destinationURL the assert consumer URL.
    -	 * @param inResponseTo the in response to
    +	 * @param status
    +	 *            the status
    +	 * @param destinationURL
    +	 *            the assert consumer URL.
    +	 * @param inResponseTo
    +	 *            the in response to
     	 * 
     	 * @return the response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private Response genAttrQueryRespBase(final Status status,
    -			final String destinationURL, final String inResponseTo)
    -	throws STORKSAMLEngineException {
    +	private Response genAttrQueryRespBase(final Status status, final String destinationURL, final String inResponseTo) throws STORKSAMLEngineException {
     		LOG.debug("Generate Attribute query Response base.");
    -		final Response response = SAMLEngineUtils.generateResponse(
    -				SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(),
    -				SAMLEngineUtils.getCurrentTime(), status);
    +		final Response response = SAMLEngineUtils.generateResponse(SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(), SAMLEngineUtils.getCurrentTime(), status);
     
     		// Set name Spaces
     		this.setNameSpaces(response);
    @@ -403,8 +349,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		response.setInResponseTo(inResponseTo.trim());
     
     		// Optional STORK
    -		response.setConsent(super.getSamlCoreProperties()
    -				.getConsentAuthnResponse());
    +		response.setConsent(super.getSamlCoreProperties().getConsentAuthnResponse());
     
     		return response;
     	}
    @@ -412,20 +357,24 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Generate assertion.
     	 * 
    -	 * @param ipAddress the IP address.
    -	 * @param assertConsumerURL the assert consumer URL.
    -	 * @param inResponseTo the in response to
    -	 * @param issuer the issuer
    -	 * @param notOnOrAfter the not on or after
    +	 * @param ipAddress
    +	 *            the IP address.
    +	 * @param assertConsumerURL
    +	 *            the assert consumer URL.
    +	 * @param inResponseTo
    +	 *            the in response to
    +	 * @param issuer
    +	 *            the issuer
    +	 * @param notOnOrAfter
    +	 *            the not on or after
     	 * 
     	 * @return the assertion
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private Assertion generateAssertion(final String ipAddress,
    -			final String assertConsumerURL, final String inResponseTo,
    -			final String issuer, final DateTime notOnOrAfter)
    -	throws STORKSAMLEngineException {
    +	private Assertion generateAssertion(final String ipAddress, final String assertConsumerURL, final String inResponseTo, final String issuer, final DateTime notOnOrAfter)
    +			throws STORKSAMLEngineException {
     		LOG.info("Generate Assertion.");
     
     		// Mandatory STORK
    @@ -434,12 +383,9 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		issuerAssertion.setValue(super.getSamlCoreProperties().getResponder());
     
     		// Format Entity Optional STORK
    -		issuerAssertion.setFormat(super.getSamlCoreProperties()
    -				.getFormatEntity());
    +		issuerAssertion.setFormat(super.getSamlCoreProperties().getFormatEntity());
     
    -		final Assertion assertion = SAMLEngineUtils.generateAssertion(
    -				SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(),
    -				SAMLEngineUtils.getCurrentTime(), issuerAssertion);
    +		final Assertion assertion = SAMLEngineUtils.generateAssertion(SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(), SAMLEngineUtils.getCurrentTime(), issuerAssertion);
     
     		final Subject subject = SAMLEngineUtils.generateSubject();
     
    @@ -447,51 +393,42 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		// String format = NameID.UNSPECIFIED
     		// specification: 'SAML:2.0' exist
     		// opensaml: "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
    -		// opensaml  "urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified"
    +		// opensaml "urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified"
     		final String format = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
     
     		final String nameQualifier = "";
     
     		LOG.debug("Generate NameID");
    -		final NameID nameId = SAMLEngineUtils.generateNameID(super
    -				.getSamlCoreProperties().getResponder(), format, nameQualifier);
    +		final NameID nameId = SAMLEngineUtils.generateNameID(super.getSamlCoreProperties().getResponder(), format, nameQualifier);
     		nameId.setValue(format);
     		subject.setNameID(nameId);
     
     		// Mandatory if urn:oasis:names:tc:SAML:2.0:cm:bearer.
     		// Optional in other case.
     		LOG.debug("Generate SubjectConfirmationData.");
    -		final SubjectConfirmationData dataBearer = SAMLEngineUtils
    -		.generateSubjectConfirmationData(SAMLEngineUtils
    -				.getCurrentTime(), assertConsumerURL, inResponseTo);
    +		final SubjectConfirmationData dataBearer = SAMLEngineUtils.generateSubjectConfirmationData(SAMLEngineUtils.getCurrentTime(), assertConsumerURL, inResponseTo);
     
     		// Mandatory if urn:oasis:names:tc:SAML:2.0:cm:bearer.
     		// Optional in other case.
     		LOG.debug("Generate SubjectConfirmation");
    -		final SubjectConfirmation subjectConf = SAMLEngineUtils
    -		.generateSubjectConfirmation(SubjectConfirmation.METHOD_BEARER,
    -				dataBearer);
    +		final SubjectConfirmation subjectConf = SAMLEngineUtils.generateSubjectConfirmation(SubjectConfirmation.METHOD_BEARER, dataBearer);
     
     		final ArrayList listSubjectConf = new ArrayList();
     		listSubjectConf.add(subjectConf);
     
    -		for (final Iterator iter = listSubjectConf
    -				.iterator(); iter.hasNext();) {
    +		for (final Iterator iter = listSubjectConf.iterator(); iter.hasNext();) {
     			final SubjectConfirmation element = iter.next();
     
     			if (SubjectConfirmation.METHOD_BEARER.equals(element.getMethod())) {
     				// ipAddress Mandatory if method is Bearer.
     
     				if (StringUtils.isBlank(ipAddress)) {
    -					throw new STORKSAMLEngineException(
    -							"ipAddress is null or empty");
    +					throw new STORKSAMLEngineException("ipAddress is null or empty");
     				}
    -				element.getSubjectConfirmationData().setAddress(
    -						ipAddress.trim());
    +				element.getSubjectConfirmationData().setAddress(ipAddress.trim());
     			}
     
    -			element.getSubjectConfirmationData()
    -			.setRecipient(assertConsumerURL);
    +			element.getSubjectConfirmationData().setRecipient(assertConsumerURL);
     			element.getSubjectConfirmationData().setNotOnOrAfter(notOnOrAfter);
     		}
     
    @@ -503,248 +440,215 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		// Conditions that MUST be evaluated when assessing the validity of
     		// and/or when using the assertion.
    -		final Conditions conditions = this.generateConditions(SAMLEngineUtils
    -				.getCurrentTime(), notOnOrAfter, issuer);
    +		final Conditions conditions = this.generateConditions(SAMLEngineUtils.getCurrentTime(), notOnOrAfter, issuer);
     
     		assertion.setConditions(conditions);
     
     		LOG.debug("Generate stork Authentication Statement.");
    -		final AuthnStatement storkAuthnStat = this
    -		.generateStorkAuthStatement(ipAddress);
    +		final AuthnStatement storkAuthnStat = this.generateStorkAuthStatement(ipAddress);
     		assertion.getAuthnStatements().add(storkAuthnStat);
     
     		return assertion;
     	}
     
    -    private String getAttributeName(final PersonalAttribute attribute) throws STORKSAMLEngineException {
    -        if (StringUtils.isBlank(attribute.getName())) {
    -            LOG.error(ATTRIBUTE_EMPTY_LITERAL);
    -            throw new STORKSAMLEngineException(ATTRIBUTE_EMPTY_LITERAL);
    -        }
    -
    -        final String attributeName = super.getSamlCoreProperties()
    -                .getProperty(attribute.getName());
    -
    -        if (StringUtils.isBlank(attributeName)) {
    -            LOG.error("Attribute name: {} it is not known.", attribute
    -                    .getName());
    -            throw new STORKSAMLEngineException("Attribute name: "
    -                    + attribute.getName() + " it is not known.");
    -        }
    -        return attributeName;
    -    }
    +	private String getAttributeName(final PersonalAttribute attribute) throws STORKSAMLEngineException {
    +		if (StringUtils.isBlank(attribute.getName())) {
    +			LOG.error(ATTRIBUTE_EMPTY_LITERAL);
    +			throw new STORKSAMLEngineException(ATTRIBUTE_EMPTY_LITERAL);
    +		}
    +
    +		final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
    +
    +		if (StringUtils.isBlank(attributeName)) {
    +			LOG.error("Attribute name: {} it is not known.", attribute.getName());
    +			throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " it is not known.");
    +		}
    +		return attributeName;
    +	}
    +
     	/**
     	 * Generate attribute statement.
     	 * 
    -	 * @param personalAttrList the personal attribute list
    -	 * @param isHashing the is hashing
    +	 * @param personalAttrList
    +	 *            the personal attribute list
    +	 * @param isHashing
    +	 *            the is hashing
     	 * 
     	 * @return the attribute statement
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 * @throws IOException
     	 */
    -	private AttributeStatement generateAttributeStatement(
    -			final IPersonalAttributeList personalAttrList,
    -			final boolean isHashing) throws STORKSAMLEngineException {
    +	private AttributeStatement generateAttributeStatement(final IPersonalAttributeList personalAttrList, final boolean isHashing) throws STORKSAMLEngineException {
     		LOG.debug("Generate attribute statement");
     
    -		final AttributeStatement attrStatement = (AttributeStatement) SAMLEngineUtils
    -		.createSamlObject(AttributeStatement.DEFAULT_ELEMENT_NAME);
    +		final AttributeStatement attrStatement = (AttributeStatement) SAMLEngineUtils.createSamlObject(AttributeStatement.DEFAULT_ELEMENT_NAME);
     
     		for (PersonalAttribute attribute : personalAttrList) {
     
    -            String attributeName = getAttributeName(attribute);
    +			String attributeName = getAttributeName(attribute);
     
     			// Verification that only one value it's permitted, simple or
     			// complex, not both.
     
     			final boolean simpleNull = (attribute.getValue() == null);
    -			final boolean simpleEmpty = (simpleNull || (!simpleNull && attribute
    -					.getValue().isEmpty()));
    +			final boolean simpleEmpty = (simpleNull || (!simpleNull && attribute.getValue().isEmpty()));
     
     			final boolean complexNull = (attribute.getComplexValue() == null);
    -			final boolean complexEmpty = (complexNull || (!complexNull && attribute
    -					.getComplexValue().isEmpty()));
    +			final boolean complexEmpty = (complexNull || (!complexNull && attribute.getComplexValue().isEmpty()));
     
     			if ((!simpleEmpty && !complexEmpty)) {
    -				throw new STORKSAMLEngineException(
    -						"Attribute name: "
    -						+ attribute.getName()
    -						+ " must be contain one value, simple or complex value.");
    +				throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " must be contain one value, simple or complex value.");
     			} else {
     
     				if (!simpleEmpty) {
    -					attrStatement.getAttributes().add(
    -							this.generateAttrSimple(attributeName, attribute
    -									.getStatus(), attribute.getValue(),
    -									isHashing));
    +					attrStatement.getAttributes().add(this.generateAttrSimple(attributeName, attribute.getStatus(), attribute.getValue(), isHashing));
     				} else if (!complexEmpty) {
    -					attrStatement.getAttributes().add(
    -							SAMLEngineUtils.generateAttrComplex(attributeName,
    -									attribute.getStatus(), attribute
    -									.getComplexValue(), isHashing));
    +					attrStatement.getAttributes().add(SAMLEngineUtils.generateAttrComplex(attributeName, attribute.getStatus(), attribute.getComplexValue(), isHashing));
     				} else if (!simpleNull) {
    -					attrStatement.getAttributes().add(
    -							this.generateAttrSimple(attributeName, attribute
    -									.getStatus(), new ArrayList(),
    -									isHashing));
    +					attrStatement.getAttributes().add(this.generateAttrSimple(attributeName, attribute.getStatus(), new ArrayList(), isHashing));
     				} else {
     					// Add attribute complex.
    -					attrStatement.getAttributes().add(
    -							SAMLEngineUtils.generateAttrComplex(attributeName,
    -									attribute.getStatus(),
    -									new HashMap(), isHashing));
    +					attrStatement.getAttributes().add(SAMLEngineUtils.generateAttrComplex(attributeName, attribute.getStatus(), new HashMap(), isHashing));
     				}
     			}
     		}
     		return attrStatement;
     	}
    -    private XSAny createAttributeValueForSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
    -        DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
    -        domFactory.setNamespaceAware(true);
    -        Document document = null;
    -        DocumentBuilder builder;
    -
    -        // Parse the signedDoc value into an XML DOM Document
    -        try {
    -            builder = domFactory.newDocumentBuilder();
    -            InputStream is;
    -            is = new ByteArrayInputStream(value.trim().getBytes("UTF-8"));
    -            document = builder.parse(is);
    -            is.close();
    -        } catch (SAXException e1) {
    -            LOG.error("SAX Error while parsing signModule attribute", e1);
    -            throw new STORKSAMLEngineRuntimeException(e1);
    -        } catch (ParserConfigurationException e2) {
    -            LOG.error("Parser Configuration Error while parsing signModule attribute", e2);
    -            throw new STORKSAMLEngineRuntimeException(e2);
    -        } catch (UnsupportedEncodingException e3) {
    -            LOG.error("Unsupported encoding Error while parsing signModule attribute", e3);
    -            throw new STORKSAMLEngineRuntimeException(e3);
    -        } catch (IOException e4) {
    -            LOG.error("IO Error while parsing signModule attribute", e4);
    -            throw new STORKSAMLEngineRuntimeException(e4);
    -        }
    -
    -        // Create the attribute statement
    -        final XSAny xmlValue = (XSAny) SAMLEngineUtils
    -                .createSamlObject(
    -                        AttributeValue.DEFAULT_ELEMENT_NAME,
    -                        XSAny.TYPE_NAME);
    -
    -        //Set the signedDoc XML content to this element
    -        xmlValue.setDOM(document.getDocumentElement());
    -
    -        // Create the attribute statement
    -        final XSAny attrValue = (XSAny) SAMLEngineUtils
    -                .createSamlObject(
    -                        AttributeValue.DEFAULT_ELEMENT_NAME,
    -                        XSAny.TYPE_NAME);
    -
    -        //Add previous signedDocXML to the AttributeValue Element
    -
    -        // if it's necessary encode the information.
    -        if (!isHashing) {
    -            attrValue.getUnknownXMLObjects().add(xmlValue);
    -        }
    -        return attrValue;
    -    }
    -
    -    private XSAny createAttributeValueForNonSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
    -        // Create the attribute statement
    -        final XSAny attrValue = (XSAny) SAMLEngineUtils
    -                .createSamlObject(
    -                        AttributeValue.DEFAULT_ELEMENT_NAME,
    -                        XSAny.TYPE_NAME);
    -        // if it's necessary encode the information.
    -        if (isHashing) {
    -            attrValue.setTextContent(SAMLEngineUtils.encode(value, SAMLEngineUtils.SHA_512));
    -        } else {
    -            attrValue.setTextContent(value);
    -        }
    -        return attrValue;
    -    }
    +
    +	private XSAny createAttributeValueForSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
    +		DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
    +		domFactory.setNamespaceAware(true);
    +		Document document = null;
    +		DocumentBuilder builder;
    +
    +		// Parse the signedDoc value into an XML DOM Document
    +		try {
    +			builder = domFactory.newDocumentBuilder();
    +			InputStream is;
    +			is = new ByteArrayInputStream(value.trim().getBytes("UTF-8"));
    +			document = builder.parse(is);
    +			is.close();
    +		} catch (SAXException e1) {
    +			LOG.error("SAX Error while parsing signModule attribute", e1);
    +			throw new STORKSAMLEngineRuntimeException(e1);
    +		} catch (ParserConfigurationException e2) {
    +			LOG.error("Parser Configuration Error while parsing signModule attribute", e2);
    +			throw new STORKSAMLEngineRuntimeException(e2);
    +		} catch (UnsupportedEncodingException e3) {
    +			LOG.error("Unsupported encoding Error while parsing signModule attribute", e3);
    +			throw new STORKSAMLEngineRuntimeException(e3);
    +		} catch (IOException e4) {
    +			LOG.error("IO Error while parsing signModule attribute", e4);
    +			throw new STORKSAMLEngineRuntimeException(e4);
    +		}
    +
    +		// Create the attribute statement
    +		final XSAny xmlValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
    +
    +		// Set the signedDoc XML content to this element
    +		xmlValue.setDOM(document.getDocumentElement());
    +
    +		// Create the attribute statement
    +		final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
    +
    +		// Add previous signedDocXML to the AttributeValue Element
    +
    +		// if it's necessary encode the information.
    +		if (!isHashing) {
    +			attrValue.getUnknownXMLObjects().add(xmlValue);
    +		}
    +		return attrValue;
    +	}
    +
    +	private XSAny createAttributeValueForNonSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
    +		// Create the attribute statement
    +		final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
    +		// if it's necessary encode the information.
    +		if (isHashing) {
    +			attrValue.setTextContent(SAMLEngineUtils.encode(value, SAMLEngineUtils.SHA_512));
    +		} else {
    +			attrValue.setTextContent(value);
    +		}
    +		return attrValue;
    +	}
     
     	/**
     	 * Generate attribute from a list of values.
     	 * 
    -	 * @param name the name of the attribute.
    -	 * @param values the value of the attribute.
    -	 * @param isHashing the is hashing with "SHA-512" algorithm.
    -	 * @param status the status of the parameter: "Available", "NotAvailable" or
    -	 *            "Withheld".
    +	 * @param name
    +	 *            the name of the attribute.
    +	 * @param values
    +	 *            the value of the attribute.
    +	 * @param isHashing
    +	 *            the is hashing with "SHA-512" algorithm.
    +	 * @param status
    +	 *            the status of the parameter: "Available", "NotAvailable" or "Withheld".
     	 * 
     	 * @return the attribute
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -    private Attribute generateAttrSimple(final String name,
    -                                         final String status, final List values,
    -                                         final boolean isHashing) throws STORKSAMLEngineException {
    -        LOG.debug("Generate attribute simple: " + name);
    -        final Attribute attribute = (Attribute) SAMLEngineUtils
    -                .createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
    -
    -        attribute.setName(name);
    -        attribute.setNameFormat(Attribute.URI_REFERENCE);
    -
    -        attribute.getUnknownAttributes().put(
    -                new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus",
    -                        SAMLCore.STORK10_PREFIX.getValue()), status);
    -
    -        if (values != null) {
    -            LOG.debug("Add attribute values.");
    -            for (int i = 0; i < values.size(); i++) {
    -                final String value = values.get(i);
    -                if (StringUtils.isNotBlank(value)) {
    -                    XSAny attrValue = null;
    -                    if (!name.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
    -                        // Create the attribute statement
    -                        attrValue = createAttributeValueForNonSignedDoc(value, isHashing);
    -
    -                    } else {
    -                        attrValue = createAttributeValueForSignedDoc(value, isHashing);
    -                        attribute.getAttributeValues().add(attrValue);
    -                    }
    -                    attribute.getAttributeValues().add(attrValue);
    -                }
    -            }
    -        }
    -        return attribute;
    -    }
    +	private Attribute generateAttrSimple(final String name, final String status, final List values, final boolean isHashing) throws STORKSAMLEngineException {
    +		LOG.debug("Generate attribute simple: " + name);
    +		final Attribute attribute = (Attribute) SAMLEngineUtils.createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
    +
    +		attribute.setName(name);
    +		attribute.setNameFormat(Attribute.URI_REFERENCE);
    +
    +		attribute.getUnknownAttributes().put(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus", SAMLCore.STORK10_PREFIX.getValue()), status);
    +
    +		if (values != null) {
    +			LOG.debug("Add attribute values.");
    +			for (int i = 0; i < values.size(); i++) {
    +				final String value = values.get(i);
    +				if (StringUtils.isNotBlank(value)) {
    +					XSAny attrValue = null;
    +					if (!name.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
    +						// Create the attribute statement
    +						attrValue = createAttributeValueForNonSignedDoc(value, isHashing);
    +
    +					} else {
    +						attrValue = createAttributeValueForSignedDoc(value, isHashing);
    +						attribute.getAttributeValues().add(attrValue);
    +					}
    +					attribute.getAttributeValues().add(attrValue);
    +				}
    +			}
    +		}
    +		return attribute;
    +	}
     
     	/**
    -	 * Generate conditions that MUST be evaluated when assessing the validity of
    -	 * and/or when using the assertion.
    +	 * Generate conditions that MUST be evaluated when assessing the validity of and/or when using the assertion.
     	 * 
    -	 * @param notBefore the not before
    -	 * @param notOnOrAfter the not on or after
    -	 * @param audienceURI the audience URI.
    +	 * @param notBefore
    +	 *            the not before
    +	 * @param notOnOrAfter
    +	 *            the not on or after
    +	 * @param audienceURI
    +	 *            the audience URI.
     	 * 
     	 * @return the conditions
     	 */
    -	private Conditions generateConditions(final DateTime notBefore,
    -			final DateTime notOnOrAfter, final String audienceURI) {
    +	private Conditions generateConditions(final DateTime notBefore, final DateTime notOnOrAfter, final String audienceURI) {
     		LOG.debug("Generate conditions.");
    -		final Conditions conditions = (Conditions) SAMLEngineUtils
    -		.createSamlObject(Conditions.DEFAULT_ELEMENT_NAME);
    +		final Conditions conditions = (Conditions) SAMLEngineUtils.createSamlObject(Conditions.DEFAULT_ELEMENT_NAME);
     		conditions.setNotBefore(notBefore);
     		conditions.setNotOnOrAfter(notOnOrAfter);
     
    -		final AudienceRestriction restrictions = (AudienceRestriction) SAMLEngineUtils
    -		.createSamlObject(AudienceRestriction.DEFAULT_ELEMENT_NAME);
    +		final AudienceRestriction restrictions = (AudienceRestriction) SAMLEngineUtils.createSamlObject(AudienceRestriction.DEFAULT_ELEMENT_NAME);
     
    -		final Audience audience = (Audience) SAMLEngineUtils
    -		.createSamlObject(Audience.DEFAULT_ELEMENT_NAME);
    +		final Audience audience = (Audience) SAMLEngineUtils.createSamlObject(Audience.DEFAULT_ELEMENT_NAME);
     		audience.setAudienceURI(audienceURI);
     
     		restrictions.getAudiences().add(audience);
     		conditions.getAudienceRestrictions().add(restrictions);
     
     		if (super.getSamlCoreProperties().isOneTimeUse()) {
    -			final OneTimeUse oneTimeUse = (OneTimeUse) SAMLEngineUtils
    -			.createSamlObject(OneTimeUse.DEFAULT_ELEMENT_NAME);
    +			final OneTimeUse oneTimeUse = (OneTimeUse) SAMLEngineUtils.createSamlObject(OneTimeUse.DEFAULT_ELEMENT_NAME);
     			conditions.getConditions().add(oneTimeUse);
     		}
     		return conditions;
    @@ -753,14 +657,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Generate personal attribute list.
     	 * 
    -	 * @param assertion the assertion
    +	 * @param assertion
    +	 *            the assertion
     	 * 
     	 * @return the personal attribute list
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private IPersonalAttributeList generatePersonalAttributeList(
    -			final Assertion assertion) throws STORKSAMLEngineException {
    +	private IPersonalAttributeList generatePersonalAttributeList(final Assertion assertion) throws STORKSAMLEngineException {
     		LOG.debug("Generate personal attribute list from XMLObject.");
     		final List listExtensions = assertion.getOrderedChildren();
     
    @@ -778,8 +683,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		if (!find) {
     			LOG.error("Error: AttributeStatement it's not present.");
    -			throw new STORKSAMLEngineException(
    -			"AttributeStatement it's not present.");
    +			throw new STORKSAMLEngineException("AttributeStatement it's not present.");
     		}
     
     		final List reqAttrs = requestedAttr.getAttributes();
    @@ -794,88 +698,70 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			final PersonalAttribute personalAttribute = new PersonalAttribute();
     
     			attributeName = attribute.getName();
    -			personalAttribute.setName(attributeName.substring(attributeName
    -					.lastIndexOf('/') + 1));
    +			personalAttribute.setName(attributeName.substring(attributeName.lastIndexOf('/') + 1));
     
    -			personalAttribute.setStatus(attribute.getUnknownAttributes().get(
    -					new QName(SAMLCore.STORK10_NS.getValue(),
    -							"AttributeStatus", SAMLCore.STORK10_PREFIX
    -							.getValue())));
    +			personalAttribute.setStatus(attribute.getUnknownAttributes().get(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus", SAMLCore.STORK10_PREFIX.getValue())));
     
     			final ArrayList simpleValues = new ArrayList();
     			final HashMap multiValues = new HashMap();
     
     			final List values = attribute.getOrderedChildren();
    -			
    -						
    +
     			// Process the values.
     			for (int nextValue = 0; nextValue < values.size(); nextValue++) {
     
     				final XMLObject xmlObject = values.get(nextValue);
     
     				if (xmlObject instanceof XSStringImpl) {
    -					
    +
     					simpleValues.add(((XSStringImpl) xmlObject).getValue());
     
     				} else if (xmlObject instanceof XSAnyImpl) {
     
     					if (attributeName.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
     
    -						final XSAnyImpl xmlString = (XSAnyImpl) values
    -								.get(nextValue);
    +						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextValue);
     
    -						TransformerFactory transFactory = TransformerFactory
    -								.newInstance();
    +						TransformerFactory transFactory = TransformerFactory.newInstance();
     						Transformer transformer = null;
     						try {
     							transformer = transFactory.newTransformer();
    -							transformer.setOutputProperty(
    -									OutputKeys.OMIT_XML_DECLARATION, "yes");
    +							transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
     						} catch (TransformerConfigurationException e) {
    -                            LOG.error("Error transformer configuration exception", e);
    +							LOG.error("Error transformer configuration exception", e);
     						}
     						StringWriter buffer = new StringWriter();
     						try {
    -                            if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0 ){
    -                                transformer.transform(new DOMSource(xmlString
    -                                        .getUnknownXMLObjects().get(0).getDOM()),
    -                                        new StreamResult(buffer));
    -                            }
    +							if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0) {
    +								transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()), new StreamResult(buffer));
    +							}
     						} catch (TransformerException e) {
    -                            LOG.error("Error transformer exception", e);
    +							LOG.error("Error transformer exception", e);
     						}
     						String str = buffer.toString();
     
     						simpleValues.add(str);
     
    -					} else if (isComplex(xmlObject))
    -					{
    +					} else if (isComplex(xmlObject)) {
     						LOG.info(attributeName + " found");
     						// Process complex value.
     						final XSAnyImpl complexValue = (XSAnyImpl) xmlObject;
     
    -						for (int nextComplexValue = 0; nextComplexValue < complexValue
    -								.getUnknownXMLObjects().size(); nextComplexValue++) {
    +						for (int nextComplexValue = 0; nextComplexValue < complexValue.getUnknownXMLObjects().size(); nextComplexValue++) {
     
    -							final XSAnyImpl simple = (XSAnyImpl) complexValue
    -									.getUnknownXMLObjects().get(
    -											nextComplexValue);
    +							final XSAnyImpl simple = (XSAnyImpl) complexValue.getUnknownXMLObjects().get(nextComplexValue);
     
    -							multiValues.put(simple.getElementQName()
    -									.getLocalPart(), simple.getTextContent());
    +							multiValues.put(simple.getElementQName().getLocalPart(), simple.getTextContent());
     						}
     
    -					} 					
    -					else {
    +					} else {
     						// Process simple value.
    -						simpleValues.add(((XSAnyImpl) xmlObject)
    -								.getTextContent());
    +						simpleValues.add(((XSAnyImpl) xmlObject).getTextContent());
     					}
     
     				} else {
     					LOG.error("Error: attribute value it's unknown.");
    -					throw new STORKSAMLEngineException(
    -							"Attribute value it's unknown.");
    +					throw new STORKSAMLEngineException("Attribute value it's unknown.");
     				}
     			}
     
    @@ -890,24 +776,21 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Generate stork authentication request.
     	 * 
    -	 * @param request the request that contain all parameters for generate an
    -	 *            authentication request.
    +	 * @param request
    +	 *            the request that contain all parameters for generate an authentication request.
     	 * 
     	 * @return the STORK authentication request that has been processed.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAuthnRequest generateSTORKAuthnRequest(
    -			final STORKAuthnRequest request) throws STORKSAMLEngineException {
    +	public STORKAuthnRequest generateSTORKAuthnRequest(final STORKAuthnRequest request) throws STORKSAMLEngineException {
     		LOG.info("Generate SAMLAuthnRequest.");
     
     		// Validate Parameters mandatories
     		validateParamAuthnReq(request);
     
    -		final AuthnRequest authnRequestAux = SAMLEngineUtils
    -		.generateSAMLAuthnRequest(SAMLEngineUtils.generateNCName(),
    -				SAMLVersion.VERSION_20, SAMLEngineUtils
    -				.getCurrentTime());
    +		final AuthnRequest authnRequestAux = SAMLEngineUtils.generateSAMLAuthnRequest(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime());
     
     		// Set name spaces.
     		setNameSpaces(authnRequestAux);
    @@ -918,14 +801,12 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		// Add parameter Mandatory STORK
     		authnRequestAux.setIsPassive(Boolean.FALSE);
     
    -		authnRequestAux.setAssertionConsumerServiceURL(request
    -				.getAssertionConsumerServiceURL());
    +		authnRequestAux.setAssertionConsumerServiceURL(request.getAssertionConsumerServiceURL());
     
     		authnRequestAux.setProviderName(request.getProviderName());
     
     		// Add protocol binding
    -		authnRequestAux.setProtocolBinding(super.getSamlCoreProperties()
    -				.getProtocolBinding());
    +		authnRequestAux.setProtocolBinding(super.getSamlCoreProperties().getProtocolBinding());
     
     		// Add parameter optional STORK
     		// Destination is mandatory if the destination is a C-PEPS
    @@ -935,36 +816,32 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     
     		// Consent is optional. Set from SAMLEngine.xml - consent.
    -		authnRequestAux.setConsent(super.getSamlCoreProperties()
    -				.getConsentAuthnRequest());
    +		authnRequestAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
     
     		final Issuer issuer = SAMLEngineUtils.generateIssuer();
    -		
    -		if(request.getIssuer()!=null){
    +
    +		if (request.getIssuer() != null) {
     			issuer.setValue(request.getIssuer());
    -        } else {
    +		} else {
     			issuer.setValue(super.getSamlCoreProperties().getRequester());
    -        }
    +		}
     
     		// Optional STORK
    -		final String formatEntity = super.getSamlCoreProperties()
    -		.getFormatEntity();
    +		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
     		if (StringUtils.isNotBlank(formatEntity)) {
     			issuer.setFormat(formatEntity);
     		}
     
     		authnRequestAux.setIssuer(issuer);
    -		
    +
     		// Generate stork extensions.
    -		final Extensions storkExtensions = this
    -		.generateSTORKExtensions(request);
    +		final Extensions storkExtensions = this.generateSTORKExtensions(request);
     		// add the extensions to the SAMLAuthnRequest
     		authnRequestAux.setExtensions(storkExtensions);
     
     		// the result contains an authentication request token (byte[]),
     		// identifier of the token, and all parameters from the request.
    -		final STORKAuthnRequest authRequest = processExtensions(authnRequestAux
    -				.getExtensions());
    +		final STORKAuthnRequest authRequest = processExtensions(authnRequestAux.getExtensions());
     
     		try {
     			authRequest.setTokenSaml(super.signAndMarshall(authnRequestAux));
    @@ -975,8 +852,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		authRequest.setSamlId(authnRequestAux.getID());
     		authRequest.setDestination(authnRequestAux.getDestination());
    -		authRequest.setAssertionConsumerServiceURL(authnRequestAux
    -				.getAssertionConsumerServiceURL());
    +		authRequest.setAssertionConsumerServiceURL(authnRequestAux.getAssertionConsumerServiceURL());
     
     		authRequest.setProviderName(authnRequestAux.getProviderName());
     		authRequest.setIssuer(authnRequestAux.getIssuer().getValue());
    @@ -987,19 +863,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Generate stork authentication response.
     	 * 
    -	 * @param request the request
    -	 * @param responseAuthReq the response authentication request
    -	 * @param ipAddress the IP address
    -	 * @param isHashing the is hashing
    +	 * @param request
    +	 *            the request
    +	 * @param responseAuthReq
    +	 *            the response authentication request
    +	 * @param ipAddress
    +	 *            the IP address
    +	 * @param isHashing
    +	 *            the is hashing
     	 * 
     	 * @return the sTORK authentication response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAuthnResponse generateSTORKAuthnResponse(
    -			final STORKAuthnRequest request,
    -			final STORKAuthnResponse responseAuthReq, final String ipAddress,
    -			final boolean isHashing) throws STORKSAMLEngineException {
    +	public STORKAuthnResponse generateSTORKAuthnResponse(final STORKAuthnRequest request, final STORKAuthnResponse responseAuthReq, final String ipAddress, final boolean isHashing)
    +			throws STORKSAMLEngineException {
     		LOG.info("generateSTORKAuthnResponse");
     
     		// Validate parameters
    @@ -1007,36 +886,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode");
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(StatusCode.SUCCESS_URI);
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
     
     		LOG.debug("Generate Status");
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		LOG.debug("Generate StatusMessage");
    -		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -		.generateStatusMessage(StatusCode.SUCCESS_URI);
    +		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
     
     		status.setStatusMessage(statusMessage);
     
     		LOG.debug("Generate Response");
     
     		// RESPONSE
    -		final Response response = genAuthnRespBase(status, request
    -				.getAssertionConsumerServiceURL(), request.getSamlId());
    +		final Response response = genAuthnRespBase(status, request.getAssertionConsumerServiceURL(), request.getSamlId());
     
     		DateTime notOnOrAfter = new DateTime();
     
    -		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
    -				.getTimeNotOnOrAfter());
    +		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
     
    -		final Assertion assertion = this.generateAssertion(ipAddress, request
    -				.getAssertionConsumerServiceURL(), request.getSamlId(), request
    -				.getIssuer(), notOnOrAfter);
    +		final Assertion assertion = this.generateAssertion(ipAddress, request.getAssertionConsumerServiceURL(), request.getSamlId(), request.getIssuer(), notOnOrAfter);
     
    -		final AttributeStatement attrStatement = this
    -		.generateAttributeStatement(responseAuthReq
    -				.getPersonalAttributeList(), isHashing);
    +		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAuthReq.getPersonalAttributeList(), isHashing);
     
     		assertion.getAttributeStatements().add(attrStatement);
     
    @@ -1054,23 +925,26 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     		return authresponse;
     	}
    -	
    +
     	/**
     	 * Generate stork authentication response.
     	 * 
    -	 * @param request the request
    -	 * @param responseAuthReq the response authentication request
    -	 * @param ipAddress the IP address
    -	 * @param isHashing the is hashing
    +	 * @param request
    +	 *            the request
    +	 * @param responseAuthReq
    +	 *            the response authentication request
    +	 * @param ipAddress
    +	 *            the IP address
    +	 * @param isHashing
    +	 *            the is hashing
     	 * 
     	 * @return the sTORK authentication response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAuthnResponse generateSTORKAuthnResponseAfterQuery(
    -			final STORKAuthnRequest request,
    -			final STORKAuthnResponse responseAuthReq, final String ipAddress,
    -			final boolean isHashing, List res) throws STORKSAMLEngineException {
    +	public STORKAuthnResponse generateSTORKAuthnResponseAfterQuery(final STORKAuthnRequest request, final STORKAuthnResponse responseAuthReq, final String ipAddress, final boolean isHashing,
    +			List res) throws STORKSAMLEngineException {
     		LOG.info("generateSTORKAuthnResponse");
     
     		// Validate parameters
    @@ -1078,52 +952,40 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode");
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(StatusCode.SUCCESS_URI);
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
     
     		LOG.debug("Generate Status");
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		LOG.debug("Generate StatusMessage");
    -		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -		.generateStatusMessage(StatusCode.SUCCESS_URI);
    +		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
     
     		status.setStatusMessage(statusMessage);
     
     		LOG.debug("Generate Response");
     
     		// RESPONSE
    -		final Response response = genAuthnRespBase(status, request
    -				.getAssertionConsumerServiceURL(), request.getSamlId());
    +		final Response response = genAuthnRespBase(status, request.getAssertionConsumerServiceURL(), request.getSamlId());
     
     		DateTime notOnOrAfter = new DateTime();
     
    -		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
    -				.getTimeNotOnOrAfter());
    +		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
     
    -		final Assertion assertion = this.generateAssertion(ipAddress, request
    -				.getAssertionConsumerServiceURL(), request.getSamlId(), request
    -				.getIssuer(), notOnOrAfter);
    +		final Assertion assertion = this.generateAssertion(ipAddress, request.getAssertionConsumerServiceURL(), request.getSamlId(), request.getIssuer(), notOnOrAfter);
     
    -		final AttributeStatement attrStatement = this
    -		.generateAttributeStatement(responseAuthReq
    -				.getPersonalAttributeList(), isHashing);
    +		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAuthReq.getPersonalAttributeList(), isHashing);
     
     		assertion.getAttributeStatements().add(attrStatement);
     
     		// Add assertions
     		response.getAssertions().add(assertion);
     		// Check for response queries
    -		if (res != null && res.size() > 0)
    -		{
    -			//Iterate through them
    -			for (int i = 0; i < res.size(); i++)
    -			{
    -				//If response contains multiple assertions iterate through them as well
    -				if (res.get(i).getAssertions().size() > 1)
    -				{
    -					for (int j = 0; j < res.get(i).getAssertions().size(); j++)
    -					{
    +		if (res != null && res.size() > 0) {
    +			// Iterate through them
    +			for (int i = 0; i < res.size(); i++) {
    +				// If response contains multiple assertions iterate through them as well
    +				if (res.get(i).getAssertions().size() > 1) {
    +					for (int j = 0; j < res.get(i).getAssertions().size(); j++) {
     						Assertion tempAssertion = res.get(i).getAssertions().get(j);
     						tempAssertion.setParent(response);
     						response.getAssertions().add(tempAssertion);
    @@ -1151,26 +1013,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Generate stork authentication response fail.
     	 * 
    -	 * @param request the request
    -	 * @param response the response
    -	 * @param ipAddress the IP address
    -	 * @param isHashing the is hashing
    +	 * @param request
    +	 *            the request
    +	 * @param response
    +	 *            the response
    +	 * @param ipAddress
    +	 *            the IP address
    +	 * @param isHashing
    +	 *            the is hashing
     	 * 
     	 * @return the sTORK authentication response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAuthnResponse generateSTORKAuthnResponseFail(
    -			final STORKAuthnRequest request, final STORKAuthnResponse response,
    -			final String ipAddress, final boolean isHashing)
    -	throws STORKSAMLEngineException {
    +	public STORKAuthnResponse generateSTORKAuthnResponseFail(final STORKAuthnRequest request, final STORKAuthnResponse response, final String ipAddress, final boolean isHashing)
    +			throws STORKSAMLEngineException {
     		LOG.info("generateSTORKAuthnResponseFail");
     
     		validateParamResponseFail(request, response);
     
     		// Mandatory
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(response.getStatusCode());
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(response.getStatusCode());
     
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode.");
    @@ -1182,8 +1046,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		// - http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported
     
     		if (StringUtils.isNotBlank(response.getSubStatusCode())) {
    -			final StatusCode newStatusCode = SAMLEngineUtils
    -			.generateStatusCode(response.getSubStatusCode());
    +			final StatusCode newStatusCode = SAMLEngineUtils.generateStatusCode(response.getSubStatusCode());
     			statusCode.setStatusCode(newStatusCode);
     		}
     
    @@ -1191,25 +1054,20 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		if (StringUtils.isNotBlank(response.getMessage())) {
    -			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -			.generateStatusMessage(response.getMessage());
    +			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(response.getMessage());
     
     			status.setStatusMessage(statusMessage);
     		}
     
     		LOG.debug("Generate Response.");
     		// RESPONSE
    -		final Response responseFail = genAuthnRespBase(status, request
    -				.getAssertionConsumerServiceURL(), request.getSamlId());
    +		final Response responseFail = genAuthnRespBase(status, request.getAssertionConsumerServiceURL(), request.getSamlId());
     
     		DateTime notOnOrAfter = new DateTime();
     
    -		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
    -				.getTimeNotOnOrAfter());
    +		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
     
    -		final Assertion assertion = this.generateAssertion(ipAddress, request
    -				.getAssertionConsumerServiceURL(), request.getSamlId(), request
    -				.getIssuer(), notOnOrAfter);
    +		final Assertion assertion = this.generateAssertion(ipAddress, request.getAssertionConsumerServiceURL(), request.getSamlId(), request.getIssuer(), notOnOrAfter);
     
     		responseFail.getAssertions().add(assertion);
     
    @@ -1226,41 +1084,37 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     		return storkResponse;
     	}
    -	
    +
     	/**
     	 * Generate stork attribute query request.
     	 * 
    -	 * @param request the request that contain all parameters for generate an
    -	 *            attribute query request.
    +	 * @param request
    +	 *            the request that contain all parameters for generate an attribute query request.
     	 * 
     	 * @return the STORK attribute query request that has been processed.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAttrQueryRequest generateSTORKAttrQueryRequest(
    -			final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
    +	public STORKAttrQueryRequest generateSTORKAttrQueryRequest(final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
     		LOG.info("Generate STORKAttrQueryRequest.");
     
     		// Validate Parameters mandatories
     		validateParamAttrQueryReq(request);
     
    -		//final AttributeQuery attrQueryRequestAux = SAMLEngineUtils
    -		final CustomAttributeQuery attrQueryRequestAux = SAMLEngineUtils
    -		.generateSAMLAttrQueryRequest(SAMLEngineUtils.generateNCName(),
    -				SAMLVersion.VERSION_20, SAMLEngineUtils
    -				.getCurrentTime());
    +		// final AttributeQuery attrQueryRequestAux = SAMLEngineUtils
    +		final CustomAttributeQuery attrQueryRequestAux = SAMLEngineUtils.generateSAMLAttrQueryRequest(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime());
     
     		// Set name spaces.
     		setNameSpaces(attrQueryRequestAux);
     
    -		
     		// Add parameter optional STORK
     		// Destination is mandatory if the destination is a C-PEPS
     		// The application must to know if the destination is a C-PEPS.
     		if (StringUtils.isNotBlank(request.getDestination())) {
     			attrQueryRequestAux.setDestination(request.getDestination());
     		}
    -		
    +
     		// Add parameter optional STORK
     		// Consumer URL is needed if using HTTP-Post
     		if (StringUtils.isNotBlank(request.getAssertionConsumerServiceURL())) {
    @@ -1268,44 +1122,40 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     
     		// Consent is optional. Set from SAMLEngine.xml - consent.
    -		attrQueryRequestAux.setConsent(super.getSamlCoreProperties()
    -				.getConsentAuthnRequest());
    +		attrQueryRequestAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
     
     		final Issuer issuer = SAMLEngineUtils.generateIssuer();
    -		
    -		//Set the subject - needed for attribute query validation
    +
    +		// Set the subject - needed for attribute query validation
     		Subject subject = SAMLEngineUtils.generateSubject();
     		SubjectConfirmationBuilder builder = new SubjectConfirmationBuilder();
    -		SubjectConfirmation subjectConfirmation = builder.buildObject();		
    +		SubjectConfirmation subjectConfirmation = builder.buildObject();
     		subjectConfirmation.setMethod("urn:oasis:names:tc:SAML:2.0:cm:bearer");
     		subject.getSubjectConfirmations().add(subjectConfirmation);
     		attrQueryRequestAux.setSubject(subject);
    -		
    -		if(request.getIssuer()!=null){
    +
    +		if (request.getIssuer() != null) {
     			issuer.setValue(request.getIssuer());
    -        } else {
    +		} else {
     			issuer.setValue(super.getSamlCoreProperties().getRequester());
    -        }
    +		}
     
     		// Optional STORK
    -		final String formatEntity = super.getSamlCoreProperties()
    -		.getFormatEntity();
    +		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
     		if (StringUtils.isNotBlank(formatEntity)) {
     			issuer.setFormat(formatEntity);
     		}
     
     		attrQueryRequestAux.setIssuer(issuer);
    -		
    +
     		// Generate stork extensions.
    -		final Extensions storkExtensions = this
    -		.generateSTORKAttrExtensions(request);
    +		final Extensions storkExtensions = this.generateSTORKAttrExtensions(request);
     		// add the extensions to the SAMLAuthnRequest
     		attrQueryRequestAux.setExtensions(storkExtensions);
     
     		// the result contains an authentication request token (byte[]),
     		// identifier of the token, and all parameters from the request.
    -		final STORKAttrQueryRequest attrQueryRequest = processAttrExtensions(attrQueryRequestAux
    -				.getExtensions());
    +		final STORKAttrQueryRequest attrQueryRequest = processAttrExtensions(attrQueryRequestAux.getExtensions());
     
     		try {
     			attrQueryRequest.setTokenSaml(super.signAndMarshall(attrQueryRequestAux));
    @@ -1321,22 +1171,25 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		return attrQueryRequest;
     	}
    -	
    +
     	/**
     	 * Generate stork attribute query response.
     	 * 
    -	 * @param request the request
    -	 * @param responseAttrQueryRes the response authentication request
    -	 * @param ipAddress the IP address
    -	 * @param isHashing the hashing of values
    +	 * @param request
    +	 *            the request
    +	 * @param responseAttrQueryRes
    +	 *            the response authentication request
    +	 * @param ipAddress
    +	 *            the IP address
    +	 * @param isHashing
    +	 *            the hashing of values
     	 * 
     	 * @return the sTORK authentication response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAttrQueryResponse generateSTORKAttrQueryResponse(
    -			final STORKAttrQueryRequest request, 
    -			final STORKAttrQueryResponse responseAttrQueryRes, final String ipAddress,
    +	public STORKAttrQueryResponse generateSTORKAttrQueryResponse(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryRes, final String ipAddress,
     			final String destinationUrl, final boolean isHashing) throws STORKSAMLEngineException {
     		LOG.info("generateSTORKAttrQueryResponse");
     
    @@ -1345,35 +1198,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode");
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(StatusCode.SUCCESS_URI);
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
     
     		LOG.debug("Generate Status");
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		LOG.debug("Generate StatusMessage");
    -		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -		.generateStatusMessage(StatusCode.SUCCESS_URI);
    +		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
     
     		status.setStatusMessage(statusMessage);
     
     		LOG.debug("Generate Response");
     
     		// RESPONSE
    -		final Response response = genAuthnRespBase(status, destinationUrl,
    -				request.getSamlId());
    +		final Response response = genAuthnRespBase(status, destinationUrl, request.getSamlId());
     
     		DateTime notOnOrAfter = new DateTime();
     
    -		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
    -				.getTimeNotOnOrAfter());
    +		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
     
    -		final Assertion assertion = this.generateAssertion(ipAddress, ""
    -				,request.getSamlId(), request.getIssuer(), notOnOrAfter);
    +		final Assertion assertion = this.generateAssertion(ipAddress, "", request.getSamlId(), request.getIssuer(), notOnOrAfter);
     
    -		final AttributeStatement attrStatement = this
    -		.generateAttributeStatement(responseAttrQueryRes
    -				.getPersonalAttributeList(), isHashing);
    +		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAttrQueryRes.getPersonalAttributeList(), isHashing);
     
     		assertion.getAttributeStatements().add(attrStatement);
     
    @@ -1391,24 +1237,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     		return attrQueryResponse;
     	}
    -	
    +
     	/**
    -	 * Generate stork attribute query response from multiple assertions 
    -	 * 
    -	 * @param request the request
    -	 * @param responseAttrQueryRes the response to the query request
    -	 * @param responses the responses to include in the response (aggregation)
    -	 * @param ipAddress the IP address
    -	 * @param isHashing the hashing of values
    +	 * Generate stork attribute query response from multiple assertions
    +	 * 
    +	 * @param request
    +	 *            the request
    +	 * @param responseAttrQueryRes
    +	 *            the response to the query request
    +	 * @param responses
    +	 *            the responses to include in the response (aggregation)
    +	 * @param ipAddress
    +	 *            the IP address
    +	 * @param isHashing
    +	 *            the hashing of values
     	 * 
     	 * @return the sTORK attribute query response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAttrQueryResponse generateSTORKAttrQueryResponseWithAssertions(
    -			final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryRes,
    -			final List responses, final String ipAddress,
    -			final String destinationUrl, final boolean isHashing) throws STORKSAMLEngineException {
    +	public STORKAttrQueryResponse generateSTORKAttrQueryResponseWithAssertions(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryRes,
    +			final List responses, final String ipAddress, final String destinationUrl, final boolean isHashing) throws STORKSAMLEngineException {
     		LOG.info("generateSTORKAttrQueryResponse");
     
     		// Validate parameters
    @@ -1416,44 +1266,35 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode");
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(StatusCode.SUCCESS_URI);
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
     
     		LOG.debug("Generate Status");
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		LOG.debug("Generate StatusMessage");
    -		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -		.generateStatusMessage(StatusCode.SUCCESS_URI);
    +		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
     
     		status.setStatusMessage(statusMessage);
     
     		LOG.debug("Generate Response");
     
     		// RESPONSE
    -		final Response response = genAuthnRespBase(status, destinationUrl,
    -				request.getSamlId());
    +		final Response response = genAuthnRespBase(status, destinationUrl, request.getSamlId());
     
     		DateTime notOnOrAfter = new DateTime();
     
    -		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
    -				.getTimeNotOnOrAfter());
    +		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
     
    -		final Assertion assertion = this.generateAssertion(ipAddress, ""
    -				,request.getSamlId(), request.getIssuer(), notOnOrAfter);
    +		final Assertion assertion = this.generateAssertion(ipAddress, "", request.getSamlId(), request.getIssuer(), notOnOrAfter);
     
    -		final AttributeStatement attrStatement = this
    -		.generateAttributeStatement(responseAttrQueryRes
    -				.getPersonalAttributeList(), isHashing);
    +		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAttrQueryRes.getPersonalAttributeList(), isHashing);
     
     		assertion.getAttributeStatements().add(attrStatement);
     
     		// Add the assertions from the former Query responses
     		response.getAssertions().add(assertion);
    -		if (responses != null && responses.size() > 0)
    -		{
    -			for (int i = 0; i < responses.size(); i++)
    -			{
    +		if (responses != null && responses.size() > 0) {
    +			for (int i = 0; i < responses.size(); i++) {
     				Assertion tempAssertion = responses.get(i).getAssertion();
     				tempAssertion.setParent(response);
     				response.getAssertions().add(tempAssertion);
    @@ -1471,30 +1312,32 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     		return attrQueryResponse;
     	}
    -	
    +
     	/**
     	 * Generate stork attribute query response fail.
     	 * 
    -	 * @param request the request
    -	 * @param response the response
    -	 * @param ipAddress the IP address
    -	 * @param isHashing the is hashing
    +	 * @param request
    +	 *            the request
    +	 * @param response
    +	 *            the response
    +	 * @param ipAddress
    +	 *            the IP address
    +	 * @param isHashing
    +	 *            the is hashing
     	 * 
     	 * @return the STORK attribute query response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAttrQueryResponse generateSTORKAttrQueryResponseFail(
    -			final STORKAttrQueryRequest request, final STORKAttrQueryResponse response,
    -			final String ipAddress, final String destinationUrl, final boolean isHashing)
    -	throws STORKSAMLEngineException {
    +	public STORKAttrQueryResponse generateSTORKAttrQueryResponseFail(final STORKAttrQueryRequest request, final STORKAttrQueryResponse response, final String ipAddress, final String destinationUrl,
    +			final boolean isHashing) throws STORKSAMLEngineException {
     		LOG.info("generateSTORKAttrQueryResponseFail");
     
     		validateParamAttrQueryResponseFail(request, response);
     
     		// Mandatory
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(response.getStatusCode());
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(response.getStatusCode());
     
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode.");
    @@ -1506,8 +1349,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		// - http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported
     
     		if (StringUtils.isNotBlank(response.getSubStatusCode())) {
    -			final StatusCode newStatusCode = SAMLEngineUtils
    -			.generateStatusCode(response.getSubStatusCode());
    +			final StatusCode newStatusCode = SAMLEngineUtils.generateStatusCode(response.getSubStatusCode());
     			statusCode.setStatusCode(newStatusCode);
     		}
     
    @@ -1515,25 +1357,20 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		if (StringUtils.isNotBlank(response.getMessage())) {
    -			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -			.generateStatusMessage(response.getMessage());
    +			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(response.getMessage());
     
     			status.setStatusMessage(statusMessage);
     		}
     
     		LOG.debug("Generate Response.");
     		// RESPONSE
    -		final Response responseFail = genAuthnRespBase(status, destinationUrl,
    -				request.getSamlId());
    +		final Response responseFail = genAuthnRespBase(status, destinationUrl, request.getSamlId());
     
     		DateTime notOnOrAfter = new DateTime();
     
    -		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
    -				.getTimeNotOnOrAfter());
    +		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
     
    -		final Assertion assertion = this.generateAssertion(ipAddress, "", 
    -				request.getSamlId(), request
    -				.getIssuer(), notOnOrAfter);
    +		final Assertion assertion = this.generateAssertion(ipAddress, "", request.getSamlId(), request.getIssuer(), notOnOrAfter);
     
     		responseFail.getAssertions().add(assertion);
     
    @@ -1550,67 +1387,59 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     		return storkResponse;
     	}
    -	
    +
     	/**
     	 * Generate stork logout request.
     	 * 
    -	 * @param request the request that contain all parameters for generate an
    -	 *            logout request.
    +	 * @param request
    +	 *            the request that contain all parameters for generate an logout request.
     	 * 
     	 * @return the STORK logout request that has been processed.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKLogoutRequest generateSTORKLogoutRequest(
    -			final STORKLogoutRequest request) throws STORKSAMLEngineException {
    +	public STORKLogoutRequest generateSTORKLogoutRequest(final STORKLogoutRequest request) throws STORKSAMLEngineException {
     		LOG.info("Generate STORKLogoutRequest.");
     
     		// Validate Parameters mandatories
     		validateParamLogoutReq(request);
     
    -		final LogoutRequest logoutRequestAux = SAMLEngineUtils
    -			.generateSAMLLogoutRequest(SAMLEngineUtils.generateNCName(),
    -					SAMLVersion.VERSION_20, SAMLEngineUtils
    -					.getCurrentTime());
    +		final LogoutRequest logoutRequestAux = SAMLEngineUtils.generateSAMLLogoutRequest(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime());
     
     		// Set name spaces.
     		setNameSpaces(logoutRequestAux);
     
    -		
     		// Add parameter optional STORK
     		// Destination is mandatory if the destination is a C-PEPS
     		// The application must to know if the destination is a C-PEPS.
     		if (StringUtils.isNotBlank(request.getDestination())) {
     			logoutRequestAux.setDestination(request.getDestination());
     		}
    -				
    +
     		// Consent is optional. Set from SAMLEngine.xml - consent.
    -		logoutRequestAux.setConsent(super.getSamlCoreProperties()
    -				.getConsentAuthnRequest());
    +		logoutRequestAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
     
     		final Issuer issuer = SAMLEngineUtils.generateIssuer();
    -		
    -		
    -		if(request.getIssuer()!=null){
    +
    +		if (request.getIssuer() != null) {
     			issuer.setValue(request.getIssuer());
    -        } else {
    +		} else {
     			issuer.setValue(super.getSamlCoreProperties().getRequester());
    -        }
    +		}
     
     		// Optional STORK
    -		final String formatEntity = super.getSamlCoreProperties()
    -		.getFormatEntity();
    +		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
     		if (StringUtils.isNotBlank(formatEntity)) {
     			issuer.setFormat(formatEntity);
     		}
     
     		logoutRequestAux.setIssuer(issuer);
    -		
    +
     		// Set the name ID
     		final NameID newNameID = SAMLEngineUtils.generateNameID();
    -		newNameID.setValue(request.getSpProvidedId());		
    +		newNameID.setValue(request.getSpProvidedId());
     		logoutRequestAux.setNameID(newNameID);
    -		
     
     		// the result contains an authentication request token (byte[]),
     		// identifier of the token, and all parameters from the request.
    @@ -1630,79 +1459,70 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		return logoutRequest;
     	}
    -	
     
     	/**
     	 * Generate stork logout response.
    -	 * @param request the request thats being responded to
    -	 * @param response the tesponse that contain all parameters for generate an
    -	 *            logout request.
    +	 * 
    +	 * @param request
    +	 *            the request thats being responded to
    +	 * @param response
    +	 *            the tesponse that contain all parameters for generate an logout request.
     	 * 
     	 * @return the STORK logout response that has been processed.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKLogoutResponse generateSTORKLogoutResponse(
    -			final STORKLogoutRequest request, 
    -			final STORKLogoutResponse response) throws STORKSAMLEngineException {
    +	public STORKLogoutResponse generateSTORKLogoutResponse(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
     		LOG.info("Generate STORKLogoutResponse.");
     
     		// Validate Parameters mandatories
     		validateParamLogoutRes(request, response);
    -		
    +
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode");
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(StatusCode.SUCCESS_URI);
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
     
     		LOG.debug("Generate Status");
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		LOG.debug("Generate StatusMessage");
    -		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -		.generateStatusMessage(StatusCode.SUCCESS_URI);
    +		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
     
     		status.setStatusMessage(statusMessage);
     
    -		final LogoutResponse logoutResponseAux= SAMLEngineUtils
    -			.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(),
    -					SAMLVersion.VERSION_20, SAMLEngineUtils
    -					.getCurrentTime(), status, request.getSamlId());
    +		final LogoutResponse logoutResponseAux = SAMLEngineUtils.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime(), status,
    +				request.getSamlId());
     
     		// Set name spaces.
     		setNameSpaces(logoutResponseAux);
     
    -		
     		// Add parameter optional STORK
     		// Destination is mandatory if the destination is a C-PEPS
     		// The application must to know if the destination is a C-PEPS.
     		if (StringUtils.isNotBlank(response.getDestination())) {
     			logoutResponseAux.setDestination(response.getDestination());
     		}
    -				
    +
     		// Consent is optional. Set from SAMLEngine.xml - consent.
    -		logoutResponseAux.setConsent(super.getSamlCoreProperties()
    -				.getConsentAuthnRequest());
    +		logoutResponseAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
     
     		final Issuer issuer = SAMLEngineUtils.generateIssuer();
    -		
    -		
    -		if(response.getIssuer()!=null){
    +
    +		if (response.getIssuer() != null) {
     			issuer.setValue(response.getIssuer());
    -        } else {
    +		} else {
     			issuer.setValue(super.getSamlCoreProperties().getRequester());
    -        }
    +		}
     
     		// Optional STORK
    -		final String formatEntity = super.getSamlCoreProperties()
    -		.getFormatEntity();
    +		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
     		if (StringUtils.isNotBlank(formatEntity)) {
     			issuer.setFormat(formatEntity);
     		}
     
     		logoutResponseAux.setIssuer(issuer);
    -		
    -		
    +
     		// the result contains an authentication request token (byte[]),
     		// identifier of the token, and all parameters from the request.
     		final STORKLogoutResponse logoutResponse = new STORKLogoutResponse();
    @@ -1722,28 +1542,26 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		return logoutResponse;
     	}
    -	
    +
     	/**
     	 * Generate failed stork logout response.
     	 * 
    -	 * @param response the response that contain all parameters for generate an
    -	 *            logout request.
    +	 * @param response
    +	 *            the response that contain all parameters for generate an logout request.
     	 * 
     	 * @return the STORK logout response that has been processed.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKLogoutResponse generateSTORKLogoutResponseFail(
    -			final STORKLogoutRequest request, 
    -			final STORKLogoutResponse response ) throws STORKSAMLEngineException {
    +	public STORKLogoutResponse generateSTORKLogoutResponseFail(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
     		LOG.info("Generate STORKLogoutResponse.");
     
     		// Validate Parameters mandatories
     		validateParamLogoutResFail(request, response);
    -		
    +
     		// Mandatory
    -		final StatusCode statusCode = SAMLEngineUtils
    -		.generateStatusCode(response.getStatusCode());
    +		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(response.getStatusCode());
     
     		// Mandatory SAML
     		LOG.debug("Generate StatusCode.");
    @@ -1755,8 +1573,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		// - http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported
     
     		if (StringUtils.isNotBlank(response.getSubStatusCode())) {
    -			final StatusCode newStatusCode = SAMLEngineUtils
    -			.generateStatusCode(response.getSubStatusCode());
    +			final StatusCode newStatusCode = SAMLEngineUtils.generateStatusCode(response.getSubStatusCode());
     			statusCode.setStatusCode(newStatusCode);
     		}
     
    @@ -1764,51 +1581,43 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		final Status status = SAMLEngineUtils.generateStatus(statusCode);
     
     		if (StringUtils.isNotBlank(response.getStatusMessage())) {
    -			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
    -			.generateStatusMessage(response.getStatusMessage());
    +			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(response.getStatusMessage());
     
     			status.setStatusMessage(statusMessage);
     		}
     
    -		final LogoutResponse logoutResponseAux= SAMLEngineUtils
    -			.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(),
    -					SAMLVersion.VERSION_20, SAMLEngineUtils
    -					.getCurrentTime(), status, request.getSamlId());
    +		final LogoutResponse logoutResponseAux = SAMLEngineUtils.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime(), status,
    +				request.getSamlId());
     
     		// Set name spaces.
     		setNameSpaces(logoutResponseAux);
     
    -		
     		// Add parameter optional STORK
     		// Destination is mandatory if the destination is a C-PEPS
     		// The application must to know if the destination is a C-PEPS.
     		if (StringUtils.isNotBlank(response.getDestination())) {
     			logoutResponseAux.setDestination(response.getDestination());
     		}
    -				
    +
     		// Consent is optional. Set from SAMLEngine.xml - consent.
    -		logoutResponseAux.setConsent(super.getSamlCoreProperties()
    -				.getConsentAuthnRequest());
    +		logoutResponseAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
     
     		final Issuer issuer = SAMLEngineUtils.generateIssuer();
    -		
    -		
    -		if(response.getIssuer()!=null){
    +
    +		if (response.getIssuer() != null) {
     			issuer.setValue(response.getIssuer());
    -        } else {
    +		} else {
     			issuer.setValue(super.getSamlCoreProperties().getRequester());
    -        }
    +		}
     
     		// Optional STORK
    -		final String formatEntity = super.getSamlCoreProperties()
    -		.getFormatEntity();
    +		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
     		if (StringUtils.isNotBlank(formatEntity)) {
     			issuer.setFormat(formatEntity);
     		}
     
     		logoutResponseAux.setIssuer(issuer);
    -		
    -		
    +
     		// the result contains an authentication request token (byte[]),
     		// identifier of the token, and all parameters from the request.
     		final STORKLogoutResponse logoutResponse = new STORKLogoutResponse();
    @@ -1832,25 +1641,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Generate stork authentication statement for the authentication statement.
     	 * 
    -	 * @param ipAddress the IP address
    +	 * @param ipAddress
    +	 *            the IP address
     	 * 
     	 * @return the authentication statement
     	 */
     	private AuthnStatement generateStorkAuthStatement(final String ipAddress) {
     		LOG.debug("Generate stork authenticate statement.");
    -		final SubjectLocality subjectLocality = SAMLEngineUtils
    -		.generateSubjectLocality(ipAddress);
    +		final SubjectLocality subjectLocality = SAMLEngineUtils.generateSubjectLocality(ipAddress);
     
    -		final AuthnContext authnContext = (AuthnContext) SAMLEngineUtils
    -		.createSamlObject(AuthnContext.DEFAULT_ELEMENT_NAME);
    +		final AuthnContext authnContext = (AuthnContext) SAMLEngineUtils.createSamlObject(AuthnContext.DEFAULT_ELEMENT_NAME);
     
    -		final AuthnContextDecl authnContextDecl = (AuthnContextDecl) SAMLEngineUtils
    -		.createSamlObject(AuthnContextDecl.DEFAULT_ELEMENT_NAME);
    +		final AuthnContextDecl authnContextDecl = (AuthnContextDecl) SAMLEngineUtils.createSamlObject(AuthnContextDecl.DEFAULT_ELEMENT_NAME);
     
     		authnContext.setAuthnContextDecl(authnContextDecl);
     
    -		final AuthnStatement authnStatement = SAMLEngineUtils
    -		.generateAthnStatement(new DateTime(), authnContext);
    +		final AuthnStatement authnStatement = SAMLEngineUtils.generateAthnStatement(new DateTime(), authnContext);
     
     		// Optional STORK
     		authnStatement.setSessionIndex(null);
    @@ -1862,101 +1668,84 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Generate stork extensions.
     	 * 
    -	 * @param request the request
    +	 * @param request
    +	 *            the request
     	 * 
     	 * @return the extensions
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private Extensions generateSTORKExtensions(final STORKAuthnRequest request)
    -	throws STORKSAMLEngineException {
    +	private Extensions generateSTORKExtensions(final STORKAuthnRequest request) throws STORKSAMLEngineException {
     		LOG.debug("Generate STORKExtensions");
     
     		final Extensions extensions = SAMLEngineUtils.generateExtension();
     
     		LOG.debug("Generate QAAAttribute");
    -		final QAAAttribute qaaAttribute = SAMLEngineUtils
    -		.generateQAAAttribute(request.getQaa());
    +		final QAAAttribute qaaAttribute = SAMLEngineUtils.generateQAAAttribute(request.getQaa());
     		extensions.getUnknownXMLObjects().add(qaaAttribute);
     
    -
    -		if (StringUtils.isNotEmpty(request
    -				.getSpSector())) {
    +		if (StringUtils.isNotEmpty(request.getSpSector())) {
     			// Add information about service provider.
     			LOG.debug("Generate SPSector");
    -			final SPSector sector = SAMLEngineUtils.generateSPSector(request
    -					.getSpSector());
    +			final SPSector sector = SAMLEngineUtils.generateSPSector(request.getSpSector());
     			extensions.getUnknownXMLObjects().add(sector);
     		}
     
    -		//Delete from specification. Kept for compatibility with Provider Name value
    +		// Delete from specification. Kept for compatibility with Provider Name value
     		LOG.debug("Generate SPInstitution");
    -		final SPInstitution institution = SAMLEngineUtils
    -		.generateSPInstitution(request.getProviderName());
    +		final SPInstitution institution = SAMLEngineUtils.generateSPInstitution(request.getProviderName());
     		extensions.getUnknownXMLObjects().add(institution);
     
    -
     		if (StringUtils.isNotEmpty(request.getSpApplication())) {
     			LOG.debug("Generate SPApplication");
    -			final SPApplication application = SAMLEngineUtils
    -			.generateSPApplication(request.getSpApplication());
    +			final SPApplication application = SAMLEngineUtils.generateSPApplication(request.getSpApplication());
     			extensions.getUnknownXMLObjects().add(application);
     		}
     
     		if (StringUtils.isNotEmpty(request.getSpCountry())) {
     			LOG.debug("Generate SPCountry");
    -			final SPCountry country = SAMLEngineUtils.generateSPCountry(request
    -					.getSpCountry());
    +			final SPCountry country = SAMLEngineUtils.generateSPCountry(request.getSpCountry());
     			extensions.getUnknownXMLObjects().add(country);
     		}
     
    -		//eIDSectorShare: optional; default value: false.
    -		String valueSectorShare = super.getSamlCoreProperties()
    -		.iseIDSectorShare();
    +		// eIDSectorShare: optional; default value: false.
    +		String valueSectorShare = super.getSamlCoreProperties().iseIDSectorShare();
     
     		if (StringUtils.isNotEmpty(valueSectorShare)) {
     			// Add information about the use of the SAML message.
     			LOG.debug("Generate EIDSectorShare");
    -			final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils
    -			.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
    +			final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
     
     			eIdSectorShare.setEIDSectorShare(String.valueOf(Boolean.valueOf(valueSectorShare)));
     
     			extensions.getUnknownXMLObjects().add(eIdSectorShare);
    -		} 
    +		}
     
    -		String valueCrossSectorShare = super.getSamlCoreProperties()
    -		.iseIDCrossSectorShare();
    +		String valueCrossSectorShare = super.getSamlCoreProperties().iseIDCrossSectorShare();
     
     		if (StringUtils.isNotEmpty(valueCrossSectorShare)) {
     			LOG.debug("Generate EIDCrossSectorShare");
    -			final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils
    -			.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
    +			final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
     			eIdCrossSecShare.setEIDCrossSectorShare(String.valueOf(Boolean.valueOf(valueCrossSectorShare)));
     			extensions.getUnknownXMLObjects().add(eIdCrossSecShare);
     		}
     
    -
    -		String valueCrossBorderShare = super.getSamlCoreProperties()
    -		.iseIDCrossBorderShare();
    +		String valueCrossBorderShare = super.getSamlCoreProperties().iseIDCrossBorderShare();
     
     		if (StringUtils.isNotEmpty(valueCrossBorderShare)) {
     			LOG.debug("Generate EIDCrossBorderShare");
    -			final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils
    -			.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
    +			final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
     			eIdCrossBordShare.setEIDCrossBorderShare(String.valueOf(Boolean.valueOf(valueCrossBorderShare)));
     			extensions.getUnknownXMLObjects().add(eIdCrossBordShare);
     		}
     
    -
     		// Add information about requested attributes.
     		LOG.debug("Generate RequestedAttributes.");
    -		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils
    -		.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
    +		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
     
     		LOG.debug("SAML Engine configuration properties load.");
    -		final Iterator iterator = request
    -		.getPersonalAttributeList().iterator();
    +		final Iterator iterator = request.getPersonalAttributeList().iterator();
     
     		while (iterator.hasNext()) {
     
    @@ -1968,14 +1757,11 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			}
     
     			// Verified if exits the attribute name.
    -			final String attributeName = super.getSamlCoreProperties()
    -			.getProperty(attribute.getName());
    +			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
     
     			if (StringUtils.isBlank(attributeName)) {
    -				LOG.debug("Attribute name: {} was not found.", attribute
    -						.getName());
    -				throw new STORKSAMLEngineException("Attribute name: "
    -						+ attribute.getName() + " was not found.");
    +				LOG.debug("Attribute name: {} was not found.", attribute.getName());
    +				throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " was not found.");
     			}
     
     			// Friendly name it's an optional attribute.
    @@ -1985,18 +1771,13 @@ public final class STORKSAMLEngine extends SAMLEngine {
     				friendlyName = attribute.getName();
     			}
     
    -
     			String isRequired = null;
     			if (super.getSamlCoreProperties().isRequired()) {
     				isRequired = String.valueOf(attribute.isRequired());
     			}
     
    -
     			LOG.debug("Generate requested attribute: " + attributeName);
    -			final RequestedAttribute requestedAttr = SAMLEngineUtils
    -			.generateReqAuthnAttributeSimple(attributeName,
    -					friendlyName, isRequired, attribute
    -					.getValue());
    +			final RequestedAttribute requestedAttr = SAMLEngineUtils.generateReqAuthnAttributeSimple(attributeName, friendlyName, isRequired, attribute.getValue());
     
     			// Add requested attribute.
     			reqAttributes.getAttributes().add(requestedAttr);
    @@ -2006,123 +1787,103 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		extensions.getUnknownXMLObjects().add(reqAttributes);
     
     		CitizenCountryCode citizenCountryCode = null;
    -		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())){
    +		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())) {
     			LOG.debug("Generate CitizenCountryCode");
    -			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils
    -			.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
    +			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
     
    -			citizenCountryCode.setCitizenCountryCode(request
    -					.getCitizenCountryCode().toUpperCase());
    -		}		
    +			citizenCountryCode.setCitizenCountryCode(request.getCitizenCountryCode().toUpperCase());
    +		}
     
     		SPID spid = null;
    -		if(request.getSPID()!=null && StringUtils.isNotBlank(request.getSPID())) {
    +		if (request.getSPID() != null && StringUtils.isNotBlank(request.getSPID())) {
     			LOG.debug("Generate SPID");
    -			spid = (SPID) SAMLEngineUtils
    -			.createSamlObject(SPID.DEF_ELEMENT_NAME);
    +			spid = (SPID) SAMLEngineUtils.createSamlObject(SPID.DEF_ELEMENT_NAME);
     
     			spid.setSPID(request.getSPID().toUpperCase());
    -		}	   
    +		}
     
    -		AuthenticationAttributes authenticationAttr = (AuthenticationAttributes) SAMLEngineUtils
    -		.createSamlObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
    +		AuthenticationAttributes authenticationAttr = (AuthenticationAttributes) SAMLEngineUtils.createSamlObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
     
    -		final VIDPAuthenticationAttributes vIDPauthenticationAttr = (VIDPAuthenticationAttributes) SAMLEngineUtils
    -		.createSamlObject(VIDPAuthenticationAttributes.DEF_ELEMENT_NAME);
    +		final VIDPAuthenticationAttributes vIDPauthenticationAttr = (VIDPAuthenticationAttributes) SAMLEngineUtils.createSamlObject(VIDPAuthenticationAttributes.DEF_ELEMENT_NAME);
     
    -		final SPInformation spInformation = (SPInformation) SAMLEngineUtils
    -		.createSamlObject(SPInformation.DEF_ELEMENT_NAME);
    +		final SPInformation spInformation = (SPInformation) SAMLEngineUtils.createSamlObject(SPInformation.DEF_ELEMENT_NAME);
     
    -		if(citizenCountryCode!=null){
    +		if (citizenCountryCode != null) {
     			vIDPauthenticationAttr.setCitizenCountryCode(citizenCountryCode);
     		}
     
    -		if(spid!=null){
    +		if (spid != null) {
     			spInformation.setSPID(spid);
     		}
     
     		vIDPauthenticationAttr.setSPInformation(spInformation);
     
    -		authenticationAttr
    -		.setVIDPAuthenticationAttributes(vIDPauthenticationAttr);
    +		authenticationAttr.setVIDPAuthenticationAttributes(vIDPauthenticationAttr);
     		extensions.getUnknownXMLObjects().add(authenticationAttr);
     
    -
     		return extensions;
     
     	}
    -	
    +
     	/**
     	 * Generate stork extensions.
     	 * 
    -	 * @param request the attribute query request
    +	 * @param request
    +	 *            the attribute query request
     	 * 
     	 * @return the extensions
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private Extensions generateSTORKAttrExtensions(final STORKAttrQueryRequest request)
    -	throws STORKSAMLEngineException {
    +	private Extensions generateSTORKAttrExtensions(final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
     		LOG.debug("Generate STORKExtensions");
     
     		final Extensions extensions = SAMLEngineUtils.generateExtension();
     
     		LOG.debug("Generate QAAAttribute");
    -		final QAAAttribute qaaAttribute = SAMLEngineUtils
    -		.generateQAAAttribute(request.getQaa());
    +		final QAAAttribute qaaAttribute = SAMLEngineUtils.generateQAAAttribute(request.getQaa());
     		extensions.getUnknownXMLObjects().add(qaaAttribute);
     
    -
    -		if (StringUtils.isNotEmpty(request
    -				.getSpSector())) {
    +		if (StringUtils.isNotEmpty(request.getSpSector())) {
     			// Add information about service provider.
     			LOG.debug("Generate SPSector");
    -			final SPSector sector = SAMLEngineUtils.generateSPSector(request
    -					.getSpSector());
    +			final SPSector sector = SAMLEngineUtils.generateSPSector(request.getSpSector());
     			extensions.getUnknownXMLObjects().add(sector);
     		}
     
    -
     		if (StringUtils.isNotEmpty(request.getSpApplication())) {
     			LOG.debug("Generate SPApplication");
    -			final SPApplication application = SAMLEngineUtils
    -			.generateSPApplication(request.getSpApplication());
    +			final SPApplication application = SAMLEngineUtils.generateSPApplication(request.getSpApplication());
     			extensions.getUnknownXMLObjects().add(application);
     		}
     
     		if (StringUtils.isNotEmpty(request.getSpCountry())) {
     			LOG.debug("Generate SPCountry");
    -			final SPCountry country = SAMLEngineUtils.generateSPCountry(request
    -					.getSpCountry());
    +			final SPCountry country = SAMLEngineUtils.generateSPCountry(request.getSpCountry());
     			extensions.getUnknownXMLObjects().add(country);
     		}
     
    -		final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils
    -		.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
    +		final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
     
     		eIdSectorShare.setEIDSectorShare(String.valueOf(request.isEIDSectorShare()));
     
     		extensions.getUnknownXMLObjects().add(eIdSectorShare);
     
    -		final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils
    -		.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
    +		final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
     		eIdCrossSecShare.setEIDCrossSectorShare(String.valueOf(request.isEIDCrossSectorShare()));
     		extensions.getUnknownXMLObjects().add(eIdCrossSecShare);
     
    -		final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils
    -		.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
    +		final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
     		eIdCrossBordShare.setEIDCrossBorderShare(String.valueOf(request.isEIDCrossBorderShare()));
     		extensions.getUnknownXMLObjects().add(eIdCrossBordShare);
     
    -
     		// Add information about requested attributes.
     		LOG.debug("Generate RequestedAttributes.");
    -		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils
    -		.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
    +		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
     
     		LOG.debug("SAML Engine configuration properties load.");
    -		final Iterator iterator = request
    -		.getPersonalAttributeList().iterator();
    +		final Iterator iterator = request.getPersonalAttributeList().iterator();
     
     		while (iterator.hasNext()) {
     
    @@ -2134,14 +1895,11 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			}
     
     			// Verified if exits the attribute name.
    -			final String attributeName = super.getSamlCoreProperties()
    -			.getProperty(attribute.getName());
    +			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
     
     			if (StringUtils.isBlank(attributeName)) {
    -				LOG.debug("Attribute name: {} was not found.", attribute
    -						.getName());
    -				throw new STORKSAMLEngineException("Attribute name: "
    -						+ attribute.getName() + " was not found.");
    +				LOG.debug("Attribute name: {} was not found.", attribute.getName());
    +				throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " was not found.");
     			}
     
     			// Friendly name it's an optional attribute.
    @@ -2151,18 +1909,13 @@ public final class STORKSAMLEngine extends SAMLEngine {
     				friendlyName = attribute.getName();
     			}
     
    -
     			String isRequired = null;
     			if (super.getSamlCoreProperties().isRequired()) {
     				isRequired = String.valueOf(attribute.isRequired());
     			}
     
    -
     			LOG.debug("Generate requested attribute: " + attributeName);
    -			final RequestedAttribute requestedAttr = SAMLEngineUtils
    -			.generateReqAuthnAttributeSimple(attributeName,
    -					friendlyName, isRequired, attribute
    -					.getValue());
    +			final RequestedAttribute requestedAttr = SAMLEngineUtils.generateReqAuthnAttributeSimple(attributeName, friendlyName, isRequired, attribute.getValue());
     
     			// Add requested attribute.
     			reqAttributes.getAttributes().add(requestedAttr);
    @@ -2172,100 +1925,88 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		extensions.getUnknownXMLObjects().add(reqAttributes);
     
     		CitizenCountryCode citizenCountryCode = null;
    -		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())){
    +		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())) {
     			LOG.debug("Generate CitizenCountryCode");
    -			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils
    -			.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
    +			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
     
    -			citizenCountryCode.setCitizenCountryCode(request
    -					.getCitizenCountryCode().toUpperCase());
    -		}		
    +			citizenCountryCode.setCitizenCountryCode(request.getCitizenCountryCode().toUpperCase());
    +		}
     
     		SPID spid = null;
    -		if(request.getSPID()!=null && StringUtils.isNotBlank(request.getSPID())) {
    +		if (request.getSPID() != null && StringUtils.isNotBlank(request.getSPID())) {
     			LOG.debug("Generate SPID");
    -			spid = (SPID) SAMLEngineUtils
    -			.createSamlObject(SPID.DEF_ELEMENT_NAME);
    +			spid = (SPID) SAMLEngineUtils.createSamlObject(SPID.DEF_ELEMENT_NAME);
     
     			spid.setSPID(request.getSPID().toUpperCase());
    -		}	   
    -
    +		}
     
     		return extensions;
     
     	}
    -	
    +
     	/**
     	 * Gets the alias from X.509 Certificate at keystore.
     	 * 
    -	 * @param keyInfo the key info
    -	 * @param storkOwnKeyStore 
    -	 * @param storkOwnKeyStore 
    +	 * @param keyInfo
    +	 *            the key info
    +	 * @param storkOwnKeyStore
    +	 * @param storkOwnKeyStore
     	 * 
     	 * @return the alias
     	 */
    -    private String getAlias(final KeyInfo keyInfo, KeyStore storkOwnKeyStore) {
    +	private String getAlias(final KeyInfo keyInfo, KeyStore storkOwnKeyStore) {
     
    -        LOG.debug("Recover alias information");
    +		LOG.debug("Recover alias information");
     
    -        String alias = null;
    -        try {
    -            final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
    -                    .getX509Datas().get(0).getX509Certificates().get(0);
    -
    -            // Transform the KeyInfo to X509Certificate.
    -            CertificateFactory certFact;
    -            certFact = CertificateFactory.getInstance("X.509");
    +		String alias = null;
    +		try {
    +			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
     
    -            final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
    -                    .decode(xmlCert.getValue()));
    +			// Transform the KeyInfo to X509Certificate.
    +			CertificateFactory certFact;
    +			certFact = CertificateFactory.getInstance("X.509");
     
    -            final X509Certificate cert = (X509Certificate) certFact
    -                    .generateCertificate(bis);
    +			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
     
    -            final String tokenSerialNumber = cert.getSerialNumber().toString(16);
    -            final X509Principal tokenIssuerDN = new X509Principal(cert.getIssuerDN().getName());
    +			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
     
    +			final String tokenSerialNumber = cert.getSerialNumber().toString(16);
    +			final X509Principal tokenIssuerDN = new X509Principal(cert.getIssuerDN().getName());
     
    -            String aliasCert;
    -            X509Certificate certificate;
    -            boolean find = false;
    +			String aliasCert;
    +			X509Certificate certificate;
    +			boolean find = false;
     
    -            for (final Enumeration e = storkOwnKeyStore.aliases(); e
    -                    .hasMoreElements()
    -                    && !find; ) {
    -                aliasCert = e.nextElement();
    -                certificate = (X509Certificate) storkOwnKeyStore
    -                        .getCertificate(aliasCert);                
    +			for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements() && !find;) {
    +				aliasCert = e.nextElement();
    +				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
     
    -                final String serialNum = certificate.getSerialNumber()
    -                        .toString(16);
    +				final String serialNum = certificate.getSerialNumber().toString(16);
     
    -                X509Principal issuerDN = new X509Principal(certificate
    -                        .getIssuerDN().getName());
    +				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
     
    -                if(serialNum.equalsIgnoreCase(tokenSerialNumber)
    -                        && X509PrincipalUtil.equals2(issuerDN, tokenIssuerDN)){
    -                    alias = aliasCert;
    -                    find = true;
    -                }
    +				if (serialNum.equalsIgnoreCase(tokenSerialNumber) && X509PrincipalUtil.equals2(issuerDN, tokenIssuerDN)) {
    +					alias = aliasCert;
    +					find = true;
    +				}
     
    -            }
    +			}
     
    -        } catch (KeyStoreException e) {
    -            LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
    -        } catch (CertificateException e) {
    -            LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
    -        } catch (RuntimeException e) {
    -            LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
    -        }
    -        return alias;
    -    }
    +		} catch (KeyStoreException e) {
    +			LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
    +		} catch (CertificateException e) {
    +			LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
    +		} catch (RuntimeException e) {
    +			LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
    +		}
    +		return alias;
    +	}
     
     	/**
     	 * Gets the country from X.509 Certificate.
     	 * 
    -	 * @param keyInfo the key info
    +	 * @param keyInfo
    +	 *            the key info
     	 * 
     	 * @return the country
     	 */
    @@ -2274,23 +2015,19 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		String result = "";
     		try {
    -			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
    -			.getX509Datas().get(0).getX509Certificates().get(0);
    +			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
     
     			// Transform the KeyInfo to X509Certificate.
     			CertificateFactory certFact;
     			certFact = CertificateFactory.getInstance("X.509");
     
    -			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
    -					.decode(xmlCert.getValue()));
    +			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
     
    -			final X509Certificate cert = (X509Certificate) certFact
    -			.generateCertificate(bis);
    +			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
     
     			String distName = cert.getSubjectDN().toString();
     
    -			distName = StringUtils.deleteWhitespace(StringUtils
    -					.upperCase(distName));
    +			distName = StringUtils.deleteWhitespace(StringUtils.upperCase(distName));
     
     			final String countryCode = "C=";
     			final int init = distName.indexOf(countryCode);
    @@ -2303,12 +2040,11 @@ public final class STORKSAMLEngine extends SAMLEngine {
     				}
     
     				if (init < end && end > StringUtils.INDEX_NOT_FOUND) {
    -					result = distName.substring(init + countryCode.length(),
    -							end);
    -					//It must be a two characters value
    -					if(result.length()>2){
    +					result = distName.substring(init + countryCode.length(), end);
    +					// It must be a two characters value
    +					if (result.length() > 2) {
     						result = result.substring(0, 2);
    -                    }
    +					}
     				}
     			}
     
    @@ -2321,112 +2057,97 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Process all elements XMLObjects from the extensions.
     	 * 
    -	 * @param extensions the extensions from the authentication request.
    +	 * @param extensions
    +	 *            the extensions from the authentication request.
     	 * 
     	 * @return the STORK authentication request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private STORKAuthnRequest processExtensions(final Extensions extensions)
    -	throws STORKSAMLEngineException {
    +	private STORKAuthnRequest processExtensions(final Extensions extensions) throws STORKSAMLEngineException {
     		LOG.debug("Procces the extensions.");
     
     		final STORKAuthnRequest request = new STORKAuthnRequest();
     
    -		final QAAAttribute qaa = (QAAAttribute) extensions
    -		.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
    +		final QAAAttribute qaa = (QAAAttribute) extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
     		request.setQaa(Integer.parseInt(qaa.getQaaLevel()));
     
    -		List optionalElements = extensions.getUnknownXMLObjects(
    -				SPSector.DEF_ELEMENT_NAME);
    +		List optionalElements = extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME);
     
     		if (!optionalElements.isEmpty()) {
    -			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(
    -					SPSector.DEF_ELEMENT_NAME).get(0);
    +			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME).get(0);
     			request.setSpSector(sector.getSPSector());
     		}
     
     		optionalElements = extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME);
     
     		if (!optionalElements.isEmpty()) {
    -			final SPApplication application = (SPApplication) extensions
    -			.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
    +			final SPApplication application = (SPApplication) extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
     			request.setSpApplication(application.getSPApplication());
     		}
     
     		optionalElements = extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME);
     
     		if (!optionalElements.isEmpty()) {
    -			final SPCountry application = (SPCountry) extensions
    -			.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
    +			final SPCountry application = (SPCountry) extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
     			request.setSpCountry(application.getSPCountry());
    -		}	
    -
    +		}
     
    -		List listCrossBorderShare = extensions
    -		.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
    +		List listCrossBorderShare = extensions.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
     
    -		if (!listCrossBorderShare .isEmpty()) {
    +		if (!listCrossBorderShare.isEmpty()) {
     			final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) listCrossBorderShare.get(0);
    -			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare
    -					.getEIDCrossBorderShare()));		
    +			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare.getEIDCrossBorderShare()));
     		}
     
    -
    -		List listCrosSectorShare = extensions
    -		.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
    +		List listCrosSectorShare = extensions.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
     
     		if (!listCrosSectorShare.isEmpty()) {
     			final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) listCrosSectorShare.get(0);
    -			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare
    -					.getEIDCrossSectorShare()));
    +			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare.getEIDCrossSectorShare()));
     		}
     
    -		List listSectorShareExtension = extensions
    -		.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
    +		List listSectorShareExtension = extensions.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
     		if (!listSectorShareExtension.isEmpty()) {
     			final EIDSectorShare sectorShare = (EIDSectorShare) listSectorShareExtension.get(0);
     			request.setEIDSectorShare(Boolean.parseBoolean(sectorShare.getEIDSectorShare()));
     		}
     
    -
    -
    -		List authAttrs = extensions
    -		.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
    +		List authAttrs = extensions.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
     
     		if (authAttrs != null && !authAttrs.isEmpty()) {
     
    -			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs
    -			.get(0);	
    +			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs.get(0);
     
     			VIDPAuthenticationAttributes vidpAuthnAttr = null;
    -			if (authnAttr != null && !authAttrs.isEmpty()){
    +			if (authnAttr != null && !authAttrs.isEmpty()) {
     				vidpAuthnAttr = authnAttr.getVIDPAuthenticationAttributes();
     			}
     
     			CitizenCountryCode citizenCountryCodeElement = null;
     			SPInformation spInformation = null;
    -			if (vidpAuthnAttr != null){
    +			if (vidpAuthnAttr != null) {
     				citizenCountryCodeElement = vidpAuthnAttr.getCitizenCountryCode();
     				spInformation = vidpAuthnAttr.getSPInformation();
     			}
     
     			String citizenCountryCode = null;
    -			if(citizenCountryCodeElement!=null){
    +			if (citizenCountryCodeElement != null) {
     				citizenCountryCode = citizenCountryCodeElement.getCitizenCountryCode();
     			}
     
    -			if(citizenCountryCode!= null && StringUtils.isNotBlank(citizenCountryCode)){
    +			if (citizenCountryCode != null && StringUtils.isNotBlank(citizenCountryCode)) {
     				request.setCitizenCountryCode(citizenCountryCode);
    -			}	  	    
    +			}
     
     			SPID spidElement = null;
    -			if (spInformation != null){
    +			if (spInformation != null) {
     				spidElement = spInformation.getSPID();
     			}
     
     			String spid = null;
    -			if(spidElement!=null){
    +			if (spidElement != null) {
     				spid = spidElement.getSPID();
     			}
     
    @@ -2435,16 +2156,12 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			}
     		}
     
    -		if (extensions
    -				.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
    +		if (extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
     			LOG.error("Extensions not contains any requested attribute.");
    -			throw new STORKSAMLEngineException(
    -			"Extensions not contains any requested attribute.");
    +			throw new STORKSAMLEngineException("Extensions not contains any requested attribute.");
     		}
     
    -		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions
    -		.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME)
    -		.get(0);
    +		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME).get(0);
     
     		final List reqAttrs = requestedAttr.getAttributes();
     
    @@ -2459,8 +2176,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			attributeName = attribute.getName();
     
     			// recover the last name from the string.
    -			personalAttribute.setName(attributeName.substring(attributeName
    -					.lastIndexOf('/') + 1));
    +			personalAttribute.setName(attributeName.substring(attributeName.lastIndexOf('/') + 1));
     
     			final ArrayList valores = new ArrayList();
     			final List values = attribute.getOrderedChildren();
    @@ -2469,52 +2185,46 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     				// Process attributes simples. An AuthenticationRequest only
     				// must contains simple values.
    -				
    +
     				final XMLObject xmlObject = values.get(nextSimpleValue);
    -								
    -				if(xmlObject instanceof XSStringImpl){
    -					
    -					final XSStringImpl xmlString = (XSStringImpl) values
    -					.get(nextSimpleValue);
    +
    +				if (xmlObject instanceof XSStringImpl) {
    +
    +					final XSStringImpl xmlString = (XSStringImpl) values.get(nextSimpleValue);
     					valores.add(xmlString.getValue());
    -				
    -				}else{
    -				
    +
    +				} else {
    +
     					if (attributeName.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
    -						
    -						final XSAnyImpl xmlString = (XSAnyImpl) values
    -						.get(nextSimpleValue);
    -						
    +
    +						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
    +
     						TransformerFactory transFactory = TransformerFactory.newInstance();
     						Transformer transformer = null;
     						try {
     							transformer = transFactory.newTransformer();
     							transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
     						} catch (TransformerConfigurationException e) {
    -                            LOG.error("Error transformer configuration exception", e);
    +							LOG.error("Error transformer configuration exception", e);
     						}
    -						StringWriter buffer = new StringWriter();					
    +						StringWriter buffer = new StringWriter();
     						try {
    -                            if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0 ){
    -                                transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()),
    -                                      new StreamResult(buffer));
    -                            }
    +							if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0) {
    +								transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()), new StreamResult(buffer));
    +							}
     						} catch (TransformerException e) {
    -                            LOG.error("Error transformer exception", e);
    +							LOG.error("Error transformer exception", e);
     						}
     						String str = buffer.toString();
    -						
    -						valores.add(str);	
    -										
    -					}else{
    -						
    -						final XSAnyImpl xmlString = (XSAnyImpl) values
    -						.get(nextSimpleValue);
    +
    +						valores.add(str);
    +
    +					} else {
    +
    +						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
     						valores.add(xmlString.getTextContent());
     					}
    -								
    -					
    -										
    +
     				}
     			}
     			personalAttribute.setValue(valores);
    @@ -2526,116 +2236,100 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		return request;
     	}
     
    -	
     	/**
     	 * Process all elements XMLObjects from the extensions.
     	 * 
    -	 * @param extensions the extensions from the authentication request.
    +	 * @param extensions
    +	 *            the extensions from the authentication request.
     	 * 
     	 * @return the STORK authentication request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private STORKAttrQueryRequest processAttrExtensions(final Extensions extensions)
    -	throws STORKSAMLEngineException {
    +	private STORKAttrQueryRequest processAttrExtensions(final Extensions extensions) throws STORKSAMLEngineException {
     		LOG.debug("Procces the atribute query extensions.");
     
     		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
     
    -		final QAAAttribute qaa = (QAAAttribute) extensions
    -		.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
    +		final QAAAttribute qaa = (QAAAttribute) extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
     		request.setQaa(Integer.parseInt(qaa.getQaaLevel()));
     
    -		List optionalElements = extensions.getUnknownXMLObjects(
    -				SPSector.DEF_ELEMENT_NAME);
    +		List optionalElements = extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME);
     
     		if (!optionalElements.isEmpty()) {
    -			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(
    -					SPSector.DEF_ELEMENT_NAME).get(0);
    +			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME).get(0);
     			request.setSpSector(sector.getSPSector());
     		}
     
     		optionalElements = extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME);
     
     		if (!optionalElements.isEmpty()) {
    -			final SPApplication application = (SPApplication) extensions
    -			.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
    +			final SPApplication application = (SPApplication) extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
     			request.setSpApplication(application.getSPApplication());
     		}
     
     		optionalElements = extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME);
     
     		if (!optionalElements.isEmpty()) {
    -			final SPCountry application = (SPCountry) extensions
    -			.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
    +			final SPCountry application = (SPCountry) extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
     			request.setSpCountry(application.getSPCountry());
    -		}	
    -
    +		}
     
    -		List listCrossBorderShare = extensions
    -		.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
    +		List listCrossBorderShare = extensions.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
     
    -		if (!listCrossBorderShare .isEmpty()) {
    +		if (!listCrossBorderShare.isEmpty()) {
     			final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) listCrossBorderShare.get(0);
    -			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare
    -					.getEIDCrossBorderShare()));		
    +			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare.getEIDCrossBorderShare()));
     		}
     
    -
    -		List listCrosSectorShare = extensions
    -		.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
    +		List listCrosSectorShare = extensions.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
     
     		if (!listCrosSectorShare.isEmpty()) {
     			final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) listCrosSectorShare.get(0);
    -			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare
    -					.getEIDCrossSectorShare()));
    +			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare.getEIDCrossSectorShare()));
     		}
     
    -		List listSectorShareExtension = extensions
    -		.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
    +		List listSectorShareExtension = extensions.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
     		if (!listSectorShareExtension.isEmpty()) {
     			final EIDSectorShare sectorShare = (EIDSectorShare) listSectorShareExtension.get(0);
     			request.setEIDSectorShare(Boolean.parseBoolean(sectorShare.getEIDSectorShare()));
     		}
     
    -
    -
    -		List authAttrs = extensions
    -		.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
    +		List authAttrs = extensions.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
     
     		if (authAttrs != null && !authAttrs.isEmpty()) {
     
    -			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs
    -			.get(0);	
    +			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs.get(0);
     
     			VIDPAuthenticationAttributes vidpAuthnAttr = null;
    -			if (authnAttr != null && !authAttrs.isEmpty()){
    +			if (authnAttr != null && !authAttrs.isEmpty()) {
     				vidpAuthnAttr = authnAttr.getVIDPAuthenticationAttributes();
     			}
     
     			CitizenCountryCode citizenCountryCodeElement = null;
     			SPInformation spInformation = null;
    -			if (vidpAuthnAttr != null){
    +			if (vidpAuthnAttr != null) {
     				citizenCountryCodeElement = vidpAuthnAttr.getCitizenCountryCode();
     				spInformation = vidpAuthnAttr.getSPInformation();
     			}
     
     			String citizenCountryCode = null;
    -			if(citizenCountryCodeElement!=null){
    +			if (citizenCountryCodeElement != null) {
     				citizenCountryCode = citizenCountryCodeElement.getCitizenCountryCode();
     			}
     
    -			if(citizenCountryCode!= null && StringUtils.isNotBlank(citizenCountryCode)){
    +			if (citizenCountryCode != null && StringUtils.isNotBlank(citizenCountryCode)) {
     				request.setCitizenCountryCode(citizenCountryCode);
    -			}	  	    
    +			}
     
     			SPID spidElement = null;
    -			if (spInformation != null){
    +			if (spInformation != null) {
     				spidElement = spInformation.getSPID();
     			}
     
     			String spid = null;
    -			if(spidElement!=null){
    +			if (spidElement != null) {
     				spid = spidElement.getSPID();
     			}
     
    @@ -2644,16 +2338,12 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			}
     		}
     
    -		if (extensions
    -				.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
    +		if (extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
     			LOG.error("Extensions not contains any requested attribute.");
    -			throw new STORKSAMLEngineException(
    -			"Extensions not contains any requested attribute.");
    +			throw new STORKSAMLEngineException("Extensions not contains any requested attribute.");
     		}
     
    -		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions
    -		.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME)
    -		.get(0);
    +		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME).get(0);
     
     		final List reqAttrs = requestedAttr.getAttributes();
     
    @@ -2668,8 +2358,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			attributeName = attribute.getName();
     
     			// recover the last name from the string.
    -			personalAttribute.setName(attributeName.substring(attributeName
    -					.lastIndexOf('/') + 1));
    +			personalAttribute.setName(attributeName.substring(attributeName.lastIndexOf('/') + 1));
     
     			final ArrayList valores = new ArrayList();
     			final List values = attribute.getOrderedChildren();
    @@ -2678,52 +2367,46 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     				// Process attributes simples. An AuthenticationRequest only
     				// must contains simple values.
    -				
    +
     				final XMLObject xmlObject = values.get(nextSimpleValue);
    -								
    -				if(xmlObject instanceof XSStringImpl){
    -					
    -					final XSStringImpl xmlString = (XSStringImpl) values
    -					.get(nextSimpleValue);
    +
    +				if (xmlObject instanceof XSStringImpl) {
    +
    +					final XSStringImpl xmlString = (XSStringImpl) values.get(nextSimpleValue);
     					valores.add(xmlString.getValue());
    -				
    -				}else{
    -				
    +
    +				} else {
    +
     					if (attributeName.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
    -						
    -						final XSAnyImpl xmlString = (XSAnyImpl) values
    -						.get(nextSimpleValue);
    -						
    +
    +						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
    +
     						TransformerFactory transFactory = TransformerFactory.newInstance();
     						Transformer transformer = null;
     						try {
     							transformer = transFactory.newTransformer();
     							transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
     						} catch (TransformerConfigurationException e) {
    -                            LOG.error("Error transformer configuration exception", e);
    +							LOG.error("Error transformer configuration exception", e);
     						}
    -						StringWriter buffer = new StringWriter();					
    +						StringWriter buffer = new StringWriter();
     						try {
    -                            if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0 ){
    -                                transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()),
    -                                      new StreamResult(buffer));
    -                            }
    +							if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0) {
    +								transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()), new StreamResult(buffer));
    +							}
     						} catch (TransformerException e) {
    -                            LOG.error("Error transformer exception", e);
    +							LOG.error("Error transformer exception", e);
     						}
     						String str = buffer.toString();
    -						
    -						valores.add(str);	
    -										
    -					}else{
    -						
    -						final XSAnyImpl xmlString = (XSAnyImpl) values
    -						.get(nextSimpleValue);
    +
    +						valores.add(str);
    +
    +					} else {
    +
    +						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
     						valores.add(xmlString.getTextContent());
     					}
    -								
    -					
    -										
    +
     				}
     			}
     			personalAttribute.setValue(valores);
    @@ -2738,25 +2421,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Sets the name spaces.
     	 * 
    -	 * @param tokenSaml the new name spaces
    +	 * @param tokenSaml
    +	 *            the new name spaces
     	 */
     	private void setNameSpaces(final XMLObject tokenSaml) {
     		LOG.debug("Set namespaces.");
     
    -		final Namespace saml2 = new Namespace(SAMLConstants.SAML20_NS,
    -				SAMLConstants.SAML20_PREFIX);
    +		final Namespace saml2 = new Namespace(SAMLConstants.SAML20_NS, SAMLConstants.SAML20_PREFIX);
     		tokenSaml.addNamespace(saml2);
     
    -		final Namespace digSig = new Namespace(
    -				"http://www.w3.org/2000/09/xmldsig#", "ds");
    +		final Namespace digSig = new Namespace("http://www.w3.org/2000/09/xmldsig#", "ds");
     		tokenSaml.addNamespace(digSig);
     
    -		final Namespace storkp = new Namespace(SAMLCore.STORK10P_NS.getValue(),
    -				SAMLCore.STORK10P_PREFIX.getValue());
    +		final Namespace storkp = new Namespace(SAMLCore.STORK10P_NS.getValue(), SAMLCore.STORK10P_PREFIX.getValue());
     		tokenSaml.addNamespace(storkp);
     
    -		final Namespace stork = new Namespace(SAMLCore.STORK10_NS.getValue(),
    -				SAMLCore.STORK10_PREFIX.getValue());
    +		final Namespace stork = new Namespace(SAMLCore.STORK10_NS.getValue(), SAMLCore.STORK10_PREFIX.getValue());
     
     		tokenSaml.addNamespace(stork);
     	}
    @@ -2764,248 +2444,223 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Validate parameters from authentication request.
     	 * 
    -	 * @param request the request.
    +	 * @param request
    +	 *            the request.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamAuthnReq(final STORKAuthnRequest request)
    -	throws STORKSAMLEngineException {
    +	private void validateParamAuthnReq(final STORKAuthnRequest request) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters from authentication request.");
     
     		// URL to which Authentication Response must be sent.
     		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
     		}
     
     		// the name of the original service provider requesting the
     		// authentication.
     		if (StringUtils.isBlank(request.getProviderName())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: Service Provider it's mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: Service Provider it's mandatory.");
     		}
     
     		// object that contain all attributes requesting.
    -		if (request.getPersonalAttributeList() == null
    -				|| request.getPersonalAttributeList().isEmpty()) {
    -			throw new STORKSAMLEngineException(
    -			"attributeQueries is null or empty.");
    +		if (request.getPersonalAttributeList() == null || request.getPersonalAttributeList().isEmpty()) {
    +			throw new STORKSAMLEngineException("attributeQueries is null or empty.");
     		}
     
     		// Quality authentication assurance level.
    -		if ((request.getQaa() < QAAAttribute.MIN_VALUE)
    -				|| (request.getQaa() > QAAAttribute.MAX_VALUE)) {
    -			throw new STORKSAMLEngineException("Qaal: " + request.getQaa()
    -					+ ", is invalid.");
    +		if ((request.getQaa() < QAAAttribute.MIN_VALUE) || (request.getQaa() > QAAAttribute.MAX_VALUE)) {
    +			throw new STORKSAMLEngineException("Qaal: " + request.getQaa() + ", is invalid.");
     		}
     
     	}
    -	
    +
     	/**
     	 * Validate parameters from attribute query request.
     	 * 
    -	 * @param request the request.
    +	 * @param request
    +	 *            the request.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamAttrQueryReq(final STORKAttrQueryRequest request)
    -	throws STORKSAMLEngineException {
    +	private void validateParamAttrQueryReq(final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters from attribute query request.");
     
     		// URL to which AP Response must be sent.
     		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
     		}
     
     		// Destination of the request - not mandatory
    -		/*if (StringUtils.isBlank(request.getDestination())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: Destination is mandatory.");
    -		}*/
    -		
    +		/*
    +		 * if (StringUtils.isBlank(request.getDestination())) { throw new STORKSAMLEngineException( "StorkSamlEngine: Destination is mandatory."); }
    +		 */
    +
     		// SP country is empty
     		if (StringUtils.isBlank(request.getSpCountry())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: SP country is mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: SP country is mandatory.");
     		}
     
     		// object that contain all attributes requesting.
    -		if (request.getPersonalAttributeList() == null
    -				|| request.getPersonalAttributeList().isEmpty()) {
    -			throw new STORKSAMLEngineException(
    -			"attributeQueries is null or empty.");
    +		if (request.getPersonalAttributeList() == null || request.getPersonalAttributeList().isEmpty()) {
    +			throw new STORKSAMLEngineException("attributeQueries is null or empty.");
     		}
     
     		// Quality authentication assurance level.
    -		if ((request.getQaa() < QAAAttribute.MIN_VALUE)
    -				|| (request.getQaa() > QAAAttribute.MAX_VALUE)) {
    -			throw new STORKSAMLEngineException("Qaal: " + request.getQaa()
    -					+ ", is invalid.");
    +		if ((request.getQaa() < QAAAttribute.MIN_VALUE) || (request.getQaa() > QAAAttribute.MAX_VALUE)) {
    +			throw new STORKSAMLEngineException("Qaal: " + request.getQaa() + ", is invalid.");
     		}
     	}
    -	
    +
     	/**
     	 * Validate parameters from logout request.
     	 * 
    -	 * @param request the request.
    +	 * @param request
    +	 *            the request.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamLogoutReq(final STORKLogoutRequest request)
    -	throws STORKSAMLEngineException {
    +	private void validateParamLogoutReq(final STORKLogoutRequest request) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters from logout request.");
     
     		// URL to which AP Response must be sent.
    -		/*if (StringUtils.isBlank(request.get())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
    -		}*/
    +		/*
    +		 * if (StringUtils.isBlank(request.get())) { throw new STORKSAMLEngineException( "StorkSamlEngine: Assertion Consumer Service URL it's mandatory."); }
    +		 */
     
     		// Destination of the request
     		if (StringUtils.isBlank(request.getDestination())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: Destination is mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: Destination is mandatory.");
     		}
    -		
    +
     		// SP Provided Id
     		if (StringUtils.isBlank(request.getSpProvidedId())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: SP provided Id is mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: SP provided Id is mandatory.");
     		}
     	}
    -	
    +
     	/**
     	 * Validate parameters from logout response.
     	 * 
    -	 * @param response the response.
    +	 * @param response
    +	 *            the response.
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamLogoutRes(final STORKLogoutRequest request, 
    -			final STORKLogoutResponse response)	throws STORKSAMLEngineException {
    +	private void validateParamLogoutRes(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters from logout request.");
     
     		// Issuer is mandatory
     		if (StringUtils.isBlank(request.getIssuer())) {
    -			throw new STORKSAMLEngineException(
    -					"Issuer must be not empty or null.");
    +			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
     		}
     
     		// Destination of the request
     		if (StringUtils.isBlank(response.getDestination())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: Destination is mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: Destination is mandatory.");
     		}
    -		
    +
     		// SP Provided Id
     		if (StringUtils.isBlank(request.getSpProvidedId())) {
    -			throw new STORKSAMLEngineException(
    -					"StorkSamlEngine: SP provided Id is mandatory.");
    +			throw new STORKSAMLEngineException("StorkSamlEngine: SP provided Id is mandatory.");
     		}
    -		
    +
     		if (StringUtils.isBlank(request.getSamlId())) {
     			throw new STORKSAMLEngineException("request ID is null or empty.");
     		}
     	}
     
    -
     	/**
     	 * Validate parameters from response.
     	 * 
    -	 * @param request the request
    -	 * @param responseAuthReq the response authentication request
    +	 * @param request
    +	 *            the request
    +	 * @param responseAuthReq
    +	 *            the response authentication request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamResponse(final STORKAuthnRequest request,
    -			final STORKAuthnResponse responseAuthReq)
    -	throws STORKSAMLEngineException {
    +	private void validateParamResponse(final STORKAuthnRequest request, final STORKAuthnResponse responseAuthReq) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters response.");
     		if (StringUtils.isBlank(request.getIssuer())) {
    -			throw new STORKSAMLEngineException(
    -					"Issuer must be not empty or null.");
    +			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
     		}
     
    -		if (responseAuthReq.getPersonalAttributeList() == null
    -				|| responseAuthReq.getPersonalAttributeList().isEmpty()) {
    +		if (responseAuthReq.getPersonalAttributeList() == null || responseAuthReq.getPersonalAttributeList().isEmpty()) {
     			LOG.error("PersonalAttributeList is null or empty.");
    -			throw new STORKSAMLEngineException(
    -			"PersonalAttributeList is null or empty.");
    +			throw new STORKSAMLEngineException("PersonalAttributeList is null or empty.");
     		}
     
     		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
    -			throw new STORKSAMLEngineException(
    -					"assertionConsumerServiceURL is null or empty.");
    +			throw new STORKSAMLEngineException("assertionConsumerServiceURL is null or empty.");
     		}
     
     		if (StringUtils.isBlank(request.getSamlId())) {
     			throw new STORKSAMLEngineException("request ID is null or empty.");
     		}
     	}
    -	
    +
     	/**
     	 * Validate parameters from response.
     	 * 
    -	 * @param request the request
    -	 * @param responseAttrQueryReq the response authentication request
    +	 * @param request
    +	 *            the request
    +	 * @param responseAttrQueryReq
    +	 *            the response authentication request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamAttrQueryResponse(final STORKAttrQueryRequest request,
    -			final STORKAttrQueryResponse responseAttrQueryReq)
    -	throws STORKSAMLEngineException {
    +	private void validateParamAttrQueryResponse(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryReq) throws STORKSAMLEngineException {
     		LOG.info("Validate attribute querey parameters response.");
     		if (StringUtils.isBlank(request.getIssuer())) {
    -			throw new STORKSAMLEngineException(
    -					"Issuer must be not empty or null.");
    +			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
     		}
     
    -		if (responseAttrQueryReq.getPersonalAttributeList() == null
    -				|| responseAttrQueryReq.getPersonalAttributeList().isEmpty()) {
    +		if (responseAttrQueryReq.getPersonalAttributeList() == null || responseAttrQueryReq.getPersonalAttributeList().isEmpty()) {
     			LOG.error("PersonalAttributeList is null or empty.");
    -			throw new STORKSAMLEngineException(
    -			"PersonalAttributeList is null or empty.");
    +			throw new STORKSAMLEngineException("PersonalAttributeList is null or empty.");
     		}
     
    -		/*if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
    -			throw new STORKSAMLEngineException(
    -					"assertionConsumerServiceURL is null or empty.");
    -		}*/
    +		/*
    +		 * if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) { throw new STORKSAMLEngineException( "assertionConsumerServiceURL is null or empty."); }
    +		 */
     
     		if (StringUtils.isBlank(request.getSamlId())) {
     			throw new STORKSAMLEngineException("request ID is null or empty.");
     		}
     	}
    -	
    +
     	/**
     	 * Validate parameters from response.
     	 * 
    -	 * @param request the request
    -	 * @param responseAttrQueryReq the response authentication request
    +	 * @param request
    +	 *            the request
    +	 * @param responseAttrQueryReq
    +	 *            the response authentication request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamAttrQueryResponseFromAssertions(final STORKAttrQueryRequest request,
    -			final STORKAttrQueryResponse responseAttrQueryReq)
    -	throws STORKSAMLEngineException {
    +	private void validateParamAttrQueryResponseFromAssertions(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryReq) throws STORKSAMLEngineException {
     		LOG.info("Validate attribute querey parameters response.");
     		if (StringUtils.isBlank(request.getIssuer())) {
    -			throw new STORKSAMLEngineException(
    -					"Issuer must be not empty or null.");
    +			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
     		}
     
    -		/*if (responseAttrQueryReq.getPersonalAttributeList() == null
    -				|| responseAttrQueryReq.getPersonalAttributeList().isEmpty()) {
    -			LOG.error("PersonalAttributeList is null or empty.");
    -			throw new STORKSAMLEngineException(
    -			"PersonalAttributeList is null or empty.");
    -		}*/
    +		/*
    +		 * if (responseAttrQueryReq.getPersonalAttributeList() == null || responseAttrQueryReq.getPersonalAttributeList().isEmpty()) { LOG.error("PersonalAttributeList is null or empty."); throw new
    +		 * STORKSAMLEngineException( "PersonalAttributeList is null or empty."); }
    +		 */
     
    -		/*if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
    -			throw new STORKSAMLEngineException(
    -					"assertionConsumerServiceURL is null or empty.");
    -		}*/
    +		/*
    +		 * if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) { throw new STORKSAMLEngineException( "assertionConsumerServiceURL is null or empty."); }
    +		 */
     
     		if (StringUtils.isBlank(request.getSamlId())) {
     			throw new STORKSAMLEngineException("request ID is null or empty.");
    @@ -3015,38 +2670,41 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Validate parameter from response fail.
     	 * 
    -	 * @param request the request
    -	 * @param response the response
    +	 * @param request
    +	 *            the request
    +	 * @param response
    +	 *            the response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamResponseFail(final STORKAuthnRequest request,
    -			final STORKAuthnResponse response) throws STORKSAMLEngineException {
    +	private void validateParamResponseFail(final STORKAuthnRequest request, final STORKAuthnResponse response) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters response fail.");
     		if (StringUtils.isBlank(response.getStatusCode())) {
     			throw new STORKSAMLEngineException("Code error it's null or empty.");
     		}
     
     		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
    -			throw new STORKSAMLEngineException(
    -					"assertionConsumerServiceURL is null or empty.");
    +			throw new STORKSAMLEngineException("assertionConsumerServiceURL is null or empty.");
     		}
     
     		if (StringUtils.isBlank(request.getSamlId())) {
     			throw new STORKSAMLEngineException("request ID is null or empty.");
     		}
     	}
    -	
    +
     	/**
     	 * Validate parameter from response fail.
     	 * 
    -	 * @param request the request
    -	 * @param response the response
    +	 * @param request
    +	 *            the request
    +	 * @param response
    +	 *            the response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamAttrQueryResponseFail(final STORKAttrQueryRequest request,
    -			final STORKAttrQueryResponse response) throws STORKSAMLEngineException {
    +	private void validateParamAttrQueryResponseFail(final STORKAttrQueryRequest request, final STORKAttrQueryResponse response) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters response fail.");
     		if (StringUtils.isBlank(response.getStatusCode())) {
     			throw new STORKSAMLEngineException("Code error it's null or empty.");
    @@ -3056,22 +2714,23 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			throw new STORKSAMLEngineException("request ID is null or empty.");
     		}
     	}
    -	
    +
     	/**
     	 * Validate parameter from response fail.
     	 * 
    -	 * @param request the request
    -	 * @param response the response
    +	 * @param request
    +	 *            the request
    +	 * @param response
    +	 *            the response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private void validateParamLogoutResFail(final STORKLogoutRequest request,
    -			final STORKLogoutResponse response) throws STORKSAMLEngineException {
    +	private void validateParamLogoutResFail(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters response fail.");
    -		
    +
     		if (StringUtils.isBlank(request.getIssuer())) {
    -			throw new STORKSAMLEngineException(
    -					"Issuer must be not empty or null.");
    +			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
     		}
     
     		if (StringUtils.isBlank(response.getStatusCode())) {
    @@ -3086,14 +2745,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Validate stork authentication request.
     	 * 
    -	 * @param tokenSaml the token SAML
    +	 * @param tokenSaml
    +	 *            the token SAML
     	 * 
     	 * @return the sTORK authentication request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAuthnRequest validateSTORKAuthnRequest(final byte[] tokenSaml)
    -	throws STORKSAMLEngineException {
    +	public STORKAuthnRequest validateSTORKAuthnRequest(final byte[] tokenSaml) throws STORKSAMLEngineException {
     		LOG.info("validateSTORKAuthnRequest");
     
     		final AuthnRequest samlRequest = (AuthnRequest) validateStorkSaml(tokenSaml);
    @@ -3108,60 +2768,56 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     
     		LOG.debug("Generate STORKAuthnRequest.");
    -		final STORKAuthnRequest authnRequest = processExtensions(samlRequest
    -				.getExtensions());
    -
    -		authnRequest.setCountry(this.getCountry(samlRequest.getSignature()
    -				.getKeyInfo()));
    -		
    -		authnRequest.setAlias(this.getAlias(samlRequest.getSignature()
    -				.getKeyInfo(), super.getSigner().getTrustStore()));
    -		
    +		final STORKAuthnRequest authnRequest = processExtensions(samlRequest.getExtensions());
    +
    +		authnRequest.setCountry(this.getCountry(samlRequest.getSignature().getKeyInfo()));
    +
    +		authnRequest.setAlias(this.getAlias(samlRequest.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
    +
     		authnRequest.setSamlId(samlRequest.getID());
     		authnRequest.setDestination(samlRequest.getDestination());
    -		authnRequest.setAssertionConsumerServiceURL(samlRequest
    -				.getAssertionConsumerServiceURL());
    +		authnRequest.setAssertionConsumerServiceURL(samlRequest.getAssertionConsumerServiceURL());
     
     		authnRequest.setProviderName(samlRequest.getProviderName());
     		authnRequest.setIssuer(samlRequest.getIssuer().getValue());
     
    -		//Delete unknown elements from requested ones
    +		// Delete unknown elements from requested ones
     		final Iterator iterator = authnRequest.getPersonalAttributeList().iterator();
    -        IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) authnRequest.getPersonalAttributeList();
    +		IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) authnRequest.getPersonalAttributeList();
     		while (iterator.hasNext()) {
     
     			final PersonalAttribute attribute = iterator.next();
     
     			// Verify if the attribute name exits.
    -			final String attributeName = super.getSamlCoreProperties()
    -			.getProperty(attribute.getName());
    +			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
     
     			if (StringUtils.isBlank(attributeName)) {
     				LOG.info("Attribute name: {} was not found. It will be removed from the request object", attribute.getName());
     				cleanPerAttrList.remove(attribute.getName());
     			}
     
    -		}	
    +		}
     		authnRequest.setPersonalAttributeList(cleanPerAttrList);
     
     		return authnRequest;
     
     	}
    -	
    +
     	/**
     	 * Validate stork attribute query request.
     	 * 
    -	 * @param tokenSaml the token SAML
    +	 * @param tokenSaml
    +	 *            the token SAML
     	 * 
     	 * @return the STORK attribute query request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAttrQueryRequest validateSTORKAttrQueryRequest(final byte[] tokenSaml)
    -	throws STORKSAMLEngineException {
    +	public STORKAttrQueryRequest validateSTORKAttrQueryRequest(final byte[] tokenSaml) throws STORKSAMLEngineException {
     		LOG.info("validateSTORKAttrQueryRequest");
     
    -		//final AttributeQuery samlRequest = (AttributeQuery) validateStorkSaml(tokenSaml);
    +		// final AttributeQuery samlRequest = (AttributeQuery) validateStorkSaml(tokenSaml);
     		final CustomRequestAbstractType samlRequest = (CustomRequestAbstractType) validateStorkSaml(tokenSaml);
     
     		LOG.debug("Validate Extensions.");
    @@ -3174,60 +2830,56 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     
     		LOG.debug("Generate STORKAttrQueryRequest.");
    -		final STORKAttrQueryRequest attrRequest = processAttrExtensions(samlRequest
    -				.getExtensions());
    -
    -		attrRequest.setCountry(this.getCountry(samlRequest.getSignature()
    -				.getKeyInfo()));
    -		
    -		attrRequest.setAlias(this.getAlias(samlRequest.getSignature()
    -				.getKeyInfo(), super.getSigner().getTrustStore()));
    -		
    +		final STORKAttrQueryRequest attrRequest = processAttrExtensions(samlRequest.getExtensions());
    +
    +		attrRequest.setCountry(this.getCountry(samlRequest.getSignature().getKeyInfo()));
    +
    +		attrRequest.setAlias(this.getAlias(samlRequest.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
    +
     		attrRequest.setSamlId(samlRequest.getID());
     		attrRequest.setDestination(samlRequest.getDestination());
    -		attrRequest.setAssertionConsumerServiceURL(samlRequest
    -				.getAssertionConsumerServiceURL());
    +		attrRequest.setAssertionConsumerServiceURL(samlRequest.getAssertionConsumerServiceURL());
     
    -		/*authnRequest.setProviderName(samlRequest.getProviderName());*/
    +		/* authnRequest.setProviderName(samlRequest.getProviderName()); */
     		attrRequest.setIssuer(samlRequest.getIssuer().getValue());
     
    -		//Delete unknown elements from requested ones
    +		// Delete unknown elements from requested ones
     		final Iterator iterator = attrRequest.getPersonalAttributeList().iterator();
    -        IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) attrRequest.getPersonalAttributeList();
    +		IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) attrRequest.getPersonalAttributeList();
     		while (iterator.hasNext()) {
     
     			final PersonalAttribute attribute = iterator.next();
     
     			// Verify if the attribute name exits.
    -			final String attributeName = super.getSamlCoreProperties()
    -			.getProperty(attribute.getName());
    +			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
     
     			if (StringUtils.isBlank(attributeName)) {
     				LOG.info("Attribute name: {} was not found. It will be removed from the request object", attribute.getName());
     				cleanPerAttrList.remove(attribute.getName());
     			}
     
    -		}	
    +		}
     		attrRequest.setPersonalAttributeList(cleanPerAttrList);
     
     		return attrRequest;
     
     	}
    -	
    +
     	/**
     	 * Validate stork logout request.
     	 * 
    -	 * @param tokenSaml the token SAML
    +	 * @param tokenSaml
    +	 *            the token SAML
     	 * 
     	 * @return the STORK logout request
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKLogoutRequest validateSTORKLogoutRequest(final byte[] tokenSaml)
    -	throws STORKSAMLEngineException {
    +	public STORKLogoutRequest validateSTORKLogoutRequest(final byte[] tokenSaml) throws STORKSAMLEngineException {
     		LOG.info("validateSTORKLogoutRequest");
     
    -		final LogoutRequest samlRequest = (LogoutRequest)validateStorkSaml(tokenSaml);
    +		final LogoutRequest samlRequest = (LogoutRequest) validateStorkSaml(tokenSaml);
     
     		LOG.debug("Validate Extensions.");
     		final Validator validatorExt = new ExtensionsSchemaValidator();
    @@ -3241,15 +2893,13 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		LOG.debug("Generate STORKLogoutRequest.");
     		final STORKLogoutRequest logoutRequest = new STORKLogoutRequest();
     
    -		logoutRequest.setCountry(this.getCountry(samlRequest.getSignature()
    -				.getKeyInfo()));
    -		
    -		logoutRequest.setAlias(this.getAlias(samlRequest.getSignature()
    -				.getKeyInfo(), super.getSigner().getTrustStore()));
    -		
    +		logoutRequest.setCountry(this.getCountry(samlRequest.getSignature().getKeyInfo()));
    +
    +		logoutRequest.setAlias(this.getAlias(samlRequest.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
    +
     		logoutRequest.setSamlId(samlRequest.getID());
     		logoutRequest.setDestination(samlRequest.getDestination());
    -		
    +
     		logoutRequest.setIssuer(samlRequest.getIssuer().getValue());
     
     		logoutRequest.setSpProvidedId(samlRequest.getNameID().getValue());
    @@ -3261,16 +2911,17 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Validate stork authentication response.
     	 * 
    -	 * @param tokenSaml the token SAML
    -	 * @param userIP the user IP
    +	 * @param tokenSaml
    +	 *            the token SAML
    +	 * @param userIP
    +	 *            the user IP
     	 * 
     	 * @return the Stork authentication response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAuthnResponse validateSTORKAuthnResponse(
    -			final byte[] tokenSaml, final String userIP)
    -	throws STORKSAMLEngineException {
    +	public STORKAuthnResponse validateSTORKAuthnResponse(final byte[] tokenSaml, final String userIP) throws STORKSAMLEngineException {
     
     		LOG.info("validateSTORKAuthnResponse");
     		final Response samlResponse = (Response) validateStorkSaml(tokenSaml);
    @@ -3278,90 +2929,76 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		LOG.debug("Create StorkAuthResponse.");
     		final STORKAuthnResponse authnResponse = new STORKAuthnResponse();
     
    -		authnResponse.setCountry(this.getCountry(samlResponse.getSignature()
    -				.getKeyInfo()));
    +		authnResponse.setCountry(this.getCountry(samlResponse.getSignature().getKeyInfo()));
     
     		LOG.debug("Set ID.");
     		authnResponse.setSamlId(samlResponse.getID());
     		LOG.debug("Set InResponseTo.");
     		authnResponse.setInResponseTo(samlResponse.getInResponseTo());
     		LOG.debug("Set statusCode.");
    -		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode()
    -				.getValue());
    +		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode().getValue());
     
     		// Subordinate code.
     		if (samlResponse.getStatus().getStatusCode().getStatusCode() != null) {
    -			authnResponse.setSubStatusCode(samlResponse.getStatus()
    -					.getStatusCode().getStatusCode().getValue());
    +			authnResponse.setSubStatusCode(samlResponse.getStatus().getStatusCode().getStatusCode().getValue());
     		}
     
     		if (samlResponse.getStatus().getStatusMessage() != null) {
     			LOG.debug("Set statusMessage.");
    -			authnResponse.setMessage(samlResponse.getStatus()
    -					.getStatusMessage().getMessage());
    +			authnResponse.setMessage(samlResponse.getStatus().getStatusMessage().getMessage());
     		}
     
     		LOG.debug("validateStorkResponse");
    -		final Assertion assertion = (Assertion) validateStorkResponse(
    -				samlResponse, userIP);	
    -		
    -		if(assertion!=null){
    +		final Assertion assertion = (Assertion) validateStorkResponse(samlResponse, userIP);
    +
    +		if (assertion != null) {
     			final DateTime serverDate = new DateTime();
     
     			if (assertion.getConditions().getNotOnOrAfter().isBefore(serverDate)) {
    -				LOG.error("Token date expired (getNotOnOrAfter =  "
    -						+ assertion.getConditions().getNotOnOrAfter()
    -						+ ", server_date: " + serverDate + ")");
    -				throw new STORKSAMLEngineException(
    -						"Token date expired (getNotOnOrAfter =  "
    -						+ assertion.getConditions().getNotOnOrAfter()
    -						+ " ), server_date: " + serverDate);
    +				LOG.error("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + ", server_date: " + serverDate + ")");
    +				throw new STORKSAMLEngineException("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + " ), server_date: " + serverDate);
     			}
     
     			LOG.debug("Set notOnOrAfter.");
    -			authnResponse.setNotOnOrAfter(assertion.getConditions()
    -					.getNotOnOrAfter());
    +			authnResponse.setNotOnOrAfter(assertion.getConditions().getNotOnOrAfter());
     
     			LOG.debug("Set notBefore.");
     			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
     
     			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
     
    -			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion
    -					.getConditions().getAudienceRestrictions().get(0))
    -					.getAudiences().get(0).getAudienceURI());
    +			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion.getConditions().getAudienceRestrictions().get(0)).getAudiences().get(0).getAudienceURI());
     			authnResponse.setAssertions(samlResponse.getAssertions());
     		}
    -		
    +
     		// Case no error.
    -		if (assertion!=null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse
    -				.getStatusCode())) {
    +		if (assertion != null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse.getStatusCode())) {
     			LOG.debug("Status Success. Set PersonalAttributeList.");
    -			authnResponse
    -			.setPersonalAttributeList(generatePersonalAttributeList(assertion));
    +			authnResponse.setPersonalAttributeList(generatePersonalAttributeList(assertion));
     			authnResponse.setFail(false);
     		} else {
     			LOG.debug("Status Fail.");
     			authnResponse.setFail(true);
    -		}		
    +		}
     		LOG.debug("Return result.");
     		return authnResponse;
     
     	}
    -	
    +
     	/**
     	 * Validate stork authentication response.
     	 * 
    -	 * @param tokenSaml the token SAML
    -	 * @param userIP the user IP
    +	 * @param tokenSaml
    +	 *            the token SAML
    +	 * @param userIP
    +	 *            the user IP
     	 * 
     	 * @return the Stork authentication response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAuthnResponse validateSTORKAuthnResponseWithQuery(
    -			final byte[] tokenSaml, final String userIP)
    -	throws STORKSAMLEngineException {
    +	public STORKAuthnResponse validateSTORKAuthnResponseWithQuery(final byte[] tokenSaml, final String userIP) throws STORKSAMLEngineException {
     
     		LOG.info("validateSTORKAuthnResponse");
     		final Response samlResponse = (Response) validateStorkSaml(tokenSaml);
    @@ -3369,87 +3006,69 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		LOG.debug("Create StorkAuthResponse.");
     		final STORKAuthnResponse authnResponse = new STORKAuthnResponse();
     
    -		authnResponse.setCountry(this.getCountry(samlResponse.getSignature()
    -				.getKeyInfo()));
    +		authnResponse.setCountry(this.getCountry(samlResponse.getSignature().getKeyInfo()));
     
     		LOG.debug("Set ID.");
     		authnResponse.setSamlId(samlResponse.getID());
     		LOG.debug("Set InResponseTo.");
     		authnResponse.setInResponseTo(samlResponse.getInResponseTo());
     		LOG.debug("Set statusCode.");
    -		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode()
    -				.getValue());
    +		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode().getValue());
     
     		// Subordinate code.
     		if (samlResponse.getStatus().getStatusCode().getStatusCode() != null) {
    -			authnResponse.setSubStatusCode(samlResponse.getStatus()
    -					.getStatusCode().getStatusCode().getValue());
    +			authnResponse.setSubStatusCode(samlResponse.getStatus().getStatusCode().getStatusCode().getValue());
     		}
     
     		if (samlResponse.getStatus().getStatusMessage() != null) {
     			LOG.debug("Set statusMessage.");
    -			authnResponse.setMessage(samlResponse.getStatus()
    -					.getStatusMessage().getMessage());
    +			authnResponse.setMessage(samlResponse.getStatus().getStatusMessage().getMessage());
     		}
     
     		LOG.debug("validateStorkResponse");
    -		final Assertion assertion = (Assertion) validateStorkResponse(
    -				samlResponse, userIP);	
    -		
    -		if(assertion!=null){
    +		final Assertion assertion = (Assertion) validateStorkResponse(samlResponse, userIP);
    +
    +		if (assertion != null) {
     			final DateTime serverDate = new DateTime();
     
     			if (assertion.getConditions().getNotOnOrAfter().isBefore(serverDate)) {
    -				LOG.error("Token date expired (getNotOnOrAfter =  "
    -						+ assertion.getConditions().getNotOnOrAfter()
    -						+ ", server_date: " + serverDate + ")");
    -				throw new STORKSAMLEngineException(
    -						"Token date expired (getNotOnOrAfter =  "
    -						+ assertion.getConditions().getNotOnOrAfter()
    -						+ " ), server_date: " + serverDate);
    +				LOG.error("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + ", server_date: " + serverDate + ")");
    +				throw new STORKSAMLEngineException("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + " ), server_date: " + serverDate);
     			}
     
     			LOG.debug("Set notOnOrAfter.");
    -			authnResponse.setNotOnOrAfter(assertion.getConditions()
    -					.getNotOnOrAfter());
    +			authnResponse.setNotOnOrAfter(assertion.getConditions().getNotOnOrAfter());
     
     			LOG.debug("Set notBefore.");
     			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
     
     			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
     
    -			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion
    -					.getConditions().getAudienceRestrictions().get(0))
    -					.getAudiences().get(0).getAudienceURI());
    +			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion.getConditions().getAudienceRestrictions().get(0)).getAudiences().get(0).getAudienceURI());
     		}
    -		
    +
     		// Case no error.
    -		if (assertion!=null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse
    -				.getStatusCode())) {
    +		if (assertion != null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse.getStatusCode())) {
     			LOG.debug("Status Success. Set PersonalAttributeList.");
    -			authnResponse
    -			.setPersonalAttributeList(generatePersonalAttributeList(assertion));
    +			authnResponse.setPersonalAttributeList(generatePersonalAttributeList(assertion));
     			authnResponse.setFail(false);
     		} else {
     			LOG.debug("Status Fail.");
     			authnResponse.setFail(true);
     		}
    -		
    +
     		authnResponse.setAssertions(samlResponse.getAssertions());
    -		if (samlResponse.getAssertions().size() > 1)
    -		{
    +		if (samlResponse.getAssertions().size() > 1) {
     			PersonalAttributeList total = new PersonalAttributeList();
     			List attrList = new ArrayList();
    -			for (int i = 0; i < samlResponse.getAssertions().size(); i++)
    -			{
    -				Assertion tempAssertion = (Assertion)samlResponse.getAssertions().get(i);
    +			for (int i = 0; i < samlResponse.getAssertions().size(); i++) {
    +				Assertion tempAssertion = (Assertion) samlResponse.getAssertions().get(i);
     				IPersonalAttributeList temp = generatePersonalAttributeList(tempAssertion);
    -				if (temp != null)
    -				{ 
    +				if (temp != null) {
     					attrList.add(temp);
     					for (PersonalAttribute attribute : temp) {
    -						PersonalAttribute attr = (PersonalAttribute)attribute.clone();
    -						attr.setName(attr.getName()+tempAssertion.getID());
    +						PersonalAttribute attr = (PersonalAttribute) attribute.clone();
    +						attr.setName(attr.getName() + tempAssertion.getID());
     						total.add(attr);
     					}
     				}
    @@ -3457,25 +3076,26 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			authnResponse.setPersonalAttributeLists(attrList);
     			authnResponse.setTotalPersonalAttributeList(total);
     		}
    -		
    +
     		LOG.debug("Return result.");
     		return authnResponse;
     
     	}
    -	
    +
     	/**
     	 * Validate stork attribute query response.
     	 * 
    -	 * @param tokenSaml the token SAML
    -	 * @param userIP the user IP
    +	 * @param tokenSaml
    +	 *            the token SAML
    +	 * @param userIP
    +	 *            the user IP
     	 * 
     	 * @return the Stork attribute query response
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	public STORKAttrQueryResponse validateSTORKAttrQueryResponse(
    -			final byte[] tokenSaml, final String userIP)
    -	throws STORKSAMLEngineException {
    +	public STORKAttrQueryResponse validateSTORKAttrQueryResponse(final byte[] tokenSaml, final String userIP) throws STORKSAMLEngineException {
     
     		LOG.info("validateSTORKAttrQueryResponse");
     		final Response samlResponse = (Response) validateStorkSaml(tokenSaml);
    @@ -3483,90 +3103,71 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		LOG.debug("Create StorkAttrQueryResponse.");
     		final STORKAttrQueryResponse attrQueryResponse = new STORKAttrQueryResponse();
     
    -		attrQueryResponse.setCountry(this.getCountry(samlResponse.getSignature()
    -				.getKeyInfo()));
    +		attrQueryResponse.setCountry(this.getCountry(samlResponse.getSignature().getKeyInfo()));
     
     		LOG.debug("Set ID.");
     		attrQueryResponse.setSamlId(samlResponse.getID());
     		LOG.debug("Set InResponseTo.");
     		attrQueryResponse.setInResponseTo(samlResponse.getInResponseTo());
     		LOG.debug("Set statusCode.");
    -		attrQueryResponse.setStatusCode(samlResponse.getStatus().getStatusCode()
    -				.getValue());
    -		
    +		attrQueryResponse.setStatusCode(samlResponse.getStatus().getStatusCode().getValue());
     
     		// Subordinate code.
     		if (samlResponse.getStatus().getStatusCode().getStatusCode() != null) {
    -			attrQueryResponse.setSubStatusCode(samlResponse.getStatus()
    -					.getStatusCode().getStatusCode().getValue());
    +			attrQueryResponse.setSubStatusCode(samlResponse.getStatus().getStatusCode().getStatusCode().getValue());
     		}
     
     		if (samlResponse.getStatus().getStatusMessage() != null) {
     			LOG.debug("Set statusMessage.");
    -			attrQueryResponse.setMessage(samlResponse.getStatus()
    -					.getStatusMessage().getMessage());
    +			attrQueryResponse.setMessage(samlResponse.getStatus().getStatusMessage().getMessage());
     		}
     
     		LOG.debug("validateStorkResponse");
    -		final Assertion assertion = (Assertion) validateStorkResponse(
    -				samlResponse, userIP);	
    -		
    -		if(assertion!=null){
    +		final Assertion assertion = (Assertion) validateStorkResponse(samlResponse, userIP);
    +
    +		if (assertion != null) {
     			final DateTime serverDate = new DateTime();
     
     			attrQueryResponse.setAssertion(assertion);
     
     			if (assertion.getConditions().getNotOnOrAfter().isBefore(serverDate)) {
    -				LOG.error("Token date expired (getNotOnOrAfter =  "
    -						+ assertion.getConditions().getNotOnOrAfter()
    -						+ ", server_date: " + serverDate + ")");
    -				throw new STORKSAMLEngineException(
    -						"Token date expired (getNotOnOrAfter =  "
    -						+ assertion.getConditions().getNotOnOrAfter()
    -						+ " ), server_date: " + serverDate);
    +				LOG.error("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + ", server_date: " + serverDate + ")");
    +				throw new STORKSAMLEngineException("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + " ), server_date: " + serverDate);
     			}
     
     			LOG.debug("Set notOnOrAfter.");
    -			attrQueryResponse.setNotOnOrAfter(assertion.getConditions()
    -					.getNotOnOrAfter());
    +			attrQueryResponse.setNotOnOrAfter(assertion.getConditions().getNotOnOrAfter());
     
     			LOG.debug("Set notBefore.");
     			attrQueryResponse.setNotBefore(assertion.getConditions().getNotBefore());
     
     			attrQueryResponse.setNotBefore(assertion.getConditions().getNotBefore());
     
    -			attrQueryResponse.setAudienceRestriction(((AudienceRestriction) assertion
    -					.getConditions().getAudienceRestrictions().get(0))
    -					.getAudiences().get(0).getAudienceURI());
    +			attrQueryResponse.setAudienceRestriction(((AudienceRestriction) assertion.getConditions().getAudienceRestrictions().get(0)).getAudiences().get(0).getAudienceURI());
     		}
    -		
    +
     		// Case no error.
    -		if (assertion!=null && StatusCode.SUCCESS_URI.equalsIgnoreCase(attrQueryResponse
    -				.getStatusCode())) {
    +		if (assertion != null && StatusCode.SUCCESS_URI.equalsIgnoreCase(attrQueryResponse.getStatusCode())) {
     			LOG.debug("Status Success. Set PersonalAttributeList.");
    -			attrQueryResponse
    -			.setPersonalAttributeList(generatePersonalAttributeList(assertion));
    +			attrQueryResponse.setPersonalAttributeList(generatePersonalAttributeList(assertion));
     			attrQueryResponse.setFail(false);
     		} else {
     			LOG.debug("Status Fail.");
     			attrQueryResponse.setFail(true);
     		}
    -		
    +
     		attrQueryResponse.setAssertions(samlResponse.getAssertions());
    -		if (samlResponse.getAssertions().size() > 1)
    -		{
    +		if (samlResponse.getAssertions().size() > 1) {
     			PersonalAttributeList total = new PersonalAttributeList();
     			List attrList = new ArrayList();
    -			for (int i = 0; i < samlResponse.getAssertions().size(); i++)
    -			{
    -				Assertion tempAssertion = (Assertion)samlResponse.getAssertions().get(i);
    +			for (int i = 0; i < samlResponse.getAssertions().size(); i++) {
    +				Assertion tempAssertion = (Assertion) samlResponse.getAssertions().get(i);
     				IPersonalAttributeList temp = generatePersonalAttributeList(tempAssertion);
    -				if (temp != null)
    -				{ 
    +				if (temp != null) {
     					attrList.add(temp);
     					for (PersonalAttribute attribute : temp) {
    -						PersonalAttribute attr = (PersonalAttribute)attribute.clone();
    -						attr.setName(attr.getName()+tempAssertion.getID());
    +						PersonalAttribute attr = (PersonalAttribute) attribute.clone();
    +						attr.setName(attr.getName() + tempAssertion.getID());
     						total.add(attr);
     					}
     				}
    @@ -3574,7 +3175,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			attrQueryResponse.setPersonalAttributeLists(attrList);
     			attrQueryResponse.setTotalPersonalAttributeList(total);
     		}
    -		
    +
     		LOG.debug("Return result.");
     		return attrQueryResponse;
     
    @@ -3583,61 +3184,50 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Validate stork response.
     	 * 
    -	 * @param samlResponse the SAML response
    -	 * @param userIP the user IP
    +	 * @param samlResponse
    +	 *            the SAML response
    +	 * @param userIP
    +	 *            the user IP
     	 * 
     	 * @return the assertion
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private Assertion validateStorkResponse(final Response samlResponse,
    -			final String userIP) throws STORKSAMLEngineException {
    +	private Assertion validateStorkResponse(final Response samlResponse, final String userIP) throws STORKSAMLEngineException {
     		// Exist only one Assertion
     
    -		if (samlResponse.getAssertions() == null
    -				|| samlResponse.getAssertions().isEmpty()) {
    -			LOG.info("Assertion is null or empty."); //in replace of throw new STORKSAMLEngineException("Assertion is null or empty.")
    +		if (samlResponse.getAssertions() == null || samlResponse.getAssertions().isEmpty()) {
    +			LOG.info("Assertion is null or empty."); // in replace of throw new STORKSAMLEngineException("Assertion is null or empty.")
     			return null;
     		}
     
    -		final Assertion assertion = (Assertion) samlResponse.getAssertions()
    -		.get(0);
    +		final Assertion assertion = (Assertion) samlResponse.getAssertions().get(0);
     
     		LOG.debug("Verified method Bearer");
    -		for (final Iterator iter = assertion.getSubject()
    -				.getSubjectConfirmations().iterator(); iter.hasNext();) {
    +		for (final Iterator iter = assertion.getSubject().getSubjectConfirmations().iterator(); iter.hasNext();) {
     			final SubjectConfirmation element = iter.next();
    -			final boolean isBearer = SubjectConfirmation.METHOD_BEARER
    -			.equals(element.getMethod());
    +			final boolean isBearer = SubjectConfirmation.METHOD_BEARER.equals(element.getMethod());
     
    -			final boolean ipValidate = super.getSamlCoreProperties()
    -			.isIpValidation();
    +			final boolean ipValidate = super.getSamlCoreProperties().isIpValidation();
     
     			if (ipValidate) {
     				if (isBearer) {
     					if (StringUtils.isBlank(userIP)) {
     						LOG.error("browser_ip is null or empty.");
    -						throw new STORKSAMLEngineException(
    -						"browser_ip is null or empty.");
    -					} else if (StringUtils.isBlank(element
    -							.getSubjectConfirmationData().getAddress())) {
    +						throw new STORKSAMLEngineException("browser_ip is null or empty.");
    +					} else if (StringUtils.isBlank(element.getSubjectConfirmationData().getAddress())) {
     						LOG.error("token_ip attribute is null or empty.");
    -						throw new STORKSAMLEngineException(
    -						"token_ip attribute is null or empty.");
    +						throw new STORKSAMLEngineException("token_ip attribute is null or empty.");
     					}
     				}
     
    -				final boolean ipEqual = element.getSubjectConfirmationData()
    -				.getAddress().equals(userIP);
    +				final boolean ipEqual = element.getSubjectConfirmationData().getAddress().equals(userIP);
     
     				// Validation ipUser
     				if (!ipEqual && ipValidate) {
     					LOG.error("SubjectConfirmation BEARER: ");
    -					throw new STORKSAMLEngineException(
    -							"IPs doesn't match : token_ip ("
    -							+ element.getSubjectConfirmationData()
    -							.getAddress() + ") browser_ip ("
    -							+ userIP + ")");
    +					throw new STORKSAMLEngineException("IPs doesn't match : token_ip (" + element.getSubjectConfirmationData().getAddress() + ") browser_ip (" + userIP + ")");
     				}
     			}
     
    @@ -3648,27 +3238,27 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	/**
     	 * Validate stork SAML.
     	 * 
    -	 * @param tokenSaml the token SAML
    +	 * @param tokenSaml
    +	 *            the token SAML
     	 * 
     	 * @return the signable SAML object
     	 * 
    -	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
     	 */
    -	private SignableSAMLObject validateStorkSaml(final byte[] tokenSaml)
    -	throws STORKSAMLEngineException {
    +	private SignableSAMLObject validateStorkSaml(final byte[] tokenSaml) throws STORKSAMLEngineException {
     
     		LOG.info("Validate StorkSaml message.");
     
     		if (tokenSaml == null) {
     			LOG.error("Saml authentication request is null.");
    -			throw new STORKSAMLEngineException(
    -			"Saml authentication request is null.");
    +			throw new STORKSAMLEngineException("Saml authentication request is null.");
     		}
     
     		LOG.debug("Generate AuthnRequest from request.");
     		SignableSAMLObject samlObject;
     
    -		try {			
    +		try {
     			samlObject = (SignableSAMLObject) super.unmarshall(tokenSaml);
     		} catch (SAMLEngineException e) {
     			LOG.error("SAMLEngineException unmarshall.", e);
    @@ -3677,10 +3267,8 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		boolean validateSign = true;
     
    -		if (StringUtils.isNotBlank(super.getSamlCoreProperties().getProperty(
    -		"validateSignature"))) {
    -			validateSign = Boolean.valueOf(super.getSamlCoreProperties()
    -					.getProperty("validateSignature"));
    +		if (StringUtils.isNotBlank(super.getSamlCoreProperties().getProperty("validateSignature"))) {
    +			validateSign = Boolean.valueOf(super.getSamlCoreProperties().getProperty("validateSignature"));
     		}
     
     		if (validateSign) {
    @@ -3694,22 +3282,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		}
     
     		LOG.debug("Validate Schema.");
    -		final ValidatorSuite validatorSuite = Configuration
    -		.getValidatorSuite("saml2-core-schema-validator");
    -		try {			
    -			if (samlObject.getElementQName().toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
    -			{
    -				CustomAttributeQueryValidator val = 
    -					new CustomAttributeQueryValidator();
    -				val.validate((CustomAttributeQuery)samlObject);
    -			}
    -			else if (samlObject instanceof Response 
    -					&& ((Response) samlObject).getAssertions().size() > 1) {
    -							 MultipleAssertionResponseValidator val = 
    -									 new MultipleAssertionResponseValidator();
    -							 val.validate((Response)samlObject);
    -			}
    -			else
    +		final ValidatorSuite validatorSuite = Configuration.getValidatorSuite("saml2-core-schema-validator");
    +		try {
    +			if (samlObject.getElementQName().toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
    +				CustomAttributeQueryValidator val = new CustomAttributeQueryValidator();
    +				val.validate((CustomAttributeQuery) samlObject);
    +			} else if (samlObject instanceof Response && ((Response) samlObject).getAssertions().size() > 1) {
    +				MultipleAssertionResponseValidator val = new MultipleAssertionResponseValidator();
    +				val.validate((Response) samlObject);
    +			} else
     				validatorSuite.validate(samlObject);
     		} catch (ValidationException e) {
     			LOG.error("ValidationException.", e);
    @@ -3718,27 +3299,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		return samlObject;
     	}
    -	
    -	private boolean isComplex(XMLObject xmlObject)
    -	{
    +
    +	private boolean isComplex(XMLObject xmlObject) {
     		boolean isComplex = false;
    -		
    +
     		final XSAnyImpl complexValue = (XSAnyImpl) xmlObject;
     
    -		for (int nextComplexValue = 0; nextComplexValue < complexValue
    -				.getUnknownXMLObjects().size(); nextComplexValue++) {
    +		for (int nextComplexValue = 0; nextComplexValue < complexValue.getUnknownXMLObjects().size(); nextComplexValue++) {
     
    -			final XSAnyImpl simple = (XSAnyImpl) complexValue
    -					.getUnknownXMLObjects().get(
    -							nextComplexValue);
    -			
    -			if (simple.getElementQName().getLocalPart() != null)
    -			{
    +			final XSAnyImpl simple = (XSAnyImpl) complexValue.getUnknownXMLObjects().get(nextComplexValue);
    +
    +			if (simple.getElementQName().getLocalPart() != null) {
     				isComplex = true;
     				break;
     			}
     		}
    -		
    +
     		return isComplex;
    -	}	
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
    index 724a522d1..175084048 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
    @@ -11,59 +11,53 @@ import org.slf4j.LoggerFactory;
      * @author vanegdi
      * @version $Revision: 1.00 $, $Date: 2013-05-24 20:53:51 $
      */
    -public final class X509PrincipalUtil{
    +public final class X509PrincipalUtil {
     
    -    private static final DERObjectIdentifier[] DER_OBJECT_IDENTIFIERS_ARRAY= {
    -            X509Principal.CN,
    -            X509Principal.OU,
    -            X509Principal.O,
    -            X509Principal.L,
    -            X509Principal.ST,
    -            X509Principal.C,
    -            X509Principal.E
    -    };
    -    
    -    private static final Logger LOG = LoggerFactory.getLogger(eu.stork.peps.auth.engine.X509PrincipalUtil.class);
    +	private static final DERObjectIdentifier[] DER_OBJECT_IDENTIFIERS_ARRAY = { X509Principal.CN, X509Principal.OU, X509Principal.O, X509Principal.L, X509Principal.ST, X509Principal.C,
    +			X509Principal.E };
     
    -    /**
    -     * Compares 2 X509Principals to detect if they equals
    -     * @param principal1
    -     * @param principal2
    -     * @return true if arguments are not null and equals
    -     */
    -    public static boolean equals(X509Principal principal1, X509Principal principal2) {
    -        boolean continueProcess = true;
    -        if (principal1 == null || principal2 == null){
    -            return false;
    -        }
    -        
    -        int cpt = 0;
    -        while(continueProcess && cpt < DER_OBJECT_IDENTIFIERS_ARRAY.length){
    -            continueProcess = continueProcess && x509ValuesByIdentifierEquals(principal1, principal2, DER_OBJECT_IDENTIFIERS_ARRAY[cpt]);
    -            cpt++;
    -        }
    -        return continueProcess;
    -    }
    -    
    -    public static boolean equals2(X509Principal principal1, X509Principal principal2) {
    -        
    -        if (principal1 == null || principal2 == null){
    -            return false;
    -        }
    -        
    -        if (principal1.getName().equals(principal2.getName()))
    -        	return true;
    -        else
    -        	return false;
    -        
    -    }
    +	private static final Logger LOG = LoggerFactory.getLogger(eu.stork.peps.auth.engine.X509PrincipalUtil.class);
     
    -    private static boolean x509ValuesByIdentifierEquals(X509Principal principal1, X509Principal principal2, DERObjectIdentifier identifier){
    -        return principal1.getValues(identifier).equals(principal2.getValues(identifier));
    -    }
    +	/**
    +	 * Compares 2 X509Principals to detect if they equals
    +	 * 
    +	 * @param principal1
    +	 * @param principal2
    +	 * @return true if arguments are not null and equals
    +	 */
    +	public static boolean equals(X509Principal principal1, X509Principal principal2) {
    +		boolean continueProcess = true;
    +		if (principal1 == null || principal2 == null) {
    +			return false;
    +		}
     
    -    private X509PrincipalUtil(){
    -        // default contructor
    -        LOG.error("Fake X509PrincipalUtil : never be called");
    -    }
    +		int cpt = 0;
    +		while (continueProcess && cpt < DER_OBJECT_IDENTIFIERS_ARRAY.length) {
    +			continueProcess = continueProcess && x509ValuesByIdentifierEquals(principal1, principal2, DER_OBJECT_IDENTIFIERS_ARRAY[cpt]);
    +			cpt++;
    +		}
    +		return continueProcess;
    +	}
    +
    +	public static boolean equals2(X509Principal principal1, X509Principal principal2) {
    +
    +		if (principal1 == null || principal2 == null) {
    +			return false;
    +		}
    +
    +		if (principal1.getName().equals(principal2.getName()))
    +			return true;
    +		else
    +			return false;
    +
    +	}
    +
    +	private static boolean x509ValuesByIdentifierEquals(X509Principal principal1, X509Principal principal2, DERObjectIdentifier identifier) {
    +		return principal1.getValues(identifier).equals(principal2.getValues(identifier));
    +	}
    +
    +	private X509PrincipalUtil() {
    +		// default contructor
    +		LOG.error("Fake X509PrincipalUtil : never be called");
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java
    index a9efe6362..3821f3c06 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java
    @@ -21,37 +21,35 @@ import org.opensaml.common.SAMLObject;
     
     /**
      * The Interface AuthenticationAttributes.
    + * 
      * @author fjquevedo
      */
     public interface AuthenticationAttributes extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "AuthenticationAttributes";
    -
    -    /** Default element name. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "AuthenticationAttributes";
     
    -    /** Local name of the XSI type. */
    -    String TYPE_LOCAL_NAME = "AuthenticationAttributesType";
    +	/** Default element name. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    -    /** QName of the XSI type. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** Local name of the XSI type. */
    +	String TYPE_LOCAL_NAME = "AuthenticationAttributesType";
     
    +	/** QName of the XSI type. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    -    /**
    -     * Gets the citizen country code.
    -     * 
    -     * @return the citizen country code
    -     */
    -    VIDPAuthenticationAttributes getVIDPAuthenticationAttributes();
    -    
    +	/**
    +	 * Gets the citizen country code.
    +	 * 
    +	 * @return the citizen country code
    +	 */
    +	VIDPAuthenticationAttributes getVIDPAuthenticationAttributes();
     
    -    /**
    -     * Sets the vIDP authentication attributes.
    -     * 
    -     * @param newVIDPAuthenticationAttr the new vIDP authentication attributes
    -     */
    -    void setVIDPAuthenticationAttributes(VIDPAuthenticationAttributes newVIDPAuthenticationAttr);
    +	/**
    +	 * Sets the vIDP authentication attributes.
    +	 * 
    +	 * @param newVIDPAuthenticationAttr
    +	 *            the new vIDP authentication attributes
    +	 */
    +	void setVIDPAuthenticationAttributes(VIDPAuthenticationAttributes newVIDPAuthenticationAttr);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java
    index 4af7524ea..95994695d 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java
    @@ -21,36 +21,35 @@ import org.opensaml.common.SAMLObject;
     
     /**
      * The Interface EIDCrossBorderShare.
    + * 
      * @author fjquevedo
      */
     public interface CitizenCountryCode extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "CitizenCountryCode";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "CitizenCountryCode";
     
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "CitizenCountryCodeType";
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "CitizenCountryCodeType";
     
    -    /**
    -     * Gets the SP country.
    -     * 
    -     * @return the sP country
    -     */
    -    String getCitizenCountryCode();
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    +	/**
    +	 * Gets the SP country.
    +	 * 
    +	 * @return the sP country
    +	 */
    +	String getCitizenCountryCode();
     
    -    /**
    -     * Sets the citizen country code.
    -     * 
    -     * @param citizenCountryCode the new citizen country code
    -     */
    -    void setCitizenCountryCode(String citizenCountryCode);
    +	/**
    +	 * Sets the citizen country code.
    +	 * 
    +	 * @param citizenCountryCode
    +	 *            the new citizen country code
    +	 */
    +	void setCitizenCountryCode(String citizenCountryCode);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
    index b558fc19d..d603c2293 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
    @@ -10,42 +10,40 @@ import org.opensaml.saml2.core.SubjectQuery;
     
     public interface CustomAttributeQuery extends CustomRequestAbstractType {
     	/** Element local name. */
    -    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeQuery";
    -
    -    /** Default element name. */
    -    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
    -            SAMLConstants.SAML20P_PREFIX);
    -
    -    /** Local name of the XSI type. */
    -    public static final String TYPE_LOCAL_NAME = "CustomAttributeQueryType";
    -
    -    /** QName of the XSI type. */
    -    public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME,
    -            SAMLConstants.SAML20P_PREFIX);
    -    
    -    /** AssertionConsumerServiceURL attribute name. */
    -    public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME 
    -    	= "AssertionConsumerServiceURL";
    -
    -    /**
    -     * Gets the Attributes of this query.
    -     * 
    -     * @return the list of Attributes of this query
    -     */
    -    public List getAttributes();       
    -    
    -    /**
    -     * Gets the Subject of this request.
    -     * 
    -     * @return the Subject of this request
    -     */
    -    public Subject getSubject();
    -
    -    /**
    -     * Sets the Subject of this request.
    -     * 
    -     * @param newSubject the Subject of this request
    -     */
    -    public void setSubject(Subject newSubject);
    +	public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeQuery";
    +
    +	/** Default element name. */
    +	public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
    +
    +	/** Local name of the XSI type. */
    +	public static final String TYPE_LOCAL_NAME = "CustomAttributeQueryType";
    +
    +	/** QName of the XSI type. */
    +	public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
    +
    +	/** AssertionConsumerServiceURL attribute name. */
    +	public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME = "AssertionConsumerServiceURL";
    +
    +	/**
    +	 * Gets the Attributes of this query.
    +	 * 
    +	 * @return the list of Attributes of this query
    +	 */
    +	public List getAttributes();
    +
    +	/**
    +	 * Gets the Subject of this request.
    +	 * 
    +	 * @return the Subject of this request
    +	 */
    +	public Subject getSubject();
    +
    +	/**
    +	 * Sets the Subject of this request.
    +	 * 
    +	 * @param newSubject
    +	 *            the Subject of this request
    +	 */
    +	public void setSubject(Subject newSubject);
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java
    index 77dd8c4a5..2dd36a4d9 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java
    @@ -10,167 +10,172 @@ import org.opensaml.saml2.common.Extensions;
     import org.opensaml.saml2.core.Issuer;
     
     public interface CustomRequestAbstractType extends SignableSAMLObject {
    -	
    +
     	/** Local name of the XSI type. */
    -    public static final String TYPE_LOCAL_NAME = "RequestAbstractType";
    -
    -    /** QName of the XSI type. */
    -    public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME,
    -            SAMLConstants.SAML20P_PREFIX);
    -
    -    /** ID attribute name. */
    -    public static final String ID_ATTRIB_NAME = "ID";
    -
    -    /** Version attribute name. */
    -    public static final String VERSION_ATTRIB_NAME = "Version";
    -
    -    /** IssueInstant attribute name. */
    -    public static final String ISSUE_INSTANT_ATTRIB_NAME = "IssueInstant";
    -
    -    /** Destination attribute name. */
    -    public static final String DESTINATION_ATTRIB_NAME = "Destination";
    -    
    -    /** Destination attribute name. */
    -    public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME = "AssertionConsumerServiceURL";
    -
    -    /** Consent attribute name. */
    -    public static final String CONSENT_ATTRIB_NAME = "Consent";
    -
    -    /** Unspecified consent URI. */
    -    public static final String UNSPECIFIED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unspecified";
    -
    -    /** Obtained consent URI. */
    -    public static final String OBTAINED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:obtained";
    -
    -    /** Prior consent URI. */
    -    public static final String PRIOR_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:prior";
    -
    -    /** Implicit consent URI. */
    -    public static final String IMPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
    -
    -    /** Explicit consent URI. */
    -    public static final String EXPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
    -
    -    /** Unavailable consent URI. */
    -    public static final String UNAVAILABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unavailable";
    -
    -    /** Inapplicable consent URI. */
    -    public static final String INAPPLICABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:inapplicable";
    -
    -    /**
    -     * Gets the SAML Version of this request.
    -     * 
    -     * @return the SAML Version of this request.
    -     */
    -    public SAMLVersion getVersion();
    -
    -    /**
    -     * Sets the SAML Version of this request.
    -     * 
    -     * @param newVersion the SAML Version of this request
    -     */
    -    public void setVersion(SAMLVersion newVersion);
    -
    -    /**
    -     * Gets the unique identifier of the request.
    -     * 
    -     * @return the unique identifier of the request
    -     */
    -    public String getID();
    -
    -    /**
    -     * Sets the unique identifier of the request.
    -     * 
    -     * @param newID the unique identifier of the request
    -     */
    -
    -    public void setID(String newID);
    -
    -    /**
    -     * Gets the date/time the request was issued.
    -     * 
    -     * @return the date/time the request was issued
    -     */
    -
    -    public DateTime getIssueInstant();
    -
    -    /**
    -     * Sets the date/time the request was issued.
    -     * 
    -     * @param newIssueInstant the date/time the request was issued
    -     */
    -    public void setIssueInstant(DateTime newIssueInstant);
    -
    -    /**
    -     * Gets the URI of the destination of the request.
    -     * 
    -     * @return the URI of the destination of the request
    -     */
    -    public String getDestination();
    -
    -    /**
    -     * Sets the URI of the destination of the request.
    -     * 
    -     * @param newDestination the URI of the destination of the request
    -     */
    -    public void setDestination(String newDestination);
    -    
    -    /**
    -     * Sets the index of the particular Assertion Consumer Service to which the response to this request should be
    -     * delivered.
    -     * 
    -     * @param newAssertionConsumerServiceIndex the new value of the AssertionConsumerServiceIndex attribute
    -     */
    -    public void setAssertionConsumerServiceURL(String newServiceUrl);
    -
    -    /**
    -     * Gets the URL of the particular Assertion Consumer Service to which the response to this request should be
    -     * delivered.
    -     * 
    -     * @return the value of the AssertionConsumerServiceURL attribute
    -     */
    -    public String getAssertionConsumerServiceURL();
    -
    -    /**
    -     * Gets the consent obtained from the principal for sending this request.
    -     * 
    -     * @return the consent obtained from the principal for sending this request
    -     */
    -    public String getConsent();
    -
    -    /**
    -     * Sets the consent obtained from the principal for sending this request.
    -     * 
    -     * @param newConsent the new consent obtained from the principal for sending this request
    -     */
    -    public void setConsent(String newConsent);
    -
    -    /**
    -     * Gets the issuer of this request.
    -     * 
    -     * @return the issuer of this request
    -     */
    -    public Issuer getIssuer();
    -
    -    /**
    -     * Sets the issuer of this request.
    -     * 
    -     * @param newIssuer the issuer of this request
    -     */
    -    public void setIssuer(Issuer newIssuer);
    -
    -    /**
    -     * Gets the Extensions of this request.
    -     * 
    -     * @return the Status of this request
    -     */
    -    public Extensions getExtensions();
    -
    -    /**
    -     * Sets the Extensions of this request.
    -     * 
    -     * @param newExtensions the Extensions of this request
    -     */
    -    public void setExtensions(Extensions newExtensions);
    +	public static final String TYPE_LOCAL_NAME = "RequestAbstractType";
    +
    +	/** QName of the XSI type. */
    +	public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
    +
    +	/** ID attribute name. */
    +	public static final String ID_ATTRIB_NAME = "ID";
    +
    +	/** Version attribute name. */
    +	public static final String VERSION_ATTRIB_NAME = "Version";
    +
    +	/** IssueInstant attribute name. */
    +	public static final String ISSUE_INSTANT_ATTRIB_NAME = "IssueInstant";
    +
    +	/** Destination attribute name. */
    +	public static final String DESTINATION_ATTRIB_NAME = "Destination";
    +
    +	/** Destination attribute name. */
    +	public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME = "AssertionConsumerServiceURL";
    +
    +	/** Consent attribute name. */
    +	public static final String CONSENT_ATTRIB_NAME = "Consent";
    +
    +	/** Unspecified consent URI. */
    +	public static final String UNSPECIFIED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unspecified";
    +
    +	/** Obtained consent URI. */
    +	public static final String OBTAINED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:obtained";
    +
    +	/** Prior consent URI. */
    +	public static final String PRIOR_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:prior";
    +
    +	/** Implicit consent URI. */
    +	public static final String IMPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
    +
    +	/** Explicit consent URI. */
    +	public static final String EXPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
    +
    +	/** Unavailable consent URI. */
    +	public static final String UNAVAILABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unavailable";
    +
    +	/** Inapplicable consent URI. */
    +	public static final String INAPPLICABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:inapplicable";
    +
    +	/**
    +	 * Gets the SAML Version of this request.
    +	 * 
    +	 * @return the SAML Version of this request.
    +	 */
    +	public SAMLVersion getVersion();
    +
    +	/**
    +	 * Sets the SAML Version of this request.
    +	 * 
    +	 * @param newVersion
    +	 *            the SAML Version of this request
    +	 */
    +	public void setVersion(SAMLVersion newVersion);
    +
    +	/**
    +	 * Gets the unique identifier of the request.
    +	 * 
    +	 * @return the unique identifier of the request
    +	 */
    +	public String getID();
    +
    +	/**
    +	 * Sets the unique identifier of the request.
    +	 * 
    +	 * @param newID
    +	 *            the unique identifier of the request
    +	 */
    +
    +	public void setID(String newID);
    +
    +	/**
    +	 * Gets the date/time the request was issued.
    +	 * 
    +	 * @return the date/time the request was issued
    +	 */
    +
    +	public DateTime getIssueInstant();
    +
    +	/**
    +	 * Sets the date/time the request was issued.
    +	 * 
    +	 * @param newIssueInstant
    +	 *            the date/time the request was issued
    +	 */
    +	public void setIssueInstant(DateTime newIssueInstant);
    +
    +	/**
    +	 * Gets the URI of the destination of the request.
    +	 * 
    +	 * @return the URI of the destination of the request
    +	 */
    +	public String getDestination();
    +
    +	/**
    +	 * Sets the URI of the destination of the request.
    +	 * 
    +	 * @param newDestination
    +	 *            the URI of the destination of the request
    +	 */
    +	public void setDestination(String newDestination);
    +
    +	/**
    +	 * Sets the index of the particular Assertion Consumer Service to which the response to this request should be delivered.
    +	 * 
    +	 * @param newAssertionConsumerServiceIndex
    +	 *            the new value of the AssertionConsumerServiceIndex attribute
    +	 */
    +	public void setAssertionConsumerServiceURL(String newServiceUrl);
    +
    +	/**
    +	 * Gets the URL of the particular Assertion Consumer Service to which the response to this request should be delivered.
    +	 * 
    +	 * @return the value of the AssertionConsumerServiceURL attribute
    +	 */
    +	public String getAssertionConsumerServiceURL();
    +
    +	/**
    +	 * Gets the consent obtained from the principal for sending this request.
    +	 * 
    +	 * @return the consent obtained from the principal for sending this request
    +	 */
    +	public String getConsent();
    +
    +	/**
    +	 * Sets the consent obtained from the principal for sending this request.
    +	 * 
    +	 * @param newConsent
    +	 *            the new consent obtained from the principal for sending this request
    +	 */
    +	public void setConsent(String newConsent);
    +
    +	/**
    +	 * Gets the issuer of this request.
    +	 * 
    +	 * @return the issuer of this request
    +	 */
    +	public Issuer getIssuer();
    +
    +	/**
    +	 * Sets the issuer of this request.
    +	 * 
    +	 * @param newIssuer
    +	 *            the issuer of this request
    +	 */
    +	public void setIssuer(Issuer newIssuer);
    +
    +	/**
    +	 * Gets the Extensions of this request.
    +	 * 
    +	 * @return the Status of this request
    +	 */
    +	public Extensions getExtensions();
    +
    +	/**
    +	 * Sets the Extensions of this request.
    +	 * 
    +	 * @param newExtensions
    +	 *            the Extensions of this request
    +	 */
    +	public void setExtensions(Extensions newExtensions);
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java
    index 03541ece1..423f0f342 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java
    @@ -21,38 +21,36 @@ import org.opensaml.common.SAMLObject;
     
     /**
      * The Interface EIDCrossBorderShare.
    + * 
      * @author fjquevedo
      */
     public interface EIDCrossBorderShare extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "eIDCrossBorderShare";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "eIDCrossBorderShareType";
    -
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -    
    -   
    -    /**
    -     * Gets the eID cross border share.
    -     *
    -     * @return the eID cross border share
    -     */
    -    String getEIDCrossBorderShare();
    -
    -
    -    /**
    -     * Sets the eID cross border share.
    -     *
    -     * @param eIDCrossBorderShare the new eID cross border share
    -     */
    -    void setEIDCrossBorderShare(String eIDCrossBorderShare);
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "eIDCrossBorderShare";
    +
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "eIDCrossBorderShareType";
    +
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the eID cross border share.
    +	 *
    +	 * @return the eID cross border share
    +	 */
    +	String getEIDCrossBorderShare();
    +
    +	/**
    +	 * Sets the eID cross border share.
    +	 *
    +	 * @param eIDCrossBorderShare
    +	 *            the new eID cross border share
    +	 */
    +	void setEIDCrossBorderShare(String eIDCrossBorderShare);
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java
    index 14c504510..260f91046 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java
    @@ -21,36 +21,36 @@ import org.opensaml.common.SAMLObject;
     
     /**
      * The Interface EIDCrossSectorShare.
    + * 
      * @author fjquevedo
      */
     public interface EIDCrossSectorShare extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String ELEM_LOCAL_NAME = "eIDCrossSectorShare";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), ELEM_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "eIDCrossSectorShareType";
    -
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -    
    -    /**
    -     * Gets the eID cross sector share.
    -     *
    -     * @return the eID cross sector share
    -     */
    -    String getEIDCrossSectorShare();
    -
    -    /**
    -     * Sets the eID cross sector share.
    -     *
    -     * @param eIDCrossSectorShare the new eID cross sector share
    -     */
    -    void setEIDCrossSectorShare(String eIDCrossSectorShare);
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String ELEM_LOCAL_NAME = "eIDCrossSectorShare";
    +
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), ELEM_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "eIDCrossSectorShareType";
    +
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the eID cross sector share.
    +	 *
    +	 * @return the eID cross sector share
    +	 */
    +	String getEIDCrossSectorShare();
    +
    +	/**
    +	 * Sets the eID cross sector share.
    +	 *
    +	 * @param eIDCrossSectorShare
    +	 *            the new eID cross sector share
    +	 */
    +	void setEIDCrossSectorShare(String eIDCrossSectorShare);
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java
    index 0202f000c..a5748d5f1 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java
    @@ -21,37 +21,36 @@ import org.opensaml.common.SAMLObject;
     
     /**
      * The Interface EIDSectorShare.
    + * 
      * @author fjquevedo
      */
     public interface EIDSectorShare extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "eIDSectorShare";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "eIDSectorShare";
    -
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -    
    -
    -    /**
    -     * Gets the eID sector share.
    -     *
    -     * @return the eID sector share
    -     */
    -    String getEIDSectorShare();
    -
    -    /**
    -     * Sets the eID sector share.
    -     *
    -     * @param eIDSectorShare the new eID sector share
    -     */
    -    void setEIDSectorShare(String eIDSectorShare);
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "eIDSectorShare";
    +
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "eIDSectorShare";
    +
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the eID sector share.
    +	 *
    +	 * @return the eID sector share
    +	 */
    +	String getEIDSectorShare();
    +
    +	/**
    +	 * Sets the eID sector share.
    +	 *
    +	 * @param eIDSectorShare
    +	 *            the new eID sector share
    +	 */
    +	void setEIDSectorShare(String eIDSectorShare);
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
    index d99d23896..22d472be9 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
    @@ -26,38 +26,37 @@ import org.opensaml.common.SAMLObject;
      */
     public interface QAAAttribute extends SAMLObject {
     
    -    /** Element local name. */
    -    String DEF_LOCAL_NAME = "QualityAuthenticationAssuranceLevel";
    -
    -    /** Default element name. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** Local name of the XSI type. */
    -    String TYPE_LOCAL_NAME = "QualityAuthenticationAssuranceLevelAbstractType";
    -
    -    /** QName of the XSI type. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** The minimum value allowed. */
    -    int MIN_VALUE = 1;
    -
    -    /** The Max value allowed. */
    -    int MAX_VALUE = 4;
    -
    -    /**
    -     * Gets the qAA level.
    -     * 
    -     * @return the qAA level
    -     */
    -    String getQaaLevel();
    -
    -    /**
    -     * Sets the qAA level.
    -     * 
    -     * @param qaaLevel the new qAA level
    -     * 
    -     */
    -    void setQaaLevel(String qaaLevel);
    +	/** Element local name. */
    +	String DEF_LOCAL_NAME = "QualityAuthenticationAssuranceLevel";
    +
    +	/** Default element name. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** Local name of the XSI type. */
    +	String TYPE_LOCAL_NAME = "QualityAuthenticationAssuranceLevelAbstractType";
    +
    +	/** QName of the XSI type. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** The minimum value allowed. */
    +	int MIN_VALUE = 1;
    +
    +	/** The Max value allowed. */
    +	int MAX_VALUE = 4;
    +
    +	/**
    +	 * Gets the qAA level.
    +	 * 
    +	 * @return the qAA level
    +	 */
    +	String getQaaLevel();
    +
    +	/**
    +	 * Sets the qAA level.
    +	 * 
    +	 * @param qaaLevel
    +	 *            the new qAA level
    +	 * 
    +	 */
    +	void setQaaLevel(String qaaLevel);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java
    index ffd32b3cf..955f6bef9 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java
    @@ -29,112 +29,113 @@ import org.opensaml.xml.XMLObject;
      * 
      * @author fjquevedo
      */
    -public interface RequestedAttribute extends SAMLObject,
    -	AttributeExtensibleXMLObject {
    -
    -    /** Element local name. */
    -    String DEF_LOCAL_NAME = "RequestedAttribute";
    -
    -    /** Default element name. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** Local name of the XSI type. */
    -    String TYPE_LOCAL_NAME = "RequestedAttributeAbstractType";
    -
    -    /** QName of the XSI type. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** NAME_ATTRIB_NAME attribute name. */
    -    String NAME_ATTRIB_NAME = "Name";
    -
    -    /** NAME_FORMAT_ATTRIB_NAME attribute name. */
    -    String NAME_FORMAT_ATTR = "NameFormat";
    -
    -    /** IS_REQUIRED_ATTRIB_NAME attribute name. */
    -    String IS_REQUIRED_ATTR = "isRequired";
    -
    -    /** FRIENDLY_NAME_ATTRIB_NAME attribute name. */
    -    String FRIENDLY_NAME_ATT = "FriendlyName";
    -
    -    /** Unspecified attribute format ID. */
    -    String UNSPECIFIED = "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified";
    -
    -    /** URI reference attribute format ID. */
    -    String URI_REFERENCE = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
    -
    -    /** Basic attribute format ID. */
    -    String BASIC = "urn:oasis:names:tc:SAML:2.0:attrname-format:basic";
    -
    -    /**
    -     * Gets the name.
    -     * 
    -     * @return the name
    -     */
    -    String getName();
    -
    -    /**
    -     * Sets the name.
    -     * 
    -     * @param name the new name
    -     */
    -    void setName(String name);
    -
    -    /**
    -     * Gets the name format.
    -     * 
    -     * @return the name format
    -     */
    -    String getNameFormat();
    -
    -    /**
    -     * Sets the name format.
    -     * 
    -     * @param nameFormat the new name format
    -     */
    -    void setNameFormat(String nameFormat);
    -
    -    /**
    -     * Gets the friendly name.
    -     * 
    -     * @return the friendly name
    -     */
    -    String getFriendlyName();
    -
    -    /**
    -     * Sets the friendly name.
    -     * 
    -     * @param friendlyName the new friendly name
    -     */
    -    void setFriendlyName(String friendlyName);
    -
    -    /**
    -     * Gets the checks if is required.
    -     * 
    -     * @return the checks if is required
    -     */
    -    String isRequired();
    -
    -    /**
    -     * Gets the checks if is required xs boolean.
    -     * 
    -     * @return the checks if is required xs boolean
    -     */
    -    String getIsRequiredXSBoolean();
    -
    -    /**
    -     * Sets the checks if is required.
    -     * 
    -     * @param newIsRequired the new checks if is required
    -     */
    -    void setIsRequired(String newIsRequired);
    -
    -    /**
    -     * Gets the attribute values.
    -     * 
    -     * @return the attribute values
    -     */
    -    List getAttributeValues();
    +public interface RequestedAttribute extends SAMLObject, AttributeExtensibleXMLObject {
    +
    +	/** Element local name. */
    +	String DEF_LOCAL_NAME = "RequestedAttribute";
    +
    +	/** Default element name. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** Local name of the XSI type. */
    +	String TYPE_LOCAL_NAME = "RequestedAttributeAbstractType";
    +
    +	/** QName of the XSI type. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** NAME_ATTRIB_NAME attribute name. */
    +	String NAME_ATTRIB_NAME = "Name";
    +
    +	/** NAME_FORMAT_ATTRIB_NAME attribute name. */
    +	String NAME_FORMAT_ATTR = "NameFormat";
    +
    +	/** IS_REQUIRED_ATTRIB_NAME attribute name. */
    +	String IS_REQUIRED_ATTR = "isRequired";
    +
    +	/** FRIENDLY_NAME_ATTRIB_NAME attribute name. */
    +	String FRIENDLY_NAME_ATT = "FriendlyName";
    +
    +	/** Unspecified attribute format ID. */
    +	String UNSPECIFIED = "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified";
    +
    +	/** URI reference attribute format ID. */
    +	String URI_REFERENCE = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
    +
    +	/** Basic attribute format ID. */
    +	String BASIC = "urn:oasis:names:tc:SAML:2.0:attrname-format:basic";
    +
    +	/**
    +	 * Gets the name.
    +	 * 
    +	 * @return the name
    +	 */
    +	String getName();
    +
    +	/**
    +	 * Sets the name.
    +	 * 
    +	 * @param name
    +	 *            the new name
    +	 */
    +	void setName(String name);
    +
    +	/**
    +	 * Gets the name format.
    +	 * 
    +	 * @return the name format
    +	 */
    +	String getNameFormat();
    +
    +	/**
    +	 * Sets the name format.
    +	 * 
    +	 * @param nameFormat
    +	 *            the new name format
    +	 */
    +	void setNameFormat(String nameFormat);
    +
    +	/**
    +	 * Gets the friendly name.
    +	 * 
    +	 * @return the friendly name
    +	 */
    +	String getFriendlyName();
    +
    +	/**
    +	 * Sets the friendly name.
    +	 * 
    +	 * @param friendlyName
    +	 *            the new friendly name
    +	 */
    +	void setFriendlyName(String friendlyName);
    +
    +	/**
    +	 * Gets the checks if is required.
    +	 * 
    +	 * @return the checks if is required
    +	 */
    +	String isRequired();
    +
    +	/**
    +	 * Gets the checks if is required xs boolean.
    +	 * 
    +	 * @return the checks if is required xs boolean
    +	 */
    +	String getIsRequiredXSBoolean();
    +
    +	/**
    +	 * Sets the checks if is required.
    +	 * 
    +	 * @param newIsRequired
    +	 *            the new checks if is required
    +	 */
    +	void setIsRequired(String newIsRequired);
    +
    +	/**
    +	 * Gets the attribute values.
    +	 * 
    +	 * @return the attribute values
    +	 */
    +	List getAttributeValues();
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java
    index 6e3da28c3..4527bfdb6 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java
    @@ -28,24 +28,22 @@ import org.opensaml.common.SAMLObject;
      */
     public interface RequestedAttributes extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "RequestedAttributes";
    -
    -    /** Default element name. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -
    -    /** Local name of the XSI type. */
    -    String TYPE_LOCAL_NAME = "RequestedAttributesType";
    -
    -    /** QName of the XSI type. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    -
    -    /**
    -     * Gets the attributes.
    -     * 
    -     * @return the attributes
    -     */
    -    List getAttributes();
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "RequestedAttributes";
    +
    +	/** Default element name. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/** Local name of the XSI type. */
    +	String TYPE_LOCAL_NAME = "RequestedAttributesType";
    +
    +	/** QName of the XSI type. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the attributes.
    +	 * 
    +	 * @return the attributes
    +	 */
    +	List getAttributes();
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
    index cbedcf7d9..922e7e61e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
    @@ -22,77 +22,78 @@ package eu.stork.peps.auth.engine.core;
      */
     
     public enum SAMLCore {
    -    
    -    /** The consent authentication request. */
    -    CONSENT_AUTHN_REQ("consentAuthnRequest"),
    -    
    -    /** The consent authentication response. */
    -    CONSENT_AUTHN_RES("consentAuthnResponse"),
    -    
    -    /** The FORC e_ auth n_ tag. */
    -    FORCE_AUTHN_TAG("forceAuthN"),
    -    
    -    /** The I s_ passiv e_ tag. */
    -    IS_PASSIVE_TAG("isPassive"),
    -    
    -    /** The FORMA t_ entity. */
    -    FORMAT_ENTITY("formatEntity"),
    -    
    -    /** The FRIENDLY name. */
    -    FRIENDLY_NAME("friendlyName"),
    -    
    -    /** The IS_REQUIRED AN ATTRIBUTE */
    -    IS_REQUIRED("isRequired"),
    -    
    -    /** The PRO t_ bindin g_ tag. */
    -    PROT_BINDING_TAG("protocolBinding"),
    -    
    -    /** The ASSER t_ con s_ tag. */
    -    ASSERT_CONS_TAG("assertionConsumerServiceURL"),
    -    
    -    /** The REQUESTE r_ tag. */
    -    REQUESTER_TAG("requester"),
    -    
    -    /** The RESPONDE r_ tag. */
    -    RESPONDER_TAG("responder"),
    -    
    -    /** The STOR k10_ ns. */
    -    STORK10_NS("urn:eu:stork:names:tc:STORK:1.0:assertion"),
    -    
    -    /** The STOR k10 p_ ns. */
    -    STORK10P_NS("urn:eu:stork:names:tc:STORK:1.0:protocol"),
    -    
    -    /** The STOR k10_ prefix. */
    -    STORK10_PREFIX("stork"),
    -    
    -    /** The STOR k10 p_ prefix. */
    -    STORK10P_PREFIX("storkp"),
    -    
    -    /** The STOR k10_ bas e_ uri. */
    -    STORK10_BASE_URI("http://www.stork.gov.eu/1.0/"),
    -    
    -    /** The ON e_ tim e_ use. */
    -    ONE_TIME_USE("oneTimeUse");
    -
    -    /** The value. */
    -    private String value;
    -
    -    /**
    -     * Instantiates a new sAML core.
    -     * 
    -     * @param fullName the full name
    -     */
    -    private SAMLCore(final String fullName) {
    -	this.value = fullName;
    -    }	
    -    
    -    /**
    -     * Gets the value.
    -     * 
    -     * @return the value
    -     */
    -    public String getValue() {
    -	return value;
    -    }
    +
    +	/** The consent authentication request. */
    +	CONSENT_AUTHN_REQ("consentAuthnRequest"),
    +
    +	/** The consent authentication response. */
    +	CONSENT_AUTHN_RES("consentAuthnResponse"),
    +
    +	/** The FORC e_ auth n_ tag. */
    +	FORCE_AUTHN_TAG("forceAuthN"),
    +
    +	/** The I s_ passiv e_ tag. */
    +	IS_PASSIVE_TAG("isPassive"),
    +
    +	/** The FORMA t_ entity. */
    +	FORMAT_ENTITY("formatEntity"),
    +
    +	/** The FRIENDLY name. */
    +	FRIENDLY_NAME("friendlyName"),
    +
    +	/** The IS_REQUIRED AN ATTRIBUTE */
    +	IS_REQUIRED("isRequired"),
    +
    +	/** The PRO t_ bindin g_ tag. */
    +	PROT_BINDING_TAG("protocolBinding"),
    +
    +	/** The ASSER t_ con s_ tag. */
    +	ASSERT_CONS_TAG("assertionConsumerServiceURL"),
    +
    +	/** The REQUESTE r_ tag. */
    +	REQUESTER_TAG("requester"),
    +
    +	/** The RESPONDE r_ tag. */
    +	RESPONDER_TAG("responder"),
    +
    +	/** The STOR k10_ ns. */
    +	STORK10_NS("urn:eu:stork:names:tc:STORK:1.0:assertion"),
    +
    +	/** The STOR k10 p_ ns. */
    +	STORK10P_NS("urn:eu:stork:names:tc:STORK:1.0:protocol"),
    +
    +	/** The STOR k10_ prefix. */
    +	STORK10_PREFIX("stork"),
    +
    +	/** The STOR k10 p_ prefix. */
    +	STORK10P_PREFIX("storkp"),
    +
    +	/** The STOR k10_ bas e_ uri. */
    +	STORK10_BASE_URI("http://www.stork.gov.eu/1.0/"),
    +
    +	/** The ON e_ tim e_ use. */
    +	ONE_TIME_USE("oneTimeUse");
    +
    +	/** The value. */
    +	private String value;
    +
    +	/**
    +	 * Instantiates a new sAML core.
    +	 * 
    +	 * @param fullName
    +	 *            the full name
    +	 */
    +	private SAMLCore(final String fullName) {
    +		this.value = fullName;
    +	}
    +
    +	/**
    +	 * Gets the value.
    +	 * 
    +	 * @return the value
    +	 */
    +	public String getValue() {
    +		return value;
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
    index e846983d8..8474eeedc 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
    @@ -30,59 +30,64 @@ import eu.stork.peps.exceptions.SAMLEngineException;
      */
     public interface SAMLEngineSignI {
     
    -    /**
    -     * Sign.
    -     * 
    -     * @param tokenSaml the token SAML
    -     * 
    -     * @return the sAML object
    -     * 
    -     * @throws SAMLEngineException the SAML engine exception
    -     */
    -    SAMLObject sign(SignableSAMLObject tokenSaml) throws SAMLEngineException;
    +	/**
    +	 * Sign.
    +	 * 
    +	 * @param tokenSaml
    +	 *            the token SAML
    +	 * 
    +	 * @return the sAML object
    +	 * 
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
    +	 */
    +	SAMLObject sign(SignableSAMLObject tokenSaml) throws SAMLEngineException;
     
    -    /**
    -     * Gets the certificate.
    -     * 
    -     * @return the certificate
    -     */
    -    X509Certificate getCertificate();
    +	/**
    +	 * Gets the certificate.
    +	 * 
    +	 * @return the certificate
    +	 */
    +	X509Certificate getCertificate();
     
    -    /**
    -     * Gets the trustStore used when validating SAMLTokens
    -     * 
    -     * @return the trustStore
    -     *   
    -     */
    +	/**
    +	 * Gets the trustStore used when validating SAMLTokens
    +	 * 
    +	 * @return the trustStore
    +	 * 
    +	 */
     	KeyStore getTrustStore();
    -	
    -    /**
    -     * Validate signature.
    -     * 
    -     * @param tokenSaml the token SAML
    -     * 
    -     * @return the sAML object
    -     * 
    -     * @throws SAMLEngineException the SAML engine exception
    -     */
    -    SAMLObject validateSignature(SignableSAMLObject tokenSaml)
    -	    throws SAMLEngineException;
     
    -    /**
    -     * Initialize the signature module.
    -     * 
    -     * @param fileConf the configuration file.
    -     * 
    -     * @throws SAMLEngineException the STORKSAML engine runtime
    -     *             exception
    -     */
    -    void init(String fileConf) throws SAMLEngineException;
    +	/**
    +	 * Validate signature.
    +	 * 
    +	 * @param tokenSaml
    +	 *            the token SAML
    +	 * 
    +	 * @return the sAML object
    +	 * 
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
    +	 */
    +	SAMLObject validateSignature(SignableSAMLObject tokenSaml) throws SAMLEngineException;
    +
    +	/**
    +	 * Initialize the signature module.
    +	 * 
    +	 * @param fileConf
    +	 *            the configuration file.
    +	 * 
    +	 * @throws SAMLEngineException
    +	 *             the STORKSAML engine runtime exception
    +	 */
    +	void init(String fileConf) throws SAMLEngineException;
    +
    +	/**
    +	 * Load cryptographic service provider.
    +	 * 
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
    +	 */
    +	void loadCryptServiceProvider() throws SAMLEngineException;
     
    -    /**
    -     * Load cryptographic service provider.
    -     * 
    -     * @throws SAMLEngineException the SAML engine exception
    -     */
    -    void loadCryptServiceProvider() throws SAMLEngineException;
    -    
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java
    index 9510bf790..82753b61f 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java
    @@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
      */
     public interface SPApplication extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "spApplication";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "spApplicationType";
    -
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /**
    -     * Gets the service provider application.
    -     * 
    -     * @return the service provider application
    -     */
    -    String getSPApplication();
    -
    -    /**
    -     * Sets the service provider application.
    -     * 
    -     * @param spApplication the new service provider application
    -     */
    -    void setSPApplication(String spApplication);
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "spApplication";
    +
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "spApplicationType";
    +
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the service provider application.
    +	 * 
    +	 * @return the service provider application
    +	 */
    +	String getSPApplication();
    +
    +	/**
    +	 * Sets the service provider application.
    +	 * 
    +	 * @param spApplication
    +	 *            the new service provider application
    +	 */
    +	void setSPApplication(String spApplication);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java
    index 829ace878..e04d817ca 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java
    @@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
      */
     public interface SPCountry extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "spCountry";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "spCountryType";
    -
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /**
    -     * Gets the service provider country.
    -     * 
    -     * @return the service provider country
    -     */
    -    String getSPCountry();
    -
    -    /**
    -     * Sets the service provider country.
    -     * 
    -     * @param spCountry the new service provider country
    -     */
    -    void setSPCountry(String spCountry);
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "spCountry";
    +
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "spCountryType";
    +
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the service provider country.
    +	 * 
    +	 * @return the service provider country
    +	 */
    +	String getSPCountry();
    +
    +	/**
    +	 * Sets the service provider country.
    +	 * 
    +	 * @param spCountry
    +	 *            the new service provider country
    +	 */
    +	void setSPCountry(String spCountry);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java
    index bd13f6dbf..8dad4d968 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java
    @@ -21,36 +21,35 @@ import org.opensaml.common.SAMLObject;
     
     /**
      * The Interface EIDCrossBorderShare.
    + * 
      * @author iinigo
      */
     public interface SPID extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "SPID";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "SPID";
     
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "SPIDType";
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "SPIDType";
     
    -    /**
    -     * Gets the SP ID.
    -     * 
    -     * @return the SP ID
    -     */
    -    String getSPID();
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    +	/**
    +	 * Gets the SP ID.
    +	 * 
    +	 * @return the SP ID
    +	 */
    +	String getSPID();
     
    -    /**
    -     * Sets the SP ID.
    -     * 
    -     * @param SPID the new SP ID
    -     */
    -    void setSPID(String newSPID);
    +	/**
    +	 * Sets the SP ID.
    +	 * 
    +	 * @param SPID
    +	 *            the new SP ID
    +	 */
    +	void setSPID(String newSPID);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java
    index bc870c2cc..8ad5b6eef 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java
    @@ -21,36 +21,35 @@ import org.opensaml.common.SAMLObject;
     
     /**
      * The Interface EIDCrossBorderShare.
    + * 
      * @author iinigo
      */
     public interface SPInformation extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "SPInformation";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "SPInformation";
     
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "SPInformationType";
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "SPInformationType";
     
    -    /**
    -     * Gets the SP Id.
    -     * 
    -     * @return the SP Id
    -     */
    -    SPID getSPID();
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    +	/**
    +	 * Gets the SP Id.
    +	 * 
    +	 * @return the SP Id
    +	 */
    +	SPID getSPID();
     
    -    /**
    -     * Sets the SP Id.
    -     * 
    -     * @param newSPId the new SP Id
    -     */
    -    void setSPID(SPID newSPID);
    +	/**
    +	 * Sets the SP Id.
    +	 * 
    +	 * @param newSPId
    +	 *            the new SP Id
    +	 */
    +	void setSPID(SPID newSPID);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java
    index add45023c..8a34a94ff 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java
    @@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
      */
     public interface SPInstitution extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "spInstitution";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "spInstitutionType";
    -
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /**
    -     * Gets the service provider institution.
    -     * 
    -     * @return the service provider institution
    -     */
    -    String getSPInstitution();
    -
    -    /**
    -     * Sets the service provider institution.
    -     * 
    -     * @param spInstitution the new service provider institution
    -     */
    -    void setSPInstitution(String spInstitution);
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "spInstitution";
    +
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "spInstitutionType";
    +
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the service provider institution.
    +	 * 
    +	 * @return the service provider institution
    +	 */
    +	String getSPInstitution();
    +
    +	/**
    +	 * Sets the service provider institution.
    +	 * 
    +	 * @param spInstitution
    +	 *            the new service provider institution
    +	 */
    +	void setSPInstitution(String spInstitution);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java
    index 8322a0d47..4b8af10cf 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java
    @@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
      */
     public interface SPSector extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "spSector";
    -
    -    /** The Constant DEFAULT_ELEMENT_NAME. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /** The Constant TYPE_LOCAL_NAME. */
    -    String TYPE_LOCAL_NAME = "spSectorType";
    -
    -    /** The Constant TYPE_NAME. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10_PREFIX.getValue());
    -
    -    /**
    -     * Gets the service provider sector.
    -     * 
    -     * @return the service provider sector
    -     */
    -    String getSPSector();
    -
    -    /**
    -     * Sets the service provider sector.
    -     * 
    -     * @param spSector the new service provider sector
    -     */
    -    void setSPSector(String spSector);
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "spSector";
    +
    +	/** The Constant DEFAULT_ELEMENT_NAME. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/** The Constant TYPE_LOCAL_NAME. */
    +	String TYPE_LOCAL_NAME = "spSectorType";
    +
    +	/** The Constant TYPE_NAME. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
    +
    +	/**
    +	 * Gets the service provider sector.
    +	 * 
    +	 * @return the service provider sector
    +	 */
    +	String getSPSector();
    +
    +	/**
    +	 * Sets the service provider sector.
    +	 * 
    +	 * @param spSector
    +	 *            the new service provider sector
    +	 */
    +	void setSPSector(String spSector);
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
    index 4c314ae68..13d2f0af4 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
    @@ -34,475 +34,471 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
      */
     public final class STORKSAMLCore {
     
    -    /** The Constant LOGGER. */
    -    private static final Logger LOGGER = LoggerFactory
    -    .getLogger(STORKSAMLCore.class.getName());
    +	/** The Constant LOGGER. */
    +	private static final Logger LOGGER = LoggerFactory.getLogger(STORKSAMLCore.class.getName());
     
    -    /** The consent authentication request. */
    -    private String consentAuthnReq = null;
    +	/** The consent authentication request. */
    +	private String consentAuthnReq = null;
     
    -    /** The consent authentication response. */
    -    private String consentAuthnResp = null;
    +	/** The consent authentication response. */
    +	private String consentAuthnResp = null;
     
    -    /** The id cross border share. */
    -    private String eIDCrossBordShare = null;
    +	/** The id cross border share. */
    +	private String eIDCrossBordShare = null;
     
    -    /** The e id cross sect share. */
    -    private String eIDCrossSectShare = null;
    +	/** The e id cross sect share. */
    +	private String eIDCrossSectShare = null;
     
    -    /** The e id sector share. */
    -    private String eIDSectorShare = null;
    +	/** The e id sector share. */
    +	private String eIDSectorShare = null;
     
    -    /** The format entity. */
    -    private String formatEntity = null;
    +	/** The format entity. */
    +	private String formatEntity = null;
     
    -    /** The friendly name. */
    -    private boolean friendlyName = false;
    +	/** The friendly name. */
    +	private boolean friendlyName = false;
     
    -    /** The IP validation. */
    -    private boolean ipValidation = false;
    +	/** The IP validation. */
    +	private boolean ipValidation = false;
     
    -    /** The one time use. */
    -    private boolean oneTimeUse = true;
    +	/** The one time use. */
    +	private boolean oneTimeUse = true;
     
    -    /** The protocol binding. */
    -    private String protocolBinding = null;
    +	/** The protocol binding. */
    +	private String protocolBinding = null;
     
    -    /** The requester. */
    -    private String requester = null;
    +	/** The requester. */
    +	private String requester = null;
     
    +	/** The responder. */
    +	private String responder = null;
     
    -    /** The responder. */
    -    private String responder = null;
    +	/** The SAML core properties. */
    +	private Properties samlCoreProp = null;
     
    -    /** The SAML core properties. */
    -    private Properties samlCoreProp = null;
    +	/** The time not on or after. */
    +	private Integer timeNotOnOrAfter = null;
     
    -    /** The time not on or after. */
    -    private Integer timeNotOnOrAfter = null;
    +	/** The is required parameter. */
    +	private boolean isRequired = true;
     
    -    /** The is required parameter. */
    -    private boolean isRequired = true;
    +	private static final String SAML_ENGINE_LITERAL = "SamlEngine.xml: ";
     
    -    private static final String SAML_ENGINE_LITERAL = "SamlEngine.xml: ";
    -
    -    /**
    -    * Gets the isRequired.
    -    *
    -    * @return the isRequired
    -    */
    -    public boolean isRequired() {
    -    	return isRequired;
    +	/**
    +	 * Gets the isRequired.
    +	 *
    +	 * @return the isRequired
    +	 */
    +	public boolean isRequired() {
    +		return isRequired;
     	}
     
    -    /**
    -     * Sets the isRequired.
    -     *
    -     * @param isRequired the required.
    -     */
    +	/**
    +	 * Sets the isRequired.
    +	 *
    +	 * @param isRequired
    +	 *            the required.
    +	 */
     	public void setRequired(boolean isRequired) {
     		this.isRequired = isRequired;
     	}
     
     	/**
    -     * Instantiates a new sAML core.
    -     *
    -     * @param instance the instance
    -     */
    -    public STORKSAMLCore(final Properties instance) {
    -	loadConfiguration(instance);
    -    }
    -
    -    /**
    -     * Gets the consent.
    -     * 
    -     * @return the consent
    -     */
    -    public String getConsentAuthnRequest() {
    -	return consentAuthnReq;
    -    }
    -
    -    /**
    -     * Gets the consent authentication response.
    -     * 
    -     * @return the consent authentication response.
    -     */
    -    public String getConsentAuthnResp() {
    -	return consentAuthnResp;
    -    }
    -
    -    /**
    -     * Gets the consent authentication response.
    -     * 
    -     * @return the consent authentication response
    -     */
    -    public String getConsentAuthnResponse() {
    -	return consentAuthnResp;
    -    }
    -
    -    /**
    -     * Gets the format entity.
    -     * 
    -     * @return the format entity
    -     */
    -    public String getFormatEntity() {
    -	return formatEntity;
    -    }
    -
    -    /**
    -     * Gets the property.
    -     * 
    -     * @param key the key
    -     * 
    -     * @return the property
    -     */
    -    public String getProperty(final String key) {
    -	return samlCoreProp.getProperty(key);
    -    }
    -
    -    /**
    -     * Gets the protocol binding.
    -     * 
    -     * @return the protocol binding
    -     */
    -    public String getProtocolBinding() {
    -	return protocolBinding;
    -    }
    -
    -    /**
    -     * Gets the requester.
    -     * 
    -     * @return the requester
    -     */
    -    public String getRequester() {
    -	return requester;
    -    }
    -
    -    /**
    -     * Gets the responder.
    -     * 
    -     * @return the responder
    -     */
    -    public String getResponder() {
    -	return responder;
    -    }
    -
    -    /**
    -     * Gets the time not on or after.
    -     * 
    -     * @return the time not on or after
    -     */
    -    public Integer getTimeNotOnOrAfter() {
    -	return timeNotOnOrAfter;
    -    }
    -
    -    /**
    -     * Checks if is e id cross border share.
    -     * 
    -     * @return true, if is e id cross border share
    -     */
    -    public String iseIDCrossBorderShare() {
    -	return eIDCrossBordShare;
    -    }
    -
    -    /**
    -     * Checks if is e id cross border share.
    -     * 
    -     * @return true, if is e id cross border share
    -     */
    -    public String iseIDCrossBordShare() {
    -	return eIDCrossBordShare;
    -    }
    -
    -    /**
    -     * Checks if is e id cross sector share.
    -     * 
    -     * @return true, if is e id cross sector share
    -     */
    -    public String iseIDCrossSectorShare() {
    -	return eIDCrossSectShare;
    -    }
    -
    -    /**
    -     * Checks if is e id cross sect share.
    -     * 
    -     * @return true, if is e id cross sect share
    -     */
    -    public String iseIDCrossSectShare() {
    -	return eIDCrossSectShare;
    -    }
    -
    -    /**
    -     * Checks if is e id sector share.
    -     * 
    -     * @return true, if is e id sector share
    -     */
    -    public String iseIDSectorShare() {
    -	return eIDSectorShare;
    -    }
    -
    -    /**
    -     * Checks if is friendly name.
    -     * 
    -     * @return true, if checks if is friendly name
    -     */
    -    public boolean isFriendlyName() {
    -	return friendlyName;
    -    }
    -
    -    /**
    -     * Checks if is IP validation.
    -     * 
    -     * @return true, if is IP validation
    -     */
    -    public boolean isIpValidation() {
    -	return ipValidation;
    -    }
    -
    -    /**
    -     * Checks if is one time use.
    -     * 
    -     * @return true, if is one time use
    -     */
    -    public boolean isOneTimeUse() {
    -	return oneTimeUse;
    -    }
    -
    -    /**
    -     * Method that loads the configuration file for the SAML Engine.
    -     * 
    -     * @param instance the instance of the Engine properties.
    -     */
    -    private void loadConfiguration(final Properties instance) {
    -
    -        try {
    -            LOGGER.info("SAMLCore: Loading SAMLEngine properties.");
    -
    -            samlCoreProp = instance;
    -
    -            final String parameter = samlCoreProp
    -                    .getProperty(SAMLCore.FORMAT_ENTITY.getValue());
    -
    -            if ("entity".equalsIgnoreCase(parameter)) {
    -                formatEntity = NameIDType.ENTITY;
    -            }
    -
    -            friendlyName = Boolean.valueOf(samlCoreProp
    -                    .getProperty(SAMLCore.FRIENDLY_NAME.getValue()));
    -
    -            String isRequiredValue = samlCoreProp.
    -                    getProperty(SAMLCore.IS_REQUIRED.getValue());
    -            if (isRequiredValue != null) {
    -                isRequired = Boolean.valueOf(isRequiredValue);
    -            }
    -
    -            eIDSectorShare = samlCoreProp
    -                    .getProperty("eIDSectorShare");
    -            eIDCrossSectShare = samlCoreProp
    -                    .getProperty("eIDCrossSectorShare");
    -            eIDCrossBordShare = samlCoreProp
    -                    .getProperty("eIDCrossBorderShare");
    -
    -            ipValidation = Boolean.valueOf(samlCoreProp
    -                    .getProperty("ipAddrValidation"));
    -
    -            final String oneTimeUseProp = samlCoreProp
    -                    .getProperty(SAMLCore.ONE_TIME_USE.getValue());
    -
    -            if (StringUtils.isNotBlank(oneTimeUseProp)) {
    -                oneTimeUse = Boolean.valueOf(oneTimeUseProp);
    -            }
    -
    -            // Protocol Binding
    -            loadProtocolBiding();
    -
    -            // Consent Authentication Request
    -            consentAuthnReq = samlCoreProp
    -                    .getProperty(SAMLCore.CONSENT_AUTHN_REQ.getValue());
    -
    -            if ("unspecified".equalsIgnoreCase(consentAuthnReq)) {
    -                consentAuthnReq = RequestAbstractType.UNSPECIFIED_CONSENT;
    -            }
    -
    -            loadConsentAuthResp();
    -
    -            timeNotOnOrAfter = Integer.valueOf(samlCoreProp
    -                    .getProperty("timeNotOnOrAfter"));
    -
    -            if (timeNotOnOrAfter.intValue() < 0) {
    -                LOGGER.error(SAML_ENGINE_LITERAL + "timeNotOnOrAfter"
    -                        + " is negative number.");
    -
    -                throw new SAMLEngineException(SAML_ENGINE_LITERAL
    -                        + "timeNotOnOrAfter" + " is negative number.");
    -            }
    -
    -            requester = samlCoreProp.getProperty(SAMLCore.REQUESTER_TAG.getValue());
    -            responder = samlCoreProp.getProperty(SAMLCore.RESPONDER_TAG.getValue());
    -
    -        } catch (SAMLEngineException e) {
    -            LOGGER.error("SAMLCore: error loadConfiguration. ", e);
    -            throw new STORKSAMLEngineRuntimeException(e);
    -        } catch (RuntimeException e) {
    -            LOGGER.error("SAMLCore: error loadConfiguration. ", e);
    -            throw new STORKSAMLEngineRuntimeException(e);
    -        }
    -    }
    -
    -    /**
    -     * Load consent authentication response.
    -     */
    -    private void loadConsentAuthResp() {
    -	// Consent Authentication Response
    -	consentAuthnResp = samlCoreProp
    -		.getProperty(SAMLCore.CONSENT_AUTHN_RES.getValue());
    -
    -	if ("obtained".equalsIgnoreCase(consentAuthnResp)) {
    -	    consentAuthnResp = RequestAbstractType.OBTAINED_CONSENT;
    -	} else if ("prior".equalsIgnoreCase(consentAuthnResp)) {
    -	    consentAuthnResp = RequestAbstractType.PRIOR_CONSENT;
    -	} else if ("curent-implicit".equalsIgnoreCase(consentAuthnResp)) {
    -	    consentAuthnResp = 
    -		"urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
    -	} else if ("curent-explicit".equalsIgnoreCase(consentAuthnResp)) {
    -	    consentAuthnResp = 
    -		"urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
    -	} else if ("unspecified".equalsIgnoreCase(consentAuthnResp)) {
    -	    consentAuthnResp = RequestAbstractType.UNSPECIFIED_CONSENT;
    -	}
    -    }
    -
    -    /**
    -     * Load protocol biding.
    -     * 
    -     * @throws SAMLEngineException the SAML engine exception
    -     */
    -    private void loadProtocolBiding() throws SAMLEngineException {
    -	// Protocol Binding
    -	protocolBinding = samlCoreProp.getProperty(SAMLCore.PROT_BINDING_TAG.getValue());
    -
    -	if (StringUtils.isBlank(protocolBinding)) {
    -	    LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG
    -		    + " it's mandatory.");
    -	    throw new SAMLEngineException(SAML_ENGINE_LITERAL
    -		    + SAMLCore.PROT_BINDING_TAG + " it's mandatory.");
    -	} else if (protocolBinding.equalsIgnoreCase("HTTP-POST")) {
    -	    protocolBinding = SAMLConstants.SAML2_POST_BINDING_URI;
    -	} else {
    -	    LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG
    -		    + " it's not supporting.");
    -
    -	    throw new SAMLEngineException(SAML_ENGINE_LITERAL
    -		    + SAMLCore.PROT_BINDING_TAG + " it's not supporting.");
    -	}
    -    }
    -
    -    /**
    -     * Sets the consent authentication response.
    -     * 
    -     * @param newConsAuthnResp the new consent authentication response
    -     */
    -    public void setConsentAuthnResp(final String newConsAuthnResp) {
    -	this.consentAuthnResp = newConsAuthnResp;
    -    }
    -
    -    /**
    -     * Sets an eID that can be shared outside of the  Service Provider’s member state.
    -     * 
    -     * @param newEIDCrossBord the new eid cross border share
    -     */
    -    public void setEIDCrossBordShare(final String newEIDCrossBord) {
    -	this.eIDCrossBordShare = newEIDCrossBord;
    -    }
    -
    -    /**
    -     * Sets an eID that can be shared outside of the  Service Provider’s sector.
    -     * 
    -     * @param newEIDCrossSect the new eid cross sect share
    -     */
    -    public void setEIDCrossSectShare(final String newEIDCrossSect) {
    -	this.eIDCrossSectShare = newEIDCrossSect;
    -    }
    -
    -    /**
    -     * Sets an eID that can be shared within the Service Provider’s sector.
    -     * 
    -     * @param newEIDSectorShare the new eid sector share
    -     */
    -    public void seteIDSectorShare(final String newEIDSectorShare) {
    -	this.eIDSectorShare = newEIDSectorShare;
    -    }
    -
    -    /**
    -     * Sets the format entity.
    -     * 
    -     * @param newFormatEntity the new format entity
    -     */
    -    public void setFormatEntity(final String newFormatEntity) {
    -	this.formatEntity = newFormatEntity;
    -    }
    -
    -    /**
    -     * Sets the friendly name.
    -     * 
    -     * @param newFriendlyName the new friendly name
    -     */
    -    public void setFriendlyName(final boolean newFriendlyName) {
    -	this.friendlyName = newFriendlyName;
    -    }
    -
    -    /**
    -     * Sets the IP validation.
    -     * 
    -     * @param newIpValidation the new IP validation
    -     */
    -    public void setIpValidation(final boolean newIpValidation) {
    -	this.ipValidation = newIpValidation;
    -    }
    -
    -    /**
    -     * Sets the one time use.
    -     * 
    -     * @param newOneTimeUse the new one time use
    -     */
    -    public void setOneTimeUse(final boolean newOneTimeUse) {
    -	this.oneTimeUse = newOneTimeUse;
    -    }
    -
    -    /**
    -     * Sets the protocol binding.
    -     * 
    -     * @param newProtBinding the new protocol binding
    -     */
    -    public void setProtocolBinding(final String newProtBinding) {
    -	this.protocolBinding = newProtBinding;
    -    }
    -
    -    /**
    -     * Sets the requester.
    -     * 
    -     * @param newRequester the new requester
    -     */
    -    public void setRequester(final String newRequester) {
    -	this.requester = newRequester;
    -    }
    -
    -    /**
    -     * Sets the responder.
    -     * 
    -     * @param newResponder the new responder
    -     */
    -    public void setResponder(final String newResponder) {
    -	this.responder = newResponder;
    -    }
    -
    -    /**
    -     * Sets the time not on or after.
    -     * 
    -     * @param newTimeNotOnOrAft the new time not on or after
    -     */
    -    public void setTimeNotOnOrAfter(final Integer newTimeNotOnOrAft) {
    -	this.timeNotOnOrAfter = newTimeNotOnOrAft;
    -    }
    +	 * Instantiates a new sAML core.
    +	 *
    +	 * @param instance
    +	 *            the instance
    +	 */
    +	public STORKSAMLCore(final Properties instance) {
    +		loadConfiguration(instance);
    +	}
    +
    +	/**
    +	 * Gets the consent.
    +	 * 
    +	 * @return the consent
    +	 */
    +	public String getConsentAuthnRequest() {
    +		return consentAuthnReq;
    +	}
    +
    +	/**
    +	 * Gets the consent authentication response.
    +	 * 
    +	 * @return the consent authentication response.
    +	 */
    +	public String getConsentAuthnResp() {
    +		return consentAuthnResp;
    +	}
    +
    +	/**
    +	 * Gets the consent authentication response.
    +	 * 
    +	 * @return the consent authentication response
    +	 */
    +	public String getConsentAuthnResponse() {
    +		return consentAuthnResp;
    +	}
    +
    +	/**
    +	 * Gets the format entity.
    +	 * 
    +	 * @return the format entity
    +	 */
    +	public String getFormatEntity() {
    +		return formatEntity;
    +	}
    +
    +	/**
    +	 * Gets the property.
    +	 * 
    +	 * @param key
    +	 *            the key
    +	 * 
    +	 * @return the property
    +	 */
    +	public String getProperty(final String key) {
    +		return samlCoreProp.getProperty(key);
    +	}
    +
    +	/**
    +	 * Gets the protocol binding.
    +	 * 
    +	 * @return the protocol binding
    +	 */
    +	public String getProtocolBinding() {
    +		return protocolBinding;
    +	}
    +
    +	/**
    +	 * Gets the requester.
    +	 * 
    +	 * @return the requester
    +	 */
    +	public String getRequester() {
    +		return requester;
    +	}
    +
    +	/**
    +	 * Gets the responder.
    +	 * 
    +	 * @return the responder
    +	 */
    +	public String getResponder() {
    +		return responder;
    +	}
    +
    +	/**
    +	 * Gets the time not on or after.
    +	 * 
    +	 * @return the time not on or after
    +	 */
    +	public Integer getTimeNotOnOrAfter() {
    +		return timeNotOnOrAfter;
    +	}
    +
    +	/**
    +	 * Checks if is e id cross border share.
    +	 * 
    +	 * @return true, if is e id cross border share
    +	 */
    +	public String iseIDCrossBorderShare() {
    +		return eIDCrossBordShare;
    +	}
    +
    +	/**
    +	 * Checks if is e id cross border share.
    +	 * 
    +	 * @return true, if is e id cross border share
    +	 */
    +	public String iseIDCrossBordShare() {
    +		return eIDCrossBordShare;
    +	}
    +
    +	/**
    +	 * Checks if is e id cross sector share.
    +	 * 
    +	 * @return true, if is e id cross sector share
    +	 */
    +	public String iseIDCrossSectorShare() {
    +		return eIDCrossSectShare;
    +	}
    +
    +	/**
    +	 * Checks if is e id cross sect share.
    +	 * 
    +	 * @return true, if is e id cross sect share
    +	 */
    +	public String iseIDCrossSectShare() {
    +		return eIDCrossSectShare;
    +	}
    +
    +	/**
    +	 * Checks if is e id sector share.
    +	 * 
    +	 * @return true, if is e id sector share
    +	 */
    +	public String iseIDSectorShare() {
    +		return eIDSectorShare;
    +	}
    +
    +	/**
    +	 * Checks if is friendly name.
    +	 * 
    +	 * @return true, if checks if is friendly name
    +	 */
    +	public boolean isFriendlyName() {
    +		return friendlyName;
    +	}
    +
    +	/**
    +	 * Checks if is IP validation.
    +	 * 
    +	 * @return true, if is IP validation
    +	 */
    +	public boolean isIpValidation() {
    +		return ipValidation;
    +	}
    +
    +	/**
    +	 * Checks if is one time use.
    +	 * 
    +	 * @return true, if is one time use
    +	 */
    +	public boolean isOneTimeUse() {
    +		return oneTimeUse;
    +	}
    +
    +	/**
    +	 * Method that loads the configuration file for the SAML Engine.
    +	 * 
    +	 * @param instance
    +	 *            the instance of the Engine properties.
    +	 */
    +	private void loadConfiguration(final Properties instance) {
    +
    +		try {
    +			LOGGER.info("SAMLCore: Loading SAMLEngine properties.");
    +
    +			samlCoreProp = instance;
    +
    +			final String parameter = samlCoreProp.getProperty(SAMLCore.FORMAT_ENTITY.getValue());
    +
    +			if ("entity".equalsIgnoreCase(parameter)) {
    +				formatEntity = NameIDType.ENTITY;
    +			}
    +
    +			friendlyName = Boolean.valueOf(samlCoreProp.getProperty(SAMLCore.FRIENDLY_NAME.getValue()));
    +
    +			String isRequiredValue = samlCoreProp.getProperty(SAMLCore.IS_REQUIRED.getValue());
    +			if (isRequiredValue != null) {
    +				isRequired = Boolean.valueOf(isRequiredValue);
    +			}
    +
    +			eIDSectorShare = samlCoreProp.getProperty("eIDSectorShare");
    +			eIDCrossSectShare = samlCoreProp.getProperty("eIDCrossSectorShare");
    +			eIDCrossBordShare = samlCoreProp.getProperty("eIDCrossBorderShare");
    +
    +			ipValidation = Boolean.valueOf(samlCoreProp.getProperty("ipAddrValidation"));
    +
    +			final String oneTimeUseProp = samlCoreProp.getProperty(SAMLCore.ONE_TIME_USE.getValue());
    +
    +			if (StringUtils.isNotBlank(oneTimeUseProp)) {
    +				oneTimeUse = Boolean.valueOf(oneTimeUseProp);
    +			}
    +
    +			// Protocol Binding
    +			loadProtocolBiding();
    +
    +			// Consent Authentication Request
    +			consentAuthnReq = samlCoreProp.getProperty(SAMLCore.CONSENT_AUTHN_REQ.getValue());
    +
    +			if ("unspecified".equalsIgnoreCase(consentAuthnReq)) {
    +				consentAuthnReq = RequestAbstractType.UNSPECIFIED_CONSENT;
    +			}
    +
    +			loadConsentAuthResp();
    +
    +			timeNotOnOrAfter = Integer.valueOf(samlCoreProp.getProperty("timeNotOnOrAfter"));
    +
    +			if (timeNotOnOrAfter.intValue() < 0) {
    +				LOGGER.error(SAML_ENGINE_LITERAL + "timeNotOnOrAfter" + " is negative number.");
    +
    +				throw new SAMLEngineException(SAML_ENGINE_LITERAL + "timeNotOnOrAfter" + " is negative number.");
    +			}
    +
    +			requester = samlCoreProp.getProperty(SAMLCore.REQUESTER_TAG.getValue());
    +			responder = samlCoreProp.getProperty(SAMLCore.RESPONDER_TAG.getValue());
    +
    +		} catch (SAMLEngineException e) {
    +			LOGGER.error("SAMLCore: error loadConfiguration. ", e);
    +			throw new STORKSAMLEngineRuntimeException(e);
    +		} catch (RuntimeException e) {
    +			LOGGER.error("SAMLCore: error loadConfiguration. ", e);
    +			throw new STORKSAMLEngineRuntimeException(e);
    +		}
    +	}
    +
    +	/**
    +	 * Load consent authentication response.
    +	 */
    +	private void loadConsentAuthResp() {
    +		// Consent Authentication Response
    +		consentAuthnResp = samlCoreProp.getProperty(SAMLCore.CONSENT_AUTHN_RES.getValue());
    +
    +		if ("obtained".equalsIgnoreCase(consentAuthnResp)) {
    +			consentAuthnResp = RequestAbstractType.OBTAINED_CONSENT;
    +		} else if ("prior".equalsIgnoreCase(consentAuthnResp)) {
    +			consentAuthnResp = RequestAbstractType.PRIOR_CONSENT;
    +		} else if ("curent-implicit".equalsIgnoreCase(consentAuthnResp)) {
    +			consentAuthnResp = "urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
    +		} else if ("curent-explicit".equalsIgnoreCase(consentAuthnResp)) {
    +			consentAuthnResp = "urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
    +		} else if ("unspecified".equalsIgnoreCase(consentAuthnResp)) {
    +			consentAuthnResp = RequestAbstractType.UNSPECIFIED_CONSENT;
    +		}
    +	}
    +
    +	/**
    +	 * Load protocol biding.
    +	 * 
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
    +	 */
    +	private void loadProtocolBiding() throws SAMLEngineException {
    +		// Protocol Binding
    +		protocolBinding = samlCoreProp.getProperty(SAMLCore.PROT_BINDING_TAG.getValue());
    +
    +		if (StringUtils.isBlank(protocolBinding)) {
    +			LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's mandatory.");
    +			throw new SAMLEngineException(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's mandatory.");
    +		} else if (protocolBinding.equalsIgnoreCase("HTTP-POST")) {
    +			protocolBinding = SAMLConstants.SAML2_POST_BINDING_URI;
    +		} else {
    +			LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's not supporting.");
    +
    +			throw new SAMLEngineException(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's not supporting.");
    +		}
    +	}
    +
    +	/**
    +	 * Sets the consent authentication response.
    +	 * 
    +	 * @param newConsAuthnResp
    +	 *            the new consent authentication response
    +	 */
    +	public void setConsentAuthnResp(final String newConsAuthnResp) {
    +		this.consentAuthnResp = newConsAuthnResp;
    +	}
    +
    +	/**
    +	 * Sets an eID that can be shared outside of the Service Provider’s member state.
    +	 * 
    +	 * @param newEIDCrossBord
    +	 *            the new eid cross border share
    +	 */
    +	public void setEIDCrossBordShare(final String newEIDCrossBord) {
    +		this.eIDCrossBordShare = newEIDCrossBord;
    +	}
    +
    +	/**
    +	 * Sets an eID that can be shared outside of the Service Provider’s sector.
    +	 * 
    +	 * @param newEIDCrossSect
    +	 *            the new eid cross sect share
    +	 */
    +	public void setEIDCrossSectShare(final String newEIDCrossSect) {
    +		this.eIDCrossSectShare = newEIDCrossSect;
    +	}
    +
    +	/**
    +	 * Sets an eID that can be shared within the Service Provider’s sector.
    +	 * 
    +	 * @param newEIDSectorShare
    +	 *            the new eid sector share
    +	 */
    +	public void seteIDSectorShare(final String newEIDSectorShare) {
    +		this.eIDSectorShare = newEIDSectorShare;
    +	}
    +
    +	/**
    +	 * Sets the format entity.
    +	 * 
    +	 * @param newFormatEntity
    +	 *            the new format entity
    +	 */
    +	public void setFormatEntity(final String newFormatEntity) {
    +		this.formatEntity = newFormatEntity;
    +	}
    +
    +	/**
    +	 * Sets the friendly name.
    +	 * 
    +	 * @param newFriendlyName
    +	 *            the new friendly name
    +	 */
    +	public void setFriendlyName(final boolean newFriendlyName) {
    +		this.friendlyName = newFriendlyName;
    +	}
    +
    +	/**
    +	 * Sets the IP validation.
    +	 * 
    +	 * @param newIpValidation
    +	 *            the new IP validation
    +	 */
    +	public void setIpValidation(final boolean newIpValidation) {
    +		this.ipValidation = newIpValidation;
    +	}
    +
    +	/**
    +	 * Sets the one time use.
    +	 * 
    +	 * @param newOneTimeUse
    +	 *            the new one time use
    +	 */
    +	public void setOneTimeUse(final boolean newOneTimeUse) {
    +		this.oneTimeUse = newOneTimeUse;
    +	}
    +
    +	/**
    +	 * Sets the protocol binding.
    +	 * 
    +	 * @param newProtBinding
    +	 *            the new protocol binding
    +	 */
    +	public void setProtocolBinding(final String newProtBinding) {
    +		this.protocolBinding = newProtBinding;
    +	}
    +
    +	/**
    +	 * Sets the requester.
    +	 * 
    +	 * @param newRequester
    +	 *            the new requester
    +	 */
    +	public void setRequester(final String newRequester) {
    +		this.requester = newRequester;
    +	}
    +
    +	/**
    +	 * Sets the responder.
    +	 * 
    +	 * @param newResponder
    +	 *            the new responder
    +	 */
    +	public void setResponder(final String newResponder) {
    +		this.responder = newResponder;
    +	}
    +
    +	/**
    +	 * Sets the time not on or after.
    +	 * 
    +	 * @param newTimeNotOnOrAft
    +	 *            the new time not on or after
    +	 */
    +	public void setTimeNotOnOrAfter(final Integer newTimeNotOnOrAft) {
    +		this.timeNotOnOrAfter = newTimeNotOnOrAft;
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
    index 6ee9e0e1b..c4c1ec845 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
    @@ -26,47 +26,46 @@ import org.opensaml.common.SAMLObject;
      */
     public interface VIDPAuthenticationAttributes extends SAMLObject {
     
    -    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    -    String DEF_LOCAL_NAME = "VIDPAuthenticationAttributes";
    +	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
    +	String DEF_LOCAL_NAME = "VIDPAuthenticationAttributes";
     
    -    /** Default element name. */
    -    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** Default element name. */
    +	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    -    /** Local name of the XSI type. */
    -    String TYPE_LOCAL_NAME = "VIDPAuthenticationAttributesType";
    +	/** Local name of the XSI type. */
    +	String TYPE_LOCAL_NAME = "VIDPAuthenticationAttributesType";
     
    -    /** QName of the XSI type. */
    -    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
    -	    SAMLCore.STORK10P_PREFIX.getValue());
    +	/** QName of the XSI type. */
    +	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
     
    +	/**
    +	 * Gets the citizen country code.
    +	 * 
    +	 * @return the citizen country code
    +	 */
    +	CitizenCountryCode getCitizenCountryCode();
    +
    +	/**
    +	 * Sets the citizen country code.
    +	 * 
    +	 * @param newCitizenCountryCode
    +	 *            the new citizen country code
    +	 */
    +	void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode);
    +
    +	/**
    +	 * Gets the SP information
    +	 * 
    +	 * @return the SP information
    +	 */
    +	SPInformation getSPInformation();
    +
    +	/**
    +	 * Sets the SP information
    +	 * 
    +	 * @param newSPInformation
    +	 *            the new SPInformation
    +	 */
    +	void setSPInformation(SPInformation newSPInformation);
     
    -    /**
    -     * Gets the citizen country code.
    -     * 
    -     * @return the citizen country code
    -     */
    -    CitizenCountryCode getCitizenCountryCode();
    -    
    -    /**
    -     * Sets the citizen country code.
    -     * 
    -     * @param newCitizenCountryCode the new citizen country code
    -     */
    -    void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode);
    -    
    -    /**
    -     * Gets the SP information
    -     * 
    -     * @return the SP information
    -     */
    -    SPInformation getSPInformation();
    -    
    -    /**
    -     * Sets the SP information
    -     * 
    -     * @param newSPInformation the new SPInformation
    -     */
    -    void setSPInformation(SPInformation newSPInformation);
    -     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
    index 2d9039d4c..f34adfcb4 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
    @@ -24,33 +24,31 @@ import eu.stork.peps.auth.engine.core.AuthenticationAttributes;
      * 
      * @author fjquevedo
      */
    -public class AuthenticationAttributesBuilder extends
    -	AbstractSAMLObjectBuilder {
    -
    -
    -
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the authentication attributes
    -     */
    -    public final AuthenticationAttributes buildObject() {
    -	return buildObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
    -    }
    -
    -    /**
    -     * Builds the object.
    -     * 
    -     * @param namespaceURI the namespace URI
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * 
    -     * @return the authentication attributes 
    -     */
    -    public final AuthenticationAttributes buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new AuthenticationAttributesImpl(namespaceURI, localName,
    -		namespacePrefix);
    -    }
    +public class AuthenticationAttributesBuilder extends AbstractSAMLObjectBuilder {
    +
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the authentication attributes
    +	 */
    +	public final AuthenticationAttributes buildObject() {
    +		return buildObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
    +	}
    +
    +	/**
    +	 * Builds the object.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace URI
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * 
    +	 * @return the authentication attributes
    +	 */
    +	public final AuthenticationAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new AuthenticationAttributesImpl(namespaceURI, localName, namespacePrefix);
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
    index e0de20f7d..907b9bf68 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
    @@ -32,78 +32,79 @@ import org.slf4j.LoggerFactory;
      * 
      * @author fjquevedo
      */
    -public final class AuthenticationAttributesImpl extends AbstractSignableSAMLObject implements
    -AuthenticationAttributes {
    -
    -    private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationAttributesImpl.class.getName());
    -
    -    /** The indexed children. */
    -    private VIDPAuthenticationAttributes vIDPAuthenAttr;
    -
    -    /**
    -     * Instantiates a new authentication attributes implementation.
    -     * 
    -     * @param namespaceURI the namespace uri
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected AuthenticationAttributesImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {	
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    -
    -    /**
    -     * Gets the ordered children.
    -     * 
    -     * @return the ordered children
    -     * 
    -     */
    -    public List getOrderedChildren() {
    -	final ArrayList children = new ArrayList();
    -
    -	children.add(vIDPAuthenAttr);
    -
    -	if (getSignature() != null) {
    -	    children.add(getSignature());
    +public final class AuthenticationAttributesImpl extends AbstractSignableSAMLObject implements AuthenticationAttributes {
    +
    +	private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationAttributesImpl.class.getName());
    +
    +	/** The indexed children. */
    +	private VIDPAuthenticationAttributes vIDPAuthenAttr;
    +
    +	/**
    +	 * Instantiates a new authentication attributes implementation.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected AuthenticationAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
     	}
     
    -	return Collections.unmodifiableList(children);
    -    }
    -
    -    /**
    -     * Gets the signature reference id.
    -     * 
    -     * @return the signature reference id
    -     * 
    -     */
    -    public String getSignatureReferenceID() {	
    -	return null;
    -    }
    -
    -    /**
    -     * Gets the vidp authentication attributes.
    -     * 
    -     * @return the VIDP authentication attributes
    -     *
    -     */
    -    public VIDPAuthenticationAttributes getVIDPAuthenticationAttributes() {	
    -	return vIDPAuthenAttr;
    -    }
    -
    -    /**
    -     * Sets the vidp authentication attributes.
    -     * 
    -     * @param newVIDPAuthenAttr the new vidp authen attr
    -     *
    -     */
    -    public void setVIDPAuthenticationAttributes(
    -	    final VIDPAuthenticationAttributes newVIDPAuthenAttr) {	
    -	vIDPAuthenAttr = prepareForAssignment(this.vIDPAuthenAttr, newVIDPAuthenAttr);
    -    }
    -
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 * 
    +	 * @return the ordered children
    +	 * 
    +	 */
    +	public List getOrderedChildren() {
    +		final ArrayList children = new ArrayList();
    +
    +		children.add(vIDPAuthenAttr);
    +
    +		if (getSignature() != null) {
    +			children.add(getSignature());
    +		}
    +
    +		return Collections.unmodifiableList(children);
    +	}
    +
    +	/**
    +	 * Gets the signature reference id.
    +	 * 
    +	 * @return the signature reference id
    +	 * 
    +	 */
    +	public String getSignatureReferenceID() {
    +		return null;
    +	}
    +
    +	/**
    +	 * Gets the vidp authentication attributes.
    +	 * 
    +	 * @return the VIDP authentication attributes
    +	 *
    +	 */
    +	public VIDPAuthenticationAttributes getVIDPAuthenticationAttributes() {
    +		return vIDPAuthenAttr;
    +	}
    +
    +	/**
    +	 * Sets the vidp authentication attributes.
    +	 * 
    +	 * @param newVIDPAuthenAttr
    +	 *            the new vidp authen attr
    +	 *
    +	 */
    +	public void setVIDPAuthenticationAttributes(final VIDPAuthenticationAttributes newVIDPAuthenAttr) {
    +		vIDPAuthenAttr = prepareForAssignment(this.vIDPAuthenAttr, newVIDPAuthenAttr);
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java
    index 113214712..7e1b6bbe2 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java
    @@ -28,20 +28,21 @@ import eu.stork.peps.auth.engine.core.AuthenticationAttributes;
      * 
      * @author fjquevedo
      */
    -public class AuthenticationAttributesUnmarshaller extends
    -AbstractSAMLObjectUnmarshaller {
    +public class AuthenticationAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
     	/**
     	 * Process child element.
     	 * 
    -	 * @param parentObject the parent object
    -	 * @param childObject the child object
    +	 * @param parentObject
    +	 *            the parent object
    +	 * @param childObject
    +	 *            the child object
     	 * 
    -	 * @throws UnmarshallingException the unmarshalling exception
    +	 * @throws UnmarshallingException
    +	 *             the unmarshalling exception
     	 *
     	 */
    -	protected final void processChildElement(final XMLObject parentObject,
    -			final XMLObject childObject) throws UnmarshallingException {
    +	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
     		final AuthenticationAttributes attrStatement = (AuthenticationAttributes) parentObject;
     
     		if (childObject instanceof VIDPAuthenticationAttributes) {
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java
    index 64651691f..49ed66d88 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java
    @@ -26,25 +26,27 @@ import eu.stork.peps.auth.engine.core.CitizenCountryCode;
      */
     public class CitizenCountryCodeBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the citizen country code
    -     */
    -    public final CitizenCountryCode buildObject() {
    -	return buildObject(CitizenCountryCode.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the citizen country code
    +	 */
    +	public final CitizenCountryCode buildObject() {
    +		return buildObject(CitizenCountryCode.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the citizen country code
    -     */
    -    public final CitizenCountryCode buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new CitizenCountryCodeImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the citizen country code
    +	 */
    +	public final CitizenCountryCode buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new CitizenCountryCodeImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
    index 374398cf1..003d56b46 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
    @@ -31,52 +31,55 @@ import org.slf4j.LoggerFactory;
      */
     public class CitizenCountryCodeImpl extends AbstractSAMLObject implements CitizenCountryCode {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(CitizenCountryCodeImpl.class.getName());
    -    /** The citizen country code. */
    -    private String citizenCountryCode;
    -    
    -    /**
    -     * Instantiates a new sP country impl.
    -     * 
    -     * @param namespaceURI the namespace uri
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */   
    -    protected CitizenCountryCodeImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);	
    -    }
    +	private static final Logger LOGGER = LoggerFactory.getLogger(CitizenCountryCodeImpl.class.getName());
    +	/** The citizen country code. */
    +	private String citizenCountryCode;
     
    -    /**
    -     * Gets the citizen country code.
    -     *
    -     * @return the citizen country code
    -     */
    -    public final String getCitizenCountryCode() {
    -	return citizenCountryCode;
    -    }
    +	/**
    +	 * Instantiates a new sP country impl.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected CitizenCountryCodeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    /**
    -     * Sets the citizen country code.
    -     *
    -     * @param newCitizenCountryCode the new citizen country code
    -     */
    -    public final void setCitizenCountryCode(final String newCitizenCountryCode) {
    -	this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);
    -    }
    +	/**
    +	 * Gets the citizen country code.
    +	 *
    +	 * @return the citizen country code
    +	 */
    +	public final String getCitizenCountryCode() {
    +		return citizenCountryCode;
    +	}
     
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Sets the citizen country code.
    +	 *
    +	 * @param newCitizenCountryCode
    +	 *            the new citizen country code
    +	 */
    +	public final void setCitizenCountryCode(final String newCitizenCountryCode) {
    +		this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java
    index decae04c5..e04323f06 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java
    @@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.CitizenCountryCode;
      */
     public class CitizenCountryCodeMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallElementContent(final XMLObject samlObject,
    -	    final Element domElement) throws MarshallingException {
    -	final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
    -	XMLHelper.appendTextContent(domElement, citizenCountryCode.getCitizenCountryCode());
    -    }
    +	/**
    +	 * Marshall element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
    +		final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
    +		XMLHelper.appendTextContent(domElement, citizenCountryCode.getCitizenCountryCode());
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java
    index 93132b508..eca6d69b9 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java
    @@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.CitizenCountryCode;
      */
     public class CitizenCountryCodeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param elementContent the element content
    -     */
    -    protected final void processElementContent(final XMLObject samlObject,
    -	    final String elementContent) {
    -	final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
    -	citizenCountryCode.setCitizenCountryCode(elementContent);
    -    }
    +	/**
    +	 * Process element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
    +	 */
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
    +		final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
    +		citizenCountryCode.setCitizenCountryCode(elementContent);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java
    index 48da2a24b..f2d2fe7fb 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java
    @@ -6,21 +6,20 @@ import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
     
     public class CustomAttributeQueryBuilder extends AbstractSAMLObjectBuilder {
     	/**
    -     * Constructor.
    -     */
    -    public CustomAttributeQueryBuilder() {
    +	 * Constructor.
    +	 */
    +	public CustomAttributeQueryBuilder() {
     
    -    }
    +	}
     
    -    /** {@inheritDoc} */
    -    public CustomAttributeQuery buildObject() {
    -        return buildObject(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME,
    -                SAMLConstants.SAML20P_PREFIX);
    -    }
    +	/** {@inheritDoc} */
    +	public CustomAttributeQuery buildObject() {
    +		return buildObject(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
    +	}
     
    -    /** {@inheritDoc} */
    -    public CustomAttributeQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
    -        return new CustomAttributeQueryImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/** {@inheritDoc} */
    +	public CustomAttributeQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
    +		return new CustomAttributeQueryImpl(namespaceURI, localName, namespacePrefix);
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
    index cbf9221eb..d88ede1a3 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
    @@ -11,44 +11,46 @@ import org.opensaml.xml.util.XMLObjectChildrenList;
     
     import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
     
    -
     public class CustomAttributeQueryImpl extends SubjectQueryImpl implements CustomAttributeQuery {
     	/** Attribute child elements. */
    -    private final XMLObjectChildrenList attributes;
    -    private String serviceURL;
    +	private final XMLObjectChildrenList attributes;
    +	private String serviceURL;
     
    -    /**
    -     * Constructor.
    -     * 
    -     * @param namespaceURI the namespace the element is in
    -     * @param elementLocalName the local name of the XML element this Object represents
    -     * @param namespacePrefix the prefix for the given namespace
    -     */
    -    protected CustomAttributeQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
    -        super(namespaceURI, elementLocalName, namespacePrefix);
    -        attributes = new XMLObjectChildrenList(this);
    -    }
    +	/**
    +	 * Constructor.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace the element is in
    +	 * @param elementLocalName
    +	 *            the local name of the XML element this Object represents
    +	 * @param namespacePrefix
    +	 *            the prefix for the given namespace
    +	 */
    +	protected CustomAttributeQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +		attributes = new XMLObjectChildrenList(this);
    +	}
     
    -    /** {@inheritDoc} */
    -    public List getAttributes() {
    -        return attributes;
    -    }
    +	/** {@inheritDoc} */
    +	public List getAttributes() {
    +		return attributes;
    +	}
     
    -    /** {@inheritDoc} */
    -    public List getOrderedChildren() {
    -        ArrayList children = new ArrayList();
    +	/** {@inheritDoc} */
    +	public List getOrderedChildren() {
    +		ArrayList children = new ArrayList();
     
    -        if (super.getOrderedChildren() != null) {
    -            children.addAll(super.getOrderedChildren());
    -        }
    -        children.addAll(attributes);
    +		if (super.getOrderedChildren() != null) {
    +			children.addAll(super.getOrderedChildren());
    +		}
    +		children.addAll(attributes);
     
    -        if (children.size() == 0) {
    -            return null;
    -        }
    +		if (children.size() == 0) {
    +			return null;
    +		}
     
    -        return Collections.unmodifiableList(children);
    -    }
    +		return Collections.unmodifiableList(children);
    +	}
     
     	@Override
     	public String getAssertionConsumerServiceURL() {
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java
    index 7f2013ca8..5e0cf55b3 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java
    @@ -10,41 +10,40 @@ import org.w3c.dom.Element;
     import eu.stork.peps.auth.engine.core.CustomRequestAbstractType;
     
     public class CustomAttributeQueryMarshaller extends SubjectQueryMarshaller {
    -	
    -	/** {@inheritDoc} */
    -    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
    -        CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
    -
    -        if (req.getVersion() != null) {
    -            domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
    -        }
    -
    -        if (req.getID() != null) {
    -            domElement.setAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, req.getID());
    -            domElement.setIdAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, true);
    -        }
    -
    -        if (req.getVersion() != null) {
    -            domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
    -        }
    -
    -        if (req.getIssueInstant() != null) {
    -            String iiStr = Configuration.getSAMLDateFormatter().print(req.getIssueInstant());
    -            domElement.setAttributeNS(null, RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME, iiStr);
    -        }
    -
    -        if (req.getDestination() != null) {
    -            domElement.setAttributeNS(null, RequestAbstractType.DESTINATION_ATTRIB_NAME, req.getDestination());
    -        }
    -        
    -        if (req.getAssertionConsumerServiceURL() != null) {
    -            domElement.setAttributeNS(null, CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME, req.getAssertionConsumerServiceURL());
    -        }
    -
    -        if (req.getConsent() != null) {
    -            domElement.setAttributeNS(null, RequestAbstractType.CONSENT_ATTRIB_NAME, req.getConsent());
    -        }
    -    }
     
    +	/** {@inheritDoc} */
    +	protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
    +		CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
    +
    +		if (req.getVersion() != null) {
    +			domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
    +		}
    +
    +		if (req.getID() != null) {
    +			domElement.setAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, req.getID());
    +			domElement.setIdAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, true);
    +		}
    +
    +		if (req.getVersion() != null) {
    +			domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
    +		}
    +
    +		if (req.getIssueInstant() != null) {
    +			String iiStr = Configuration.getSAMLDateFormatter().print(req.getIssueInstant());
    +			domElement.setAttributeNS(null, RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME, iiStr);
    +		}
    +
    +		if (req.getDestination() != null) {
    +			domElement.setAttributeNS(null, RequestAbstractType.DESTINATION_ATTRIB_NAME, req.getDestination());
    +		}
    +
    +		if (req.getAssertionConsumerServiceURL() != null) {
    +			domElement.setAttributeNS(null, CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME, req.getAssertionConsumerServiceURL());
    +		}
    +
    +		if (req.getConsent() != null) {
    +			domElement.setAttributeNS(null, RequestAbstractType.CONSENT_ATTRIB_NAME, req.getConsent());
    +		}
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java
    index e351b65b0..485d6656b 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java
    @@ -24,91 +24,88 @@ import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
     import eu.stork.peps.auth.engine.core.CustomRequestAbstractType;
     
     public class CustomAttributeQueryUnmarshaller extends SubjectQueryUnmarshaller {
    -	
    +
     	private final Logger log = LoggerFactory.getLogger(AbstractXMLObjectUnmarshaller.class);
    +
    +	/** {@inheritDoc} */
    +	protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject) throws UnmarshallingException {
    +		CustomAttributeQuery query = (CustomAttributeQuery) parentSAMLObject;
    +
    +		if (childSAMLObject instanceof Attribute) {
    +			query.getAttributes().add((Attribute) childSAMLObject);
    +		} else {
    +			super.processChildElement(parentSAMLObject, childSAMLObject);
    +		}
    +	}
    +
    +	/** {@inheritDoc} */
    +	public XMLObject unmarshall(Element domElement) throws UnmarshallingException {
    +		if (log.isTraceEnabled()) {
    +			log.trace("Starting to unmarshall DOM element {}", XMLHelper.getNodeQName(domElement));
    +		}
    +
    +		checkElementIsTarget(domElement);
    +
    +		// String namespaceURI, String elementLocalName, String namespacePrefix
    +		XMLObject xmlObject = new CustomAttributeQueryImpl(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
    +
    +		if (log.isTraceEnabled()) {
    +			log.trace("Unmarshalling attributes of DOM Element {}", XMLHelper.getNodeQName(domElement));
    +		}
    +
    +		NamedNodeMap attributes = domElement.getAttributes();
    +		Node attribute;
    +		for (int i = 0; i < attributes.getLength(); i++) {
    +			attribute = attributes.item(i);
    +
    +			// These should allows be attribute nodes, but just in case...
    +			if (attribute.getNodeType() == Node.ATTRIBUTE_NODE) {
    +				unmarshallAttribute(xmlObject, (Attr) attribute);
    +			}
    +		}
    +
    +		if (log.isTraceEnabled()) {
    +			log.trace("Unmarshalling other child nodes of DOM Element {}", XMLHelper.getNodeQName(domElement));
    +		}
    +
    +		Node childNode = domElement.getFirstChild();
    +		while (childNode != null) {
    +
    +			if (childNode.getNodeType() == Node.ATTRIBUTE_NODE) {
    +				unmarshallAttribute(xmlObject, (Attr) childNode);
    +			} else if (childNode.getNodeType() == Node.ELEMENT_NODE) {
    +				unmarshallChildElement(xmlObject, (Element) childNode);
    +			} else if (childNode.getNodeType() == Node.TEXT_NODE || childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
    +				unmarshallTextContent(xmlObject, (Text) childNode);
    +			}
    +
    +			childNode = childNode.getNextSibling();
    +		}
    +
    +		xmlObject.setDOM(domElement);
    +		return xmlObject;
    +	}
    +
     	/** {@inheritDoc} */
    -    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
    -            throws UnmarshallingException {
    -        CustomAttributeQuery query = (CustomAttributeQuery) parentSAMLObject;
    -
    -        if (childSAMLObject instanceof Attribute) {
    -            query.getAttributes().add((Attribute) childSAMLObject);
    -        } else {
    -            super.processChildElement(parentSAMLObject, childSAMLObject);
    -        }
    -    }
    -    
    -    /** {@inheritDoc} */
    -    public XMLObject unmarshall(Element domElement) throws UnmarshallingException {
    -        if (log.isTraceEnabled()) {
    -            log.trace("Starting to unmarshall DOM element {}", XMLHelper.getNodeQName(domElement));
    -        }
    -        
    -        checkElementIsTarget(domElement);
    -
    -        //String namespaceURI, String elementLocalName, String namespacePrefix
    -        XMLObject xmlObject = new CustomAttributeQueryImpl(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME,
    -                SAMLConstants.SAML20P_PREFIX);
    -
    -        if (log.isTraceEnabled()) {
    -            log.trace("Unmarshalling attributes of DOM Element {}", XMLHelper.getNodeQName(domElement));
    -        }
    -        
    -        NamedNodeMap attributes = domElement.getAttributes();
    -        Node attribute;
    -        for (int i = 0; i < attributes.getLength(); i++) {
    -            attribute = attributes.item(i);
    -
    -            // These should allows be attribute nodes, but just in case...
    -            if (attribute.getNodeType() == Node.ATTRIBUTE_NODE) {
    -                unmarshallAttribute(xmlObject, (Attr) attribute);
    -            }
    -        }
    -
    -        if (log.isTraceEnabled()) {
    -            log.trace("Unmarshalling other child nodes of DOM Element {}", XMLHelper.getNodeQName(domElement));
    -        }
    -        
    -        Node childNode = domElement.getFirstChild();
    -        while (childNode != null) {
    -
    -            if (childNode.getNodeType() == Node.ATTRIBUTE_NODE) {
    -                unmarshallAttribute(xmlObject, (Attr) childNode);
    -            } else if (childNode.getNodeType() == Node.ELEMENT_NODE) {
    -                unmarshallChildElement(xmlObject, (Element) childNode);
    -            } else if (childNode.getNodeType() == Node.TEXT_NODE
    -                    || childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
    -                unmarshallTextContent(xmlObject, (Text) childNode);
    -            }
    -            
    -            childNode = childNode.getNextSibling();
    -        }
    -
    -        xmlObject.setDOM(domElement);
    -        return xmlObject;
    -    }
    -    
    -    /** {@inheritDoc} */
    -    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
    -        CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
    -
    -        if (attribute.getLocalName().equals(RequestAbstractType.VERSION_ATTRIB_NAME)) {
    -            req.setVersion(SAMLVersion.valueOf(attribute.getValue()));
    -        } else if (attribute.getLocalName().equals(RequestAbstractType.ID_ATTRIB_NAME)) {
    -            req.setID(attribute.getValue());
    -            attribute.getOwnerElement().setIdAttributeNode(attribute, true);
    -        } else if (attribute.getLocalName().equals(RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME)
    -                && !DatatypeHelper.isEmpty(attribute.getValue())) {
    -            req.setIssueInstant(new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC()));
    -        } else if (attribute.getLocalName().equals(RequestAbstractType.DESTINATION_ATTRIB_NAME)) {
    -            req.setDestination(attribute.getValue());
    -        } else if (attribute.getLocalName().equals(RequestAbstractType.CONSENT_ATTRIB_NAME)) {
    -            req.setConsent(attribute.getValue());
    -        } else if (attribute.getLocalName().equals(CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME)) {
    -        	req.setAssertionConsumerServiceURL(attribute.getValue());
    -        }else {
    -            super.processAttribute(samlObject, attribute);
    -        }
    -    }
    +	protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
    +		CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
    +
    +		if (attribute.getLocalName().equals(RequestAbstractType.VERSION_ATTRIB_NAME)) {
    +			req.setVersion(SAMLVersion.valueOf(attribute.getValue()));
    +		} else if (attribute.getLocalName().equals(RequestAbstractType.ID_ATTRIB_NAME)) {
    +			req.setID(attribute.getValue());
    +			attribute.getOwnerElement().setIdAttributeNode(attribute, true);
    +		} else if (attribute.getLocalName().equals(RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME) && !DatatypeHelper.isEmpty(attribute.getValue())) {
    +			req.setIssueInstant(new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC()));
    +		} else if (attribute.getLocalName().equals(RequestAbstractType.DESTINATION_ATTRIB_NAME)) {
    +			req.setDestination(attribute.getValue());
    +		} else if (attribute.getLocalName().equals(RequestAbstractType.CONSENT_ATTRIB_NAME)) {
    +			req.setConsent(attribute.getValue());
    +		} else if (attribute.getLocalName().equals(CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME)) {
    +			req.setAssertionConsumerServiceURL(attribute.getValue());
    +		} else {
    +			super.processAttribute(samlObject, attribute);
    +		}
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
    index 3f4fc633d..7c7a88b89 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
    @@ -24,8 +24,7 @@ import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
      * 
      * @author fjquevedo
      */
    -public class EIDCrossBorderShareBuilder extends	AbstractSAMLObjectBuilder {
    -
    +public class EIDCrossBorderShareBuilder extends AbstractSAMLObjectBuilder {
     
     	/**
     	 * Builds the object.
    @@ -36,17 +35,18 @@ public class EIDCrossBorderShareBuilder extends	AbstractSAMLObjectBuilder getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Sets the eID cross border share.
    +	 *
    +	 * @param newEIDCrossBorderShare
    +	 *            the new eID cross border share
    +	 */
    +	public final void setEIDCrossBorderShare(String newEIDCrossBorderShare) {
    +		this.eIDCrossBorderShare = prepareForAssignment(this.eIDCrossBorderShare, newEIDCrossBorderShare);
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children {@inheritDoc}
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java
    index c5e113013..2e8868ac1 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java
    @@ -23,7 +23,6 @@ import org.w3c.dom.Element;
     
     import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
     
    -
     /**
      * The Class EIDCrossBorderShareMarshaller.
      * 
    @@ -31,16 +30,17 @@ import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
      */
     public class EIDCrossBorderShareMarshaller extends AbstractSAMLObjectMarshaller {
     
    -
     	/**
     	 * Marshall element content.
     	 *
    -	 * @param samlObject the SAML object
    -	 * @param domElement the DOM element
    -	 * @throws MarshallingException the marshalling exception
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
     	 */
    -	protected final void marshallElementContent(final XMLObject samlObject,
    -			final Element domElement) throws MarshallingException {
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
     		final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) samlObject;
     		XMLHelper.appendTextContent(domElement, crossBorderShare.getEIDCrossBorderShare());
     	}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java
    index e74bee6ca..013b5b78b 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java
    @@ -25,18 +25,17 @@ import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
      * 
      * @author fjquevedo
      */
    -public class EIDCrossBorderShareUnmarshaller extends
    -		AbstractSAMLObjectUnmarshaller {
    -
    +public class EIDCrossBorderShareUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
     	/**
     	 * Process element content.
     	 *
    -	 * @param samlObject the SAML object
    -	 * @param elementContent the element content
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
     	 */
    -	protected final void processElementContent(final XMLObject samlObject,
    -			final String elementContent) {
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
     		final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) samlObject;
     		crossBorderShare.setEIDCrossBorderShare(elementContent);
     	}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java
    index 5e91e18fd..398815719 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java
    @@ -24,29 +24,29 @@ import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
      * 
      * @author fjquevedo
      */
    -public class EIDCrossSectorShareBuilder extends
    -	AbstractSAMLObjectBuilder {
    +public class EIDCrossSectorShareBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the eID cross sector share
    -     */
    -    public final EIDCrossSectorShare buildObject() {
    -	return buildObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the eID cross sector share
    +	 */
    +	public final EIDCrossSectorShare buildObject() {
    +		return buildObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the eID cross sector share implementation
    -     */
    -    public final EIDCrossSectorShareImpl buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new EIDCrossSectorShareImpl(namespaceURI, localName,
    -		namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the eID cross sector share implementation
    +	 */
    +	public final EIDCrossSectorShareImpl buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new EIDCrossSectorShareImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
    index 7b2ad3dbd..f2762e327 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
    @@ -25,65 +25,62 @@ import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     
    -
     /**
      * The Class EIDCrossSectorShareImpl.
      * 
      * @author fjquevedo
      */
    -public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements
    -	EIDCrossSectorShare {
    +public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements EIDCrossSectorShare {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossSectorShareImpl.class.getName());
    +	private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossSectorShareImpl.class.getName());
     	/** The citizen country code. */
    -    private String eIDCrossSectorShare;
    +	private String eIDCrossSectorShare;
     
    +	/**
    +	 * Instantiates a new eID cross sector share implementation.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace URI
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected EIDCrossSectorShareImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    /**
    -     * Instantiates a new eID cross sector share implementation.
    -     * 
    -     * @param namespaceURI the namespace URI
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected EIDCrossSectorShareImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    -    
    -    
    -  
    -    /**
    -     * Gets the eID cross sector share.
    -     *
    -     * @return the eID cross sector share
    -     */
    -    public final String getEIDCrossSectorShare() {
    -    	return eIDCrossSectorShare;
    -    }
    +	/**
    +	 * Gets the eID cross sector share.
    +	 *
    +	 * @return the eID cross sector share
    +	 */
    +	public final String getEIDCrossSectorShare() {
    +		return eIDCrossSectorShare;
    +	}
     
    +	/**
    +	 * Sets the eID cross sector share.
    +	 *
    +	 * @param newEIDCrossSectorShare
    +	 *            the new eID cross sector share
    +	 */
    +	public final void setEIDCrossSectorShare(String newEIDCrossSectorShare) {
    +		this.eIDCrossSectorShare = prepareForAssignment(this.eIDCrossSectorShare, newEIDCrossSectorShare);
    +	}
     
    -    /**
    -     * Sets the eID cross sector share.
    -     *
    -     * @param newEIDCrossSectorShare the new eID cross sector share
    -     */
    -    public final void setEIDCrossSectorShare(String newEIDCrossSectorShare) {
    -    	this.eIDCrossSectorShare = prepareForAssignment(this.eIDCrossSectorShare, newEIDCrossSectorShare);
    -    }
    -    
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java
    index 3ee9df698..caa2df56a 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java
    @@ -23,7 +23,6 @@ import org.w3c.dom.Element;
     
     import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
     
    -
     /**
      * The Class EIDCrossSectorShareMarshaller.
      * 
    @@ -34,12 +33,14 @@ public class EIDCrossSectorShareMarshaller extends AbstractSAMLObjectMarshaller
     	/**
     	 * Marshall element content.
     	 *
    -	 * @param samlObject the SAML object
    -	 * @param domElement the DOM element
    -	 * @throws MarshallingException the marshalling exception
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
     	 */
    -	protected final void marshallElementContent(final XMLObject samlObject,
    -			final Element domElement) throws MarshallingException {
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
     		final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) samlObject;
     		XMLHelper.appendTextContent(domElement, crossSectorShare.getEIDCrossSectorShare());
     	}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java
    index 94c7689be..ebf80e700 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java
    @@ -28,18 +28,19 @@ import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
      * 
      * @author fjquevedo
      */
    -public class EIDCrossSectorShareUnmarshaller extends
    -	AbstractSAMLObjectUnmarshaller {
    +public class EIDCrossSectorShareUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
     	/**
     	 * Process element content.
     	 *
    -	 * @param samlObject the SAML object
    -	 * @param domElement the DOM element
    -	 * @throws MarshallingException the marshalling exception
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
     	 */
    -	protected final void processElementContent(final XMLObject samlObject,
    -			final String domElement)  {
    +	protected final void processElementContent(final XMLObject samlObject, final String domElement) {
     
     		final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) samlObject;
     		crossSectorShare.setEIDCrossSectorShare(domElement);
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java
    index 230ff3ca4..670b6f33a 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java
    @@ -24,28 +24,29 @@ import eu.stork.peps.auth.engine.core.EIDSectorShare;
      * 
      * @author fjquevedo
      */
    -public class EIDSectorShareBuilder extends
    -	AbstractSAMLObjectBuilder {
    +public class EIDSectorShareBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the eID sector share
    -     */
    -    public final EIDSectorShare buildObject() {
    -	return buildObject(EIDSectorShare.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the eID sector share
    +	 */
    +	public final EIDSectorShare buildObject() {
    +		return buildObject(EIDSectorShare.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the eID sector share
    -     */
    -    public final EIDSectorShare buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new EIDSectorShareImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the eID sector share
    +	 */
    +	public final EIDSectorShare buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new EIDSectorShareImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
    index 9ed726a32..f7c514722 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
    @@ -30,56 +30,58 @@ import org.slf4j.LoggerFactory;
      * 
      * @author fjquevedo
      */
    -public class EIDSectorShareImpl extends AbstractSAMLObject implements
    -	EIDSectorShare {
    +public class EIDSectorShareImpl extends AbstractSAMLObject implements EIDSectorShare {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(EIDSectorShareImpl.class.getName());
    -	
    -    /** The e id sector share. */
    -    private String eIDSectorShare;
    -    /**
    -     * Instantiates a new eID sector share implementation.
    -     * 
    -     * @param namespaceURI the namespace URI
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected EIDSectorShareImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    -    
    -    
    -    /**
    -     * Gets the eID sector share.
    -     *
    -     * @return the eID sector share
    -     */
    -    public final String getEIDSectorShare() {
    -    	return eIDSectorShare;	
    -    }
    +	private static final Logger LOGGER = LoggerFactory.getLogger(EIDSectorShareImpl.class.getName());
     
    -    /**
    -     * Sets the eID sector share.
    -     *
    -     * @param newEIDSectorShare the new eID sector share
    -     */
    -    public final void setEIDSectorShare(String newEIDSectorShare) {
    -    	this.eIDSectorShare = prepareForAssignment(this.eIDSectorShare, newEIDSectorShare);
    -    }
    -    
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/** The e id sector share. */
    +	private String eIDSectorShare;
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	/**
    +	 * Instantiates a new eID sector share implementation.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace URI
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected EIDSectorShareImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
    +
    +	/**
    +	 * Gets the eID sector share.
    +	 *
    +	 * @return the eID sector share
    +	 */
    +	public final String getEIDSectorShare() {
    +		return eIDSectorShare;
    +	}
    +
    +	/**
    +	 * Sets the eID sector share.
    +	 *
    +	 * @param newEIDSectorShare
    +	 *            the new eID sector share
    +	 */
    +	public final void setEIDSectorShare(String newEIDSectorShare) {
    +		this.eIDSectorShare = prepareForAssignment(this.eIDSectorShare, newEIDSectorShare);
    +	}
    +
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
    index 0ce449cd1..509503af0 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
    @@ -34,12 +34,14 @@ public class EIDSectorShareMarshaller extends AbstractSAMLObjectMarshaller {
     	/**
     	 * Marshall element content.
     	 *
    -	 * @param samlObject the SAML object
    -	 * @param domElement the DOM element
    -	 * @throws MarshallingException the marshalling exception
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
     	 */
    -	protected final void marshallElementContent(final XMLObject samlObject,
    -			final Element domElement) throws MarshallingException {
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
     		final EIDSectorShare sectorShare = (EIDSectorShare) samlObject;
     		XMLHelper.appendTextContent(domElement, sectorShare.getEIDSectorShare());
     	}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
    index f7f00adb9..8e2f327c6 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
    @@ -23,7 +23,6 @@ import org.w3c.dom.Element;
     
     import eu.stork.peps.auth.engine.core.EIDSectorShare;
     
    -
     /**
      * The Class EIDSectorShareUnmarshaller.
      * 
    @@ -31,16 +30,17 @@ import eu.stork.peps.auth.engine.core.EIDSectorShare;
      */
     public class EIDSectorShareUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -
     	/**
     	 * Process element content.
     	 *
    -	 * @param samlObject the SAML object
    -	 * @param domElement the DOM element
    -	 * @throws MarshallingException the marshalling exception
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
     	 */
    -	protected final void processElementContent(final XMLObject samlObject,
    -			final String domElement)  {
    +	protected final void processElementContent(final XMLObject samlObject, final String domElement) {
     		final EIDSectorShare sectorShare = (EIDSectorShare) samlObject;
     		sectorShare.setEIDSectorShare(domElement);
     	}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java
    index 41676931b..deeb2ae56 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java
    @@ -24,29 +24,29 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
      * 
      * @author fjquevedo
      */
    -public class QAAAttributeBuilder extends
    -	AbstractSAMLObjectBuilder {
    +public class QAAAttributeBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the quality authentication assurance object
    -     */
    -    public final QAAAttribute buildObject() {
    -	return buildObject(QAAAttribute.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the quality authentication assurance object
    +	 */
    +	public final QAAAttribute buildObject() {
    +		return buildObject(QAAAttribute.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the quality authentication assurance object
    -
    -     */
    -    public final QAAAttribute buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new QAAAttributeImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the quality authentication assurance object
    +	 */
    +	public final QAAAttribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new QAAAttributeImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
    index 46f3bb402..423cf8b25 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
    @@ -29,56 +29,57 @@ import org.slf4j.LoggerFactory;
      * 
      * @author fjquevedo
      */
    -public class QAAAttributeImpl extends AbstractSAMLObject implements
    -	QAAAttribute {
    +public class QAAAttributeImpl extends AbstractSAMLObject implements QAAAttribute {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(QAAAttributeImpl.class.getName());
    -    /** The quality authentication assurance level. */
    -    private String qaaLevel;
    +	private static final Logger LOGGER = LoggerFactory.getLogger(QAAAttributeImpl.class.getName());
    +	/** The quality authentication assurance level. */
    +	private String qaaLevel;
     
    -    /**
    -     * Constructor.
    -     * 
    -     * @param namespaceURI the namespace the element is in
    -     * @param elementLocalName the local name of the XML element this Object
    -     * represents
    -     * @param namespacePrefix the prefix for the given namespace
    -     */
    -    protected QAAAttributeImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    +	/**
    +	 * Constructor.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace the element is in
    +	 * @param elementLocalName
    +	 *            the local name of the XML element this Object represents
    +	 * @param namespacePrefix
    +	 *            the prefix for the given namespace
    +	 */
    +	protected QAAAttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    /**
    -     * Gets the quality authentication assurance level.
    -     *
    -     * @return the quality authentication assurance level
    -     */
    -    public final String getQaaLevel() {
    -	return qaaLevel;
    -    }
    +	/**
    +	 * Gets the quality authentication assurance level.
    +	 *
    +	 * @return the quality authentication assurance level
    +	 */
    +	public final String getQaaLevel() {
    +		return qaaLevel;
    +	}
     
    -    /**
    -     * Sets the quality authentication assurance level.
    -     *
    -     * @param newQaaLevel the new quality authentication assurance level
    -     */
    -    public final void setQaaLevel(final String newQaaLevel) {
    -	this.qaaLevel = prepareForAssignment(this.qaaLevel, newQaaLevel);
    -    }
    +	/**
    +	 * Sets the quality authentication assurance level.
    +	 *
    +	 * @param newQaaLevel
    +	 *            the new quality authentication assurance level
    +	 */
    +	public final void setQaaLevel(final String newQaaLevel) {
    +		this.qaaLevel = prepareForAssignment(this.qaaLevel, newQaaLevel);
    +	}
     
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java
    index 000879368..03a7a758a 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java
    @@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
      */
     public class QAAAttributeMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallElementContent(final XMLObject samlObject,
    -	    final Element domElement) throws MarshallingException {
    -	final QAAAttribute qaaAttribute = (QAAAttribute) samlObject;
    -	XMLHelper.appendTextContent(domElement, qaaAttribute.getQaaLevel());
    -    }
    +	/**
    +	 * Marshall element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
    +		final QAAAttribute qaaAttribute = (QAAAttribute) samlObject;
    +		XMLHelper.appendTextContent(domElement, qaaAttribute.getQaaLevel());
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java
    index 8445e4eeb..1b9e813f0 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java
    @@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
      */
     public class QAAAttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param elementContent the element content
    -     */
    -    protected final void processElementContent(final XMLObject samlObject,
    -	    final String elementContent) {
    -	final QAAAttribute qaaLevel = (QAAAttribute) samlObject;
    -	qaaLevel.setQaaLevel(elementContent);
    -    }
    +	/**
    +	 * Process element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
    +	 */
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
    +		final QAAAttribute qaaLevel = (QAAAttribute) samlObject;
    +		qaaLevel.setQaaLevel(elementContent);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java
    index c9881c439..4367c4ecf 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java
    @@ -24,31 +24,30 @@ import eu.stork.peps.auth.engine.core.RequestedAttribute;
      * 
      * @author fjquevedo
      */
    -public class RequestedAttributeBuilder extends
    -	AbstractSAMLObjectBuilder {
    -
    -
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the requested attribute
    -     */
    -    public final RequestedAttribute buildObject() {
    -	return buildObject(RequestedAttribute.DEF_ELEMENT_NAME);
    -    }
    -
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the requested attribute
    -     */
    -    public final RequestedAttribute buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new RequestedAttributeImpl(namespaceURI, localName,
    -		namespacePrefix);
    -    }
    +public class RequestedAttributeBuilder extends AbstractSAMLObjectBuilder {
    +
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the requested attribute
    +	 */
    +	public final RequestedAttribute buildObject() {
    +		return buildObject(RequestedAttribute.DEF_ELEMENT_NAME);
    +	}
    +
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the requested attribute
    +	 */
    +	public final RequestedAttribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new RequestedAttributeImpl(namespaceURI, localName, namespacePrefix);
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
    index ac2e8a3ee..e7ac7213b 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
    @@ -35,186 +35,187 @@ import org.slf4j.LoggerFactory;
      * 
      * @author fjquevedo
      */
    -public class RequestedAttributeImpl extends AbstractSAMLObject implements
    -	RequestedAttribute {
    -
    -    private static final Logger LOGGER = LoggerFactory.getLogger(RequestedAttributeImpl.class.getName());
    -    /**
    -     * The attribute values.
    -     */
    -    private final XMLObjectChildrenList attributeValues;
    -
    -    /**
    -     * The friendly name.
    -     * 
    -     */
    -    private String friendlyName;
    -
    -    /**
    -     * The is required.
    -    */
    -    private String isRequired;
    -
    -    /**
    -     * The name.
    -     * 
    -     */
    -    private String name;
    -
    -    /**
    -     * The name format.
    -     * 
    -     */
    -    private String nameFormat;
    -
    -    /**
    -     * The unknown attributes.
    -     * 
    -     */
    -    private AttributeMap unknownAttributes;
    -
    -    /**
    -     * Instantiates a new requested attribute impl.
    -     * 
    -     * @param namespaceURI the namespace uri
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected RequestedAttributeImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -	unknownAttributes = new AttributeMap(this);
    -	attributeValues = new XMLObjectChildrenList(this);
    -    }
    -
    -
    -    /**
    -     * Gets the attribute values.
    -     *
    -     * @return the attribute values
    -     */
    -    public final List getAttributeValues() {
    -	return attributeValues;
    -    }
    -
    -    /**
    -     * Gets the friendly name.
    -     *
    -     * @return the friendly name.
    -     */
    -    public final String getFriendlyName() {
    -	return friendlyName;
    -    }
    -
    -  
    -    /**
    -     * Gets the checks if is required.
    -     *
    -     * @return the boolean if it's required.
    -     */
    -    public final String isRequired() {
    -	return isRequired;
    -    }
    -
    -
    -    /**
    -     * Gets the is required xs boolean.
    -     * 
    -     * @return the XSBoolean if it's required.
    -     */
    -    public final String getIsRequiredXSBoolean() {
    -	return isRequired;
    -    }
    -
    -
    -    /**
    -     * Gets the name.
    -     *
    -     * @return the name
    -     */
    -    public final String getName() {
    -	return name;
    -    }
    -
    -
    -    /**
    -     * Gets the name format.
    -     *
    -     * @return the name format.
    -     */
    -    public final String getNameFormat() {
    -	return nameFormat;
    -    }
    -
    -    /**
    -     * Gets the ordered children.
    -     * 
    -     * @return the list of XMLObject.
    -     */
    -    public final List getOrderedChildren() {
    -	final ArrayList children = new ArrayList();
    -	children.addAll(attributeValues);
    -	return Collections.unmodifiableList(children);
    -    }
    -
    -    /**
    -     * Gets the unknown attributes.
    -     *
    -     * @return the attribute map
    -     */
    -    public final AttributeMap getUnknownAttributes() {
    -	return unknownAttributes;
    -    }
    -
    -    /**
    -     * Sets the friendly name.
    -     * 
    -     * @param newFriendlyName the new friendly name format
    -     */
    -    public final void setFriendlyName(final String newFriendlyName) {
    -	this.friendlyName = prepareForAssignment(this.friendlyName,
    -		newFriendlyName);
    -    }
    -
    -    /**
    -     * Set new boolean value isRequired.
    -     * @param newIsRequired then new value
    -     */
    -    public final void setIsRequired(final String newIsRequired) {
    -	isRequired = prepareForAssignment(this.isRequired, newIsRequired);
    -
    -    }
    -
    -    /**
    -     * Sets the name.
    -     * 
    -     * @param newName the new name
    -     */
    -    public final void setName(final String newName) {
    -	this.name = prepareForAssignment(this.name, newName);
    -    }
    -
    -    /**
    -     * Sets the name format.
    -     * 
    -     * @param newNameFormat the new name format
    -     */
    -    public final void setNameFormat(final String newNameFormat) {
    -	this.nameFormat = prepareForAssignment(this.nameFormat, newNameFormat);
    -    }
    -
    -    /**
    -     * Sets the unknown attributes.
    -     * 
    -     * @param newUnknownAttr the new unknown attributes
    -     */
    -    public final void setUnknownAttributes(final AttributeMap newUnknownAttr) {
    -	this.unknownAttributes = newUnknownAttr;
    -    }
    -
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +public class RequestedAttributeImpl extends AbstractSAMLObject implements RequestedAttribute {
    +
    +	private static final Logger LOGGER = LoggerFactory.getLogger(RequestedAttributeImpl.class.getName());
    +	/**
    +	 * The attribute values.
    +	 */
    +	private final XMLObjectChildrenList attributeValues;
    +
    +	/**
    +	 * The friendly name.
    +	 * 
    +	 */
    +	private String friendlyName;
    +
    +	/**
    +	 * The is required.
    +	 */
    +	private String isRequired;
    +
    +	/**
    +	 * The name.
    +	 * 
    +	 */
    +	private String name;
    +
    +	/**
    +	 * The name format.
    +	 * 
    +	 */
    +	private String nameFormat;
    +
    +	/**
    +	 * The unknown attributes.
    +	 * 
    +	 */
    +	private AttributeMap unknownAttributes;
    +
    +	/**
    +	 * Instantiates a new requested attribute impl.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected RequestedAttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +		unknownAttributes = new AttributeMap(this);
    +		attributeValues = new XMLObjectChildrenList(this);
    +	}
    +
    +	/**
    +	 * Gets the attribute values.
    +	 *
    +	 * @return the attribute values
    +	 */
    +	public final List getAttributeValues() {
    +		return attributeValues;
    +	}
    +
    +	/**
    +	 * Gets the friendly name.
    +	 *
    +	 * @return the friendly name.
    +	 */
    +	public final String getFriendlyName() {
    +		return friendlyName;
    +	}
    +
    +	/**
    +	 * Gets the checks if is required.
    +	 *
    +	 * @return the boolean if it's required.
    +	 */
    +	public final String isRequired() {
    +		return isRequired;
    +	}
    +
    +	/**
    +	 * Gets the is required xs boolean.
    +	 * 
    +	 * @return the XSBoolean if it's required.
    +	 */
    +	public final String getIsRequiredXSBoolean() {
    +		return isRequired;
    +	}
    +
    +	/**
    +	 * Gets the name.
    +	 *
    +	 * @return the name
    +	 */
    +	public final String getName() {
    +		return name;
    +	}
    +
    +	/**
    +	 * Gets the name format.
    +	 *
    +	 * @return the name format.
    +	 */
    +	public final String getNameFormat() {
    +		return nameFormat;
    +	}
    +
    +	/**
    +	 * Gets the ordered children.
    +	 * 
    +	 * @return the list of XMLObject.
    +	 */
    +	public final List getOrderedChildren() {
    +		final ArrayList children = new ArrayList();
    +		children.addAll(attributeValues);
    +		return Collections.unmodifiableList(children);
    +	}
    +
    +	/**
    +	 * Gets the unknown attributes.
    +	 *
    +	 * @return the attribute map
    +	 */
    +	public final AttributeMap getUnknownAttributes() {
    +		return unknownAttributes;
    +	}
    +
    +	/**
    +	 * Sets the friendly name.
    +	 * 
    +	 * @param newFriendlyName
    +	 *            the new friendly name format
    +	 */
    +	public final void setFriendlyName(final String newFriendlyName) {
    +		this.friendlyName = prepareForAssignment(this.friendlyName, newFriendlyName);
    +	}
    +
    +	/**
    +	 * Set new boolean value isRequired.
    +	 * 
    +	 * @param newIsRequired
    +	 *            then new value
    +	 */
    +	public final void setIsRequired(final String newIsRequired) {
    +		isRequired = prepareForAssignment(this.isRequired, newIsRequired);
    +
    +	}
    +
    +	/**
    +	 * Sets the name.
    +	 * 
    +	 * @param newName
    +	 *            the new name
    +	 */
    +	public final void setName(final String newName) {
    +		this.name = prepareForAssignment(this.name, newName);
    +	}
    +
    +	/**
    +	 * Sets the name format.
    +	 * 
    +	 * @param newNameFormat
    +	 *            the new name format
    +	 */
    +	public final void setNameFormat(final String newNameFormat) {
    +		this.nameFormat = prepareForAssignment(this.nameFormat, newNameFormat);
    +	}
    +
    +	/**
    +	 * Sets the unknown attributes.
    +	 * 
    +	 * @param newUnknownAttr
    +	 *            the new unknown attributes
    +	 */
    +	public final void setUnknownAttributes(final AttributeMap newUnknownAttr) {
    +		this.unknownAttributes = newUnknownAttr;
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java
    index 1a14a118a..4a9ec94b1 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java
    @@ -36,54 +36,44 @@ import eu.stork.peps.auth.engine.core.RequestedAttribute;
      */
     public class RequestedAttributeMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall attributes.
    -     *
    -     * @param samlElement the SAML element
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallAttributes(final XMLObject samlElement,
    -	    final Element domElement) throws MarshallingException {
    -	final RequestedAttribute requestedAttr = (RequestedAttribute) samlElement;
    +	/**
    +	 * Marshall attributes.
    +	 *
    +	 * @param samlElement
    +	 *            the SAML element
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
    +		final RequestedAttribute requestedAttr = (RequestedAttribute) samlElement;
     
    -	if (requestedAttr.getName() != null) {
    -	    domElement.setAttributeNS(null,
    -		    RequestedAttribute.NAME_ATTRIB_NAME, requestedAttr
    -			    .getName());
    -	}
    +		if (requestedAttr.getName() != null) {
    +			domElement.setAttributeNS(null, RequestedAttribute.NAME_ATTRIB_NAME, requestedAttr.getName());
    +		}
     
    -	if (requestedAttr.getNameFormat() != null) {
    -	    domElement.setAttributeNS(null,
    -		    RequestedAttribute.NAME_FORMAT_ATTR, requestedAttr
    -			    .getNameFormat());
    -	}
    +		if (requestedAttr.getNameFormat() != null) {
    +			domElement.setAttributeNS(null, RequestedAttribute.NAME_FORMAT_ATTR, requestedAttr.getNameFormat());
    +		}
     
    -	if (requestedAttr.getFriendlyName() != null) {
    -	    domElement.setAttributeNS(null,
    -		    RequestedAttribute.FRIENDLY_NAME_ATT, requestedAttr
    -			    .getFriendlyName());
    -	}
    +		if (requestedAttr.getFriendlyName() != null) {
    +			domElement.setAttributeNS(null, RequestedAttribute.FRIENDLY_NAME_ATT, requestedAttr.getFriendlyName());
    +		}
     
    -	if (requestedAttr.getIsRequiredXSBoolean() != null) {
    -	    domElement.setAttributeNS(null,
    -		    RequestedAttribute.IS_REQUIRED_ATTR, requestedAttr
    -			    .getIsRequiredXSBoolean().toString());
    -	}
    +		if (requestedAttr.getIsRequiredXSBoolean() != null) {
    +			domElement.setAttributeNS(null, RequestedAttribute.IS_REQUIRED_ATTR, requestedAttr.getIsRequiredXSBoolean().toString());
    +		}
     
    -	Attr attr;
    -	for (Entry entry : requestedAttr.getUnknownAttributes()
    -		.entrySet()) {
    -	    attr = XMLHelper.constructAttribute(domElement.getOwnerDocument(),
    -		    entry.getKey());
    -	    attr.setValue(entry.getValue());
    -	    domElement.setAttributeNodeNS(attr);
    -	    if (Configuration.isIDAttribute(entry.getKey())
    -		    || requestedAttr.getUnknownAttributes().isIDAttribute(
    -			    entry.getKey())) {
    -		attr.getOwnerElement().setIdAttributeNode(attr, true);
    -	    }
    +		Attr attr;
    +		for (Entry entry : requestedAttr.getUnknownAttributes().entrySet()) {
    +			attr = XMLHelper.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
    +			attr.setValue(entry.getValue());
    +			domElement.setAttributeNodeNS(attr);
    +			if (Configuration.isIDAttribute(entry.getKey()) || requestedAttr.getUnknownAttributes().isIDAttribute(entry.getKey())) {
    +				attr.getOwnerElement().setIdAttributeNode(attr, true);
    +			}
    +		}
     	}
    -    }
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java
    index c07f852d9..098ece427 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java
    @@ -33,64 +33,60 @@ import eu.stork.peps.auth.engine.core.SAMLCore;
      * 
      * @author fjquevedo
      */
    -public class RequestedAttributeUnmarshaller extends
    -	AbstractSAMLObjectUnmarshaller {
    +public class RequestedAttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process child element.
    -     * 
    -     * @param parentSAMLObject parent SAMLObject
    -     * @param childSAMLObject child SAMLObject
    -     * 
    -     * @throws UnmarshallingException error at unmarshall XML object
    -     */
    -    protected final void processChildElement(final XMLObject parentSAMLObject,
    -	    final XMLObject childSAMLObject) throws UnmarshallingException {
    +	/**
    +	 * Process child element.
    +	 * 
    +	 * @param parentSAMLObject
    +	 *            parent SAMLObject
    +	 * @param childSAMLObject
    +	 *            child SAMLObject
    +	 * 
    +	 * @throws UnmarshallingException
    +	 *             error at unmarshall XML object
    +	 */
    +	protected final void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject) throws UnmarshallingException {
     
    -	final RequestedAttribute requestedAttr = (RequestedAttribute) parentSAMLObject;
    +		final RequestedAttribute requestedAttr = (RequestedAttribute) parentSAMLObject;
     
    -	final QName childQName = childSAMLObject.getElementQName();
    -	if (childQName.getLocalPart().equals("AttributeValue")
    -		&& childQName.getNamespaceURI().equals(SAMLCore.STORK10_NS.getValue())) {
    -	    requestedAttr.getAttributeValues().add(childSAMLObject);
    -	} else {
    -	    super.processChildElement(parentSAMLObject, childSAMLObject);
    +		final QName childQName = childSAMLObject.getElementQName();
    +		if (childQName.getLocalPart().equals("AttributeValue") && childQName.getNamespaceURI().equals(SAMLCore.STORK10_NS.getValue())) {
    +			requestedAttr.getAttributeValues().add(childSAMLObject);
    +		} else {
    +			super.processChildElement(parentSAMLObject, childSAMLObject);
    +		}
     	}
    -    }
     
    -    /**
    -     * Process attribute.
    -     *
    -     * @param samlObject the SAML object
    -     * @param attribute the attribute
    -     * @throws UnmarshallingException the unmarshalling exception
    -     */
    -    protected final void processAttribute(final XMLObject samlObject,
    -	    final Attr attribute) throws UnmarshallingException {
    +	/**
    +	 * Process attribute.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param attribute
    +	 *            the attribute
    +	 * @throws UnmarshallingException
    +	 *             the unmarshalling exception
    +	 */
    +	protected final void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
     
    -	final RequestedAttribute requestedAttr = (RequestedAttribute) samlObject;
    +		final RequestedAttribute requestedAttr = (RequestedAttribute) samlObject;
     
    -	if (attribute.getLocalName()
    -		.equals(RequestedAttribute.NAME_ATTRIB_NAME)) {
    -	    requestedAttr.setName(attribute.getValue());
    -	} else if (attribute.getLocalName().equals(
    -		RequestedAttribute.NAME_FORMAT_ATTR)) {
    -	    requestedAttr.setNameFormat(attribute.getValue());
    -	} else if (attribute.getLocalName().equals(
    -		RequestedAttribute.FRIENDLY_NAME_ATT)) {
    -	    requestedAttr.setFriendlyName(attribute.getValue());
    -	} else if (attribute.getLocalName().equals(
    -		RequestedAttribute.IS_REQUIRED_ATTR)) {
    -	    requestedAttr.setIsRequired(attribute
    -		    .getValue());
    +		if (attribute.getLocalName().equals(RequestedAttribute.NAME_ATTRIB_NAME)) {
    +			requestedAttr.setName(attribute.getValue());
    +		} else if (attribute.getLocalName().equals(RequestedAttribute.NAME_FORMAT_ATTR)) {
    +			requestedAttr.setNameFormat(attribute.getValue());
    +		} else if (attribute.getLocalName().equals(RequestedAttribute.FRIENDLY_NAME_ATT)) {
    +			requestedAttr.setFriendlyName(attribute.getValue());
    +		} else if (attribute.getLocalName().equals(RequestedAttribute.IS_REQUIRED_ATTR)) {
    +			requestedAttr.setIsRequired(attribute.getValue());
     
    -	} else {
    -	    final QName attribQName = XMLHelper.getNodeQName(attribute);
    -	    if (attribute.isId()) {
    -		requestedAttr.getUnknownAttributes().registerID(attribQName);
    -	    }
    -	    requestedAttr.getUnknownAttributes().put(attribQName,
    -		    attribute.getValue());
    +		} else {
    +			final QName attribQName = XMLHelper.getNodeQName(attribute);
    +			if (attribute.isId()) {
    +				requestedAttr.getUnknownAttributes().registerID(attribQName);
    +			}
    +			requestedAttr.getUnknownAttributes().put(attribQName, attribute.getValue());
    +		}
     	}
    -    }
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java
    index d421c53d2..c9643d7ae 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java
    @@ -24,31 +24,30 @@ import eu.stork.peps.auth.engine.core.RequestedAttributes;
      * 
      * @author fjquevedo
      */
    -public class RequestedAttributesBuilder extends
    -	AbstractSAMLObjectBuilder {
    -
    -
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the requested attributes
    -     */
    -    public final RequestedAttributes buildObject() {
    -	return buildObject(RequestedAttributes.DEF_ELEMENT_NAME);
    -    }
    -
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the requested attributes
    -     */
    -    public final RequestedAttributes buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new RequestedAttributesImpl(namespaceURI, localName,
    -		namespacePrefix);
    -    }
    +public class RequestedAttributesBuilder extends AbstractSAMLObjectBuilder {
    +
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the requested attributes
    +	 */
    +	public final RequestedAttributes buildObject() {
    +		return buildObject(RequestedAttributes.DEF_ELEMENT_NAME);
    +	}
    +
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the requested attributes
    +	 */
    +	public final RequestedAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new RequestedAttributesImpl(namespaceURI, localName, namespacePrefix);
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
    index 0a5b37add..ad81e4846 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
    @@ -31,65 +31,64 @@ import eu.stork.peps.auth.engine.core.RequestedAttributes;
      * 
      * @author fjquevedo
      */
    -public class RequestedAttributesImpl extends AbstractSAMLObject implements
    -	RequestedAttributes {
    -
    -    /**
    -     * Instantiates a new requested attributes implement.
    -     * 
    -     * @param namespaceURI the namespace URI
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected RequestedAttributesImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -	indexedChildren = new IndexedXMLObjectChildrenList(this);
    -    }
    -
    -    /** The indexed children. */
    -    private final IndexedXMLObjectChildrenList indexedChildren;
    -
    -    /**
    -     * Gets the indexed children.
    -     * 
    -     * @return the indexed children
    -     */
    -    public final IndexedXMLObjectChildrenList getIndexedChildren() {
    -	return indexedChildren;
    -    }
    -
    -
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -
    -	final ArrayList children = new ArrayList();
    -
    -	children.addAll(indexedChildren);
    -
    -	return Collections.unmodifiableList(children);
    -
    -    }
    -
    -    /**
    -     * Gets the attributes.
    -     * 
    -     * @return the attributes
    -     * 
    -     * @see eu.stork.peps.auth.engine.core.RequestedAttributes#getAttributes()
    -     */
    -    @SuppressWarnings("unchecked")
    -    public final List getAttributes() {
    -	return (List) indexedChildren
    -		.subList(RequestedAttribute.DEF_ELEMENT_NAME);
    -    }
    -
    -    @Override
    -    public int hashCode() {
    -        throw new UnsupportedOperationException("hashCode method not implemented");
    -    }
    +public class RequestedAttributesImpl extends AbstractSAMLObject implements RequestedAttributes {
    +
    +	/**
    +	 * Instantiates a new requested attributes implement.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace URI
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected RequestedAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +		indexedChildren = new IndexedXMLObjectChildrenList(this);
    +	}
    +
    +	/** The indexed children. */
    +	private final IndexedXMLObjectChildrenList indexedChildren;
    +
    +	/**
    +	 * Gets the indexed children.
    +	 * 
    +	 * @return the indexed children
    +	 */
    +	public final IndexedXMLObjectChildrenList getIndexedChildren() {
    +		return indexedChildren;
    +	}
    +
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +
    +		final ArrayList children = new ArrayList();
    +
    +		children.addAll(indexedChildren);
    +
    +		return Collections.unmodifiableList(children);
    +
    +	}
    +
    +	/**
    +	 * Gets the attributes.
    +	 * 
    +	 * @return the attributes
    +	 * 
    +	 * @see eu.stork.peps.auth.engine.core.RequestedAttributes#getAttributes()
    +	 */
    +	@SuppressWarnings("unchecked")
    +	public final List getAttributes() {
    +		return (List) indexedChildren.subList(RequestedAttribute.DEF_ELEMENT_NAME);
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		throw new UnsupportedOperationException("hashCode method not implemented");
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java
    index dfc42adf3..e1b15015e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java
    @@ -24,10 +24,10 @@ import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
      */
     public class RequestedAttributesMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Instantiates a new requested attributes marshaller.
    -     */
    -    public RequestedAttributesMarshaller() {
    -	super();
    -    }
    +	/**
    +	 * Instantiates a new requested attributes marshaller.
    +	 */
    +	public RequestedAttributesMarshaller() {
    +		super();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java
    index 41b3afa40..69990ebe5 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java
    @@ -27,26 +27,27 @@ import eu.stork.peps.auth.engine.core.RequestedAttributes;
      * 
      * @author fjquevedo
      */
    -public class RequestedAttributesUnmarshaller extends
    -	AbstractSAMLObjectUnmarshaller {
    +public class RequestedAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process child element.
    -     * 
    -     * @param parentObject the parent object
    -     * @param childObject the child object
    -     * 
    -     * @throws UnmarshallingException error in unmarshall
    -     */
    -    protected final void processChildElement(final XMLObject parentObject,
    -	    final XMLObject childObject) throws UnmarshallingException {
    -	final RequestedAttributes attrStatement = (RequestedAttributes) parentObject;
    +	/**
    +	 * Process child element.
    +	 * 
    +	 * @param parentObject
    +	 *            the parent object
    +	 * @param childObject
    +	 *            the child object
    +	 * 
    +	 * @throws UnmarshallingException
    +	 *             error in unmarshall
    +	 */
    +	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
    +		final RequestedAttributes attrStatement = (RequestedAttributes) parentObject;
     
    -	if (childObject instanceof RequestedAttribute) {
    -	    attrStatement.getAttributes().add((RequestedAttribute) childObject);
    -	} else {
    -	    super.processChildElement(parentObject, childObject);
    +		if (childObject instanceof RequestedAttribute) {
    +			attrStatement.getAttributes().add((RequestedAttribute) childObject);
    +		} else {
    +			super.processChildElement(parentObject, childObject);
    +		}
     	}
    -    }
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
    index a35c77936..6d9f9bf1e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
    @@ -24,28 +24,29 @@ import eu.stork.peps.auth.engine.core.SPApplication;
      * 
      * @author fjquevedo
      */
    -public class SPApplicationBuilder extends
    -	AbstractSAMLObjectBuilder {
    +public class SPApplicationBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the service provider application
    -     */
    -    public final SPApplication buildObject() {
    -	return buildObject(SPApplication.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the service provider application
    +	 */
    +	public final SPApplication buildObject() {
    +		return buildObject(SPApplication.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the service provider application
    -     */
    -    public final SPApplication buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new SPApplicationImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the service provider application
    +	 */
    +	public final SPApplication buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new SPApplicationImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
    index 0a428a521..276697d6a 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
    @@ -29,56 +29,57 @@ import org.slf4j.LoggerFactory;
      * 
      * @author fjquevedo
      */
    -public class SPApplicationImpl extends AbstractSAMLObject implements
    -	SPApplication {
    +public class SPApplicationImpl extends AbstractSAMLObject implements SPApplication {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(SPApplicationImpl.class.getName());
    -    /** The service provider application. */
    -    private String spApplication;
    +	private static final Logger LOGGER = LoggerFactory.getLogger(SPApplicationImpl.class.getName());
    +	/** The service provider application. */
    +	private String spApplication;
     
    -    /**
    -     * Instantiates a new service provider application.
    -     * 
    -     * @param namespaceURI the namespace uri
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected SPApplicationImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    +	/**
    +	 * Instantiates a new service provider application.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected SPApplicationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    /**
    -     * Gets the service provider application.
    -     *
    -     * @return the service provider application
    -     */
    -    public final String getSPApplication() {
    -	return spApplication;
    -    }
    +	/**
    +	 * Gets the service provider application.
    +	 *
    +	 * @return the service provider application
    +	 */
    +	public final String getSPApplication() {
    +		return spApplication;
    +	}
     
    -    /**
    -     * Sets the service provider application.
    -     *
    -     * @param newSpApplication the new service provider application
    -     */
    -    public final void setSPApplication(final String newSpApplication) {
    -	this.spApplication = prepareForAssignment(this.spApplication,
    -		newSpApplication);
    -    }
    +	/**
    +	 * Sets the service provider application.
    +	 *
    +	 * @param newSpApplication
    +	 *            the new service provider application
    +	 */
    +	public final void setSPApplication(final String newSpApplication) {
    +		this.spApplication = prepareForAssignment(this.spApplication, newSpApplication);
    +	}
     
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java
    index 4866c3535..d9268c550 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java
    @@ -30,17 +30,18 @@ import eu.stork.peps.auth.engine.core.SPApplication;
      */
     public class SPApplicationMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallElementContent(final XMLObject samlObject,
    -	    final Element domElement) throws MarshallingException {
    -	final SPApplication spApplication = (SPApplication) samlObject;
    -	XMLHelper.appendTextContent(domElement, spApplication
    -		.getSPApplication());
    -    }
    +	/**
    +	 * Marshall element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
    +		final SPApplication spApplication = (SPApplication) samlObject;
    +		XMLHelper.appendTextContent(domElement, spApplication.getSPApplication());
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java
    index a28432a13..9fb514cf0 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java
    @@ -20,7 +20,6 @@ import org.opensaml.xml.XMLObject;
     
     import eu.stork.peps.auth.engine.core.SPApplication;
     
    -
     /**
      * The Class SPApplicationUnmarshaller.
      * 
    @@ -28,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPApplication;
      */
     public class SPApplicationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param elementContent the element content
    -     */
    -    protected final void processElementContent(final XMLObject samlObject,
    -	    final String elementContent) {
    -	final SPApplication spApplication = (SPApplication) samlObject;
    -	spApplication.setSPApplication(elementContent);
    -    }
    +	/**
    +	 * Process element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
    +	 */
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
    +		final SPApplication spApplication = (SPApplication) samlObject;
    +		spApplication.setSPApplication(elementContent);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java
    index 48ec92f49..2c6c124e3 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java
    @@ -26,27 +26,27 @@ import eu.stork.peps.auth.engine.core.SPCountry;
      */
     public class SPCountryBuilder extends AbstractSAMLObjectBuilder {
     
    -    
    -    /**
    -     * Builds the object SPCountry.
    -     *
    -     * @return the service provider country
    -     */
    -    public final SPCountry buildObject() {
    -	return buildObject(SPCountry.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object SPCountry.
    +	 *
    +	 * @return the service provider country
    +	 */
    +	public final SPCountry buildObject() {
    +		return buildObject(SPCountry.DEF_ELEMENT_NAME);
    +	}
     
    -    
    -    /**
    -     * Builds the object SPCountry.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the service provider country
    -     */
    -    public final SPCountry buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new SPCountryImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object SPCountry.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the service provider country
    +	 */
    +	public final SPCountry buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new SPCountryImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
    index 40a1ac86a..404a90079 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
    @@ -31,52 +31,55 @@ import org.slf4j.LoggerFactory;
      */
     public class SPCountryImpl extends AbstractSAMLObject implements SPCountry {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(SPCountryImpl.class.getName());
    -    /** The service provider country. */
    -    private String spCountry;
    +	private static final Logger LOGGER = LoggerFactory.getLogger(SPCountryImpl.class.getName());
    +	/** The service provider country. */
    +	private String spCountry;
     
    -    /**
    -     * Instantiates a new service provider country.
    -     * 
    -     * @param namespaceURI the namespace uri
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected SPCountryImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    +	/**
    +	 * Instantiates a new service provider country.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected SPCountryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    /**
    -     * Gets the service provider country.
    -     *
    -     * @return the service provider country
    -     */
    -    public final String getSPCountry() {
    -	return spCountry;
    -    }
    +	/**
    +	 * Gets the service provider country.
    +	 *
    +	 * @return the service provider country
    +	 */
    +	public final String getSPCountry() {
    +		return spCountry;
    +	}
     
    -    /**
    -     * Sets the service provider country.
    -     *
    -     * @param newSpCountry the new service provider country
    -     */
    -    public final void setSPCountry(final String newSpCountry) {
    -	this.spCountry = prepareForAssignment(this.spCountry, newSpCountry);
    -    }
    +	/**
    +	 * Sets the service provider country.
    +	 *
    +	 * @param newSpCountry
    +	 *            the new service provider country
    +	 */
    +	public final void setSPCountry(final String newSpCountry) {
    +		this.spCountry = prepareForAssignment(this.spCountry, newSpCountry);
    +	}
     
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java
    index e82634749..1bd7121f0 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java
    @@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.SPCountry;
      */
     public class SPCountryMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallElementContent(final XMLObject samlObject,
    -	    final Element domElement) throws MarshallingException {
    -	final SPCountry spCountry = (SPCountry) samlObject;
    -	XMLHelper.appendTextContent(domElement, spCountry.getSPCountry());
    -    }
    +	/**
    +	 * Marshall element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
    +		final SPCountry spCountry = (SPCountry) samlObject;
    +		XMLHelper.appendTextContent(domElement, spCountry.getSPCountry());
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
    index deb695ac6..c9ac243f1 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
    @@ -20,7 +20,6 @@ import org.opensaml.xml.XMLObject;
     
     import eu.stork.peps.auth.engine.core.SPCountry;
     
    -
     /**
      * The Class SPCountryUnmarshaller.
      * 
    @@ -28,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPCountry;
      */
     public class SPCountryUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param elementContent the element content
    -     */
    -    protected final void processElementContent(final XMLObject samlObject,
    -	    final String elementContent) {
    -	final SPCountry spCountry = (SPCountry) samlObject;
    -	spCountry.setSPCountry(elementContent);
    -    }
    +	/**
    +	 * Process element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
    +	 */
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
    +		final SPCountry spCountry = (SPCountry) samlObject;
    +		spCountry.setSPCountry(elementContent);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java
    index b3640947b..2cee08268 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java
    @@ -26,25 +26,27 @@ import eu.stork.peps.auth.engine.core.SPID;
      */
     public class SPIDBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the SP ID
    -     */
    -    public final SPID buildObject() {
    -	return buildObject(SPID.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the SP ID
    +	 */
    +	public final SPID buildObject() {
    +		return buildObject(SPID.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the citizen country code
    -     */
    -    public final SPID buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new SPIDImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the citizen country code
    +	 */
    +	public final SPID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new SPIDImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
    index 68611997b..cea51a5a8 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
    @@ -31,52 +31,55 @@ import org.slf4j.LoggerFactory;
      */
     public class SPIDImpl extends AbstractSAMLObject implements SPID {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(SPIDImpl.class.getName());
    -    /** The citizen country code. */
    -    private String spId;
    -    
    -    /**
    -     * Instantiates a new sP country impl.
    -     * 
    -     * @param namespaceURI the namespace uri
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */   
    -    protected SPIDImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);	
    -    }
    +	private static final Logger LOGGER = LoggerFactory.getLogger(SPIDImpl.class.getName());
    +	/** The citizen country code. */
    +	private String spId;
     
    -    /**
    -     * Gets the SP ID.
    -     *
    -     * @return the SP ID
    -     */
    -    public final String getSPID() {
    -    	return spId;
    -    }
    +	/**
    +	 * Instantiates a new sP country impl.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected SPIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    /**
    -     * Sets the SP ID.
    -     *
    -     * @param newSPID the new SP ID
    -     */
    -    public final void setSPID(final String newSPID) {
    -    	this.spId = prepareForAssignment(this.spId, newSPID);
    -    }
    +	/**
    +	 * Gets the SP ID.
    +	 *
    +	 * @return the SP ID
    +	 */
    +	public final String getSPID() {
    +		return spId;
    +	}
     
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -    	return null;
    -    }
    +	/**
    +	 * Sets the SP ID.
    +	 *
    +	 * @param newSPID
    +	 *            the new SP ID
    +	 */
    +	public final void setSPID(final String newSPID) {
    +		this.spId = prepareForAssignment(this.spId, newSPID);
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java
    index 24389522e..d8cac34fc 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java
    @@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.SPID;
      */
     public class SPIDMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallElementContent(final XMLObject samlObject,
    -	    final Element domElement) throws MarshallingException {
    -	final SPID spid = (SPID) samlObject;
    -	XMLHelper.appendTextContent(domElement, spid.getSPID());
    -    }
    +	/**
    +	 * Marshall element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
    +		final SPID spid = (SPID) samlObject;
    +		XMLHelper.appendTextContent(domElement, spid.getSPID());
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java
    index e4d230b94..ab3aef878 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java
    @@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPID;
      */
     public class SPIDUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param elementContent the element content
    -     */
    -    protected final void processElementContent(final XMLObject samlObject,
    -	    final String elementContent) {
    -	final SPID spid = (SPID) samlObject;
    -	spid.setSPID(elementContent);
    -    }
    +	/**
    +	 * Process element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
    +	 */
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
    +		final SPID spid = (SPID) samlObject;
    +		spid.setSPID(elementContent);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java
    index a6e1fe686..af7c97d19 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java
    @@ -26,16 +26,15 @@ import eu.stork.peps.auth.engine.core.SPInformation;
      * @author iinigo
      */
     public final class SPInformationBuilder extends AbstractSAMLObjectBuilder {
    -    
     
    -    /** {@inheritDoc} */
    -    public SPInformation buildObject() {
    -        return buildObject(SAMLCore.STORK10P_NS.getValue(), SPInformation.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    -    }
    +	/** {@inheritDoc} */
    +	public SPInformation buildObject() {
    +		return buildObject(SAMLCore.STORK10P_NS.getValue(), SPInformation.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +	}
    +
    +	/** {@inheritDoc} */
    +	public SPInformation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new SPInformationImpl(namespaceURI, localName, namespacePrefix);
    +	}
     
    -    /** {@inheritDoc} */
    -    public SPInformation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    -        return new SPInformationImpl(namespaceURI, localName, namespacePrefix);
    -    }
    -    
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
    index ff6e90999..4089f0862 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
    @@ -27,84 +27,83 @@ import eu.stork.peps.auth.engine.core.SPInformation;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     
    -
     /**
      * The Class SPInformationImpl.
      * 
      * @author iinigo
      */
    -public final class SPInformationImpl extends AbstractSignableSAMLObject implements
    -SPInformation {
    -
    -    private static final Logger LOGGER = LoggerFactory.getLogger(SPInformationImpl.class.getName());
    -    /** The citizen country code. */
    -    private SPID spId;
    -    
    -    
    +public final class SPInformationImpl extends AbstractSignableSAMLObject implements SPInformation {
    +
    +	private static final Logger LOGGER = LoggerFactory.getLogger(SPInformationImpl.class.getName());
    +	/** The citizen country code. */
    +	private SPID spId;
    +
    +	/**
    +	 * Instantiates a new requested attributes implement.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace URI
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected SPInformationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
    +
     	/**
    -     * Instantiates a new requested attributes implement.
    -     * 
    -     * @param namespaceURI the namespace URI
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected SPInformationImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {	
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    -    
    -   
    -    /**
    -     * getSPId.
    -     * 
    -     * @return the SP ID
    -     */    
    -    public SPID getSPID() {
    -    	return spId;
    -    }        
    -
    -    /**
    -     * Gets the ordered children.
    -     * 
    -     * @return the ordered children
    -     *
    -     */
    -    public List getOrderedChildren() {
    -	final ArrayList children = new ArrayList();
    -
    -	children.add(spId);
    -		
    -	if (getSignature() != null) {
    -	    children.add(getSignature());
    +	 * getSPId.
    +	 * 
    +	 * @return the SP ID
    +	 */
    +	public SPID getSPID() {
    +		return spId;
    +	}
    +
    +	/**
    +	 * Gets the ordered children.
    +	 * 
    +	 * @return the ordered children
    +	 *
    +	 */
    +	public List getOrderedChildren() {
    +		final ArrayList children = new ArrayList();
    +
    +		children.add(spId);
    +
    +		if (getSignature() != null) {
    +			children.add(getSignature());
    +		}
    +
    +		return Collections.unmodifiableList(children);
    +
    +	}
    +
    +	/**
    +	 * Gets the signature reference id.
    +	 * 
    +	 * @return the signature reference id
    +	 *
    +	 */
    +	public String getSignatureReferenceID() {
    +		return null;
    +	}
    +
    +	/**
    +	 * Sets the SP Id.
    +	 * 
    +	 * @param newSPId
    +	 *            the new SP Id
    +	 *
    +	 */
    +	public void setSPID(SPID newSPId) {
    +		this.spId = prepareForAssignment(this.spId, newSPId);
    +	}
    +
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
     	}
    -	
    -	return Collections.unmodifiableList(children);
    -
    -    }
    -
    -    /**
    -     * Gets the signature reference id.
    -     * 
    -     * @return the signature reference id
    -     *
    -     */
    -    public String getSignatureReferenceID() {
    -	return null;
    -    }
    -    
    -    /**
    -     * Sets the SP Id.
    -     * 
    -     * @param newSPId the new SP Id
    -     *
    -     */
    -    public void setSPID(SPID newSPId) {
    -    	this.spId = prepareForAssignment(this.spId, newSPId);	
    -    }
    -
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java
    index 44845948c..027e49e9d 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java
    @@ -24,10 +24,10 @@ import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
      */
     public class SPInformationMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Instantiates a new SP Information marshaller.
    -     */
    -    public SPInformationMarshaller() {
    -	super();
    -    }
    +	/**
    +	 * Instantiates a new SP Information marshaller.
    +	 */
    +	public SPInformationMarshaller() {
    +		super();
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java
    index 414b93386..ecf69e2c7 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java
    @@ -27,26 +27,27 @@ import eu.stork.peps.auth.engine.core.SPInformation;
      * 
      * @author iinigo
      */
    -public class SPInformationUnmarshaller extends
    -	AbstractSAMLObjectUnmarshaller {
    +public class SPInformationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process child element.
    -     * 
    -     * @param parentObject the parent object
    -     * @param childObject the child object
    -     * 
    -     * @throws UnmarshallingException the unmarshalling exception
    -     *
    -     */
    -    protected final void processChildElement(final XMLObject parentObject,
    -	    final XMLObject childObject) throws UnmarshallingException {
    -	final SPInformation spInformation = (SPInformation) parentObject;
    +	/**
    +	 * Process child element.
    +	 * 
    +	 * @param parentObject
    +	 *            the parent object
    +	 * @param childObject
    +	 *            the child object
    +	 * 
    +	 * @throws UnmarshallingException
    +	 *             the unmarshalling exception
    +	 *
    +	 */
    +	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
    +		final SPInformation spInformation = (SPInformation) parentObject;
     
    -	if (childObject instanceof SPID) {
    -        spInformation.setSPID((SPID) childObject);
    -	} else {
    -	    super.processChildElement(parentObject, childObject);
    -	}	
    -    }
    +		if (childObject instanceof SPID) {
    +			spInformation.setSPID((SPID) childObject);
    +		} else {
    +			super.processChildElement(parentObject, childObject);
    +		}
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java
    index fe47cf99c..d26b15a1e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java
    @@ -24,28 +24,29 @@ import eu.stork.peps.auth.engine.core.SPInstitution;
      * 
      * @author fjquevedo
      */
    -public class SPInstitutionBuilder extends
    -	AbstractSAMLObjectBuilder {
    +public class SPInstitutionBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object.
    -     *
    -     * @return the service provider institution
    -     */
    -    public final SPInstitution buildObject() {
    -	return buildObject(SPInstitution.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object.
    +	 *
    +	 * @return the service provider institution
    +	 */
    +	public final SPInstitution buildObject() {
    +		return buildObject(SPInstitution.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object SPInstitution.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the service provider institution
    -     */
    -    public final SPInstitution buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new SPInstitutionImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object SPInstitution.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the service provider institution
    +	 */
    +	public final SPInstitution buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new SPInstitutionImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
    index 38438613a..054481744 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
    @@ -29,56 +29,57 @@ import org.slf4j.LoggerFactory;
      * 
      * @author fjquevedo
      */
    -public class SPInstitutionImpl extends AbstractSAMLObject implements
    -	SPInstitution {
    +public class SPInstitutionImpl extends AbstractSAMLObject implements SPInstitution {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(SPInstitutionImpl.class.getName());
    -    /** The service provider institution. */
    -    private String spInstitution;
    +	private static final Logger LOGGER = LoggerFactory.getLogger(SPInstitutionImpl.class.getName());
    +	/** The service provider institution. */
    +	private String spInstitution;
     
    -    /**
    -     * Instantiates a new service provider institution.
    -     * 
    -     * @param namespaceURI the namespace uri
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected SPInstitutionImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    +	/**
    +	 * Instantiates a new service provider institution.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected SPInstitutionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    /**
    -     * Gets the service provider institution.
    -     *
    -     * @return the service provider institution
    -     */
    -    public final String getSPInstitution() {
    -	return spInstitution;
    -    }
    +	/**
    +	 * Gets the service provider institution.
    +	 *
    +	 * @return the service provider institution
    +	 */
    +	public final String getSPInstitution() {
    +		return spInstitution;
    +	}
     
    -    /**
    -     * Sets the service provider institution.
    -     *
    -     * @param newSpInstitution the new service provider institution
    -     */
    -    public final void setSPInstitution(final String newSpInstitution) {
    -	this.spInstitution = prepareForAssignment(this.spInstitution,
    -		newSpInstitution);
    -    }
    +	/**
    +	 * Sets the service provider institution.
    +	 *
    +	 * @param newSpInstitution
    +	 *            the new service provider institution
    +	 */
    +	public final void setSPInstitution(final String newSpInstitution) {
    +		this.spInstitution = prepareForAssignment(this.spInstitution, newSpInstitution);
    +	}
     
    -    /**
    -     * Gets the ordered children.
    -     *
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 *
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    - }
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
    +}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java
    index 504a1f035..48bb3fec5 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java
    @@ -30,17 +30,18 @@ import eu.stork.peps.auth.engine.core.SPInstitution;
      */
     public class SPInstitutionMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallElementContent(final XMLObject samlObject,
    -	    final Element domElement) throws MarshallingException {
    -	final SPInstitution spInstitution = (SPInstitution) samlObject;
    -	XMLHelper.appendTextContent(domElement, spInstitution
    -		.getSPInstitution());
    -    }
    +	/**
    +	 * Marshall element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
    +		final SPInstitution spInstitution = (SPInstitution) samlObject;
    +		XMLHelper.appendTextContent(domElement, spInstitution.getSPInstitution());
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java
    index 103d5f2b2..f7b1f440e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java
    @@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPInstitution;
      */
     public class SPInstitutionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param elementContent the element content
    -     */
    -    protected final void processElementContent(final XMLObject samlObject,
    -	    final String elementContent) {
    -	final SPInstitution spInstitution = (SPInstitution) samlObject;
    -	spInstitution.setSPInstitution(elementContent);
    -    }
    +	/**
    +	 * Process element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
    +	 */
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
    +		final SPInstitution spInstitution = (SPInstitution) samlObject;
    +		spInstitution.setSPInstitution(elementContent);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java
    index a691b9008..b97e91b36 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java
    @@ -26,25 +26,27 @@ import eu.stork.peps.auth.engine.core.SPSector;
      */
     public class SPSectorBuilder extends AbstractSAMLObjectBuilder {
     
    -    /**
    -     * Builds the object SPSector.
    -     *
    -     * @return the service provider sector.
    -     */
    -    public final SPSector buildObject() {
    -	return buildObject(SPSector.DEF_ELEMENT_NAME);
    -    }
    +	/**
    +	 * Builds the object SPSector.
    +	 *
    +	 * @return the service provider sector.
    +	 */
    +	public final SPSector buildObject() {
    +		return buildObject(SPSector.DEF_ELEMENT_NAME);
    +	}
     
    -    /**
    -     * Builds the object SPSector.
    -     *
    -     * @param namespaceURI the namespace uri
    -     * @param localName the local name
    -     * @param namespacePrefix the namespace prefix
    -     * @return the service provider sector
    -     */
    -    public final SPSector buildObject(final String namespaceURI,
    -	    final String localName, final String namespacePrefix) {
    -	return new SPSectorImpl(namespaceURI, localName, namespacePrefix);
    -    }
    +	/**
    +	 * Builds the object SPSector.
    +	 *
    +	 * @param namespaceURI
    +	 *            the namespace uri
    +	 * @param localName
    +	 *            the local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 * @return the service provider sector
    +	 */
    +	public final SPSector buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new SPSectorImpl(namespaceURI, localName, namespacePrefix);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java
    index 4ac822876..670198e67 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java
    @@ -22,7 +22,6 @@ import org.opensaml.xml.XMLObject;
     
     import eu.stork.peps.auth.engine.core.SPSector;
     
    -
     /**
      * The Class SPSectorImpl.
      * 
    @@ -30,55 +29,55 @@ import eu.stork.peps.auth.engine.core.SPSector;
      */
     public class SPSectorImpl extends AbstractSAMLObject implements SPSector {
     
    -    /** The service provider sector. */
    -    private String spSector;
    +	/** The service provider sector. */
    +	private String spSector;
     
    -    /**
    -     * Instantiates a new Service provider sector implementation.
    -     * 
    -     * @param namespaceURI the namespace URI
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected SPSectorImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    +	/**
    +	 * Instantiates a new Service provider sector implementation.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace URI
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected SPSectorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
    -    
    -    /**
    -     * Gets the service provider sector.
    -     * 
    -     * @return the SP sector
    -     * 
    -     * @see eu.stork.peps.auth.engine.core.SPSector#getSPSector()
    -     */
    -    public final String getSPSector() {
    -	return spSector;
    -    }
    +	/**
    +	 * Gets the service provider sector.
    +	 * 
    +	 * @return the SP sector
    +	 * 
    +	 * @see eu.stork.peps.auth.engine.core.SPSector#getSPSector()
    +	 */
    +	public final String getSPSector() {
    +		return spSector;
    +	}
     
    -    
    -    /**
    -     * Sets the service provider sector.
    -     * 
    -     * @param newSpSector the new service provider sector
    -     */
    -    public final void setSPSector(final String newSpSector) {
    -	this.spSector = prepareForAssignment(this.spSector, newSpSector);
    -    }
    +	/**
    +	 * Sets the service provider sector.
    +	 * 
    +	 * @param newSpSector
    +	 *            the new service provider sector
    +	 */
    +	public final void setSPSector(final String newSpSector) {
    +		this.spSector = prepareForAssignment(this.spSector, newSpSector);
    +	}
     
    -   
    -    /**
    -     * Gets the ordered children.
    -     * 
    -     * @return the ordered children
    -     */
    -    public final List getOrderedChildren() {
    -	return null;
    -    }
    +	/**
    +	 * Gets the ordered children.
    +	 * 
    +	 * @return the ordered children
    +	 */
    +	public final List getOrderedChildren() {
    +		return null;
    +	}
     
    -    @Override
    -    public int hashCode() {
    -        throw new UnsupportedOperationException("hashCode method not implemented");
    -    }
    +	@Override
    +	public int hashCode() {
    +		throw new UnsupportedOperationException("hashCode method not implemented");
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java
    index c5331e8f4..59e349f9f 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java
    @@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.SPSector;
      */
     public class SPSectorMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Marshall element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param domElement the DOM element
    -     * @throws MarshallingException the marshalling exception
    -     */
    -    protected final void marshallElementContent(final XMLObject samlObject,
    -	    final Element domElement) throws MarshallingException {
    -	final SPSector spSector = (SPSector) samlObject;
    -	XMLHelper.appendTextContent(domElement, spSector.getSPSector());
    -    }
    +	/**
    +	 * Marshall element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param domElement
    +	 *            the DOM element
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 */
    +	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
    +		final SPSector spSector = (SPSector) samlObject;
    +		XMLHelper.appendTextContent(domElement, spSector.getSPSector());
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java
    index cbb05c6e5..e671cee03 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java
    @@ -27,16 +27,16 @@ import eu.stork.peps.auth.engine.core.SPSector;
      */
     public class SPSectorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    
    -    /**
    -     * Process element content.
    -     *
    -     * @param samlObject the SAML object
    -     * @param elementContent the element content
    -     */
    -    protected final void processElementContent(final XMLObject samlObject,
    -	    final String elementContent) {
    -	final SPSector spSector = (SPSector) samlObject;
    -	spSector.setSPSector(elementContent);
    -    }
    +	/**
    +	 * Process element content.
    +	 *
    +	 * @param samlObject
    +	 *            the SAML object
    +	 * @param elementContent
    +	 *            the element content
    +	 */
    +	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
    +		final SPSector spSector = (SPSector) samlObject;
    +		spSector.setSPSector(elementContent);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
    index 80796ea86..6e23d7f24 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
    @@ -64,8 +64,6 @@ import org.opensaml.xml.validation.ValidationException;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     
    -
    -
     import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
     import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
     import eu.stork.peps.exceptions.SAMLEngineException;
    @@ -77,392 +75,345 @@ import eu.stork.peps.exceptions.SAMLEngineException;
      */
     public final class SignHW implements SAMLEngineSignI {
     
    -    /** The Constant CONFIGURATION_FILE. */
    -    private static final String CONF_FILE = "configurationFile";
    -
    -    /** The Constant KEYSTORE_TYPE.
    -    private static final String KEYSTORE_TYPE = "keystoreType" */
    -
    -    /** The logger. */
    -    private static final Logger LOG = LoggerFactory.getLogger(SignHW.class
    -	    .getName());
    -
    -    /** The stork own key store. */
    -    private KeyStore storkOwnKeyStore = null;
    -
    -    /**
    -     * Gets the stork own key store.
    -     * 
    -     * @return the stork own key store
    -     */
    -    public KeyStore getStorkOwnKeyStore() {
    -	return storkOwnKeyStore;
    -    }
    -    
    -    /**
    -     * Gets the stork trustStore.
    -     * 
    -     * @return the stork own key store
    -     */
    -    public KeyStore getTrustStore() {
    -	return storkOwnKeyStore;
    -    }
    -
    -    /**
    -     * Sets the stork own key store.
    -     * 
    -     * @param newkOwnKeyStore the new stork own key store
    -     */
    -    public void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
    -	this.storkOwnKeyStore = newkOwnKeyStore;
    -    }
    -
    -    /**
    -     * Gets the properties.
    -     * 
    -     * @return the properties
    -     */
    -    public Properties getProperties() {
    -	return properties;
    -    }
    -
    -    /**
    -     * Sets the properties.
    -     * 
    -     * @param newProperties the new properties
    -     */
    -    public void setProperties(final Properties newProperties) {
    -	this.properties = newProperties;
    -    }
    -
    -    /** The HW sign prop. */
    -    private Properties properties = null;
    -
    -    /**
    -     * @see
    -     * eu.stork.peps.auth.engine.core.SAMLEngineSignI#init(java.lang.String)
    -     * @param fileConf file of configuration
    -     * @throws SAMLEngineException error in read file
    -     */
    -    public void init(final String fileConf)
    -	    throws SAMLEngineException {
    -	InputStream inputStr = null;
    -	try {
    -	inputStr = SignHW.class.getResourceAsStream("/"
    -		+ fileConf);
    -	properties = new Properties();
    -	
    -	    properties.loadFromXML(inputStr);
    -	} catch (final InvalidPropertiesFormatException e) {
    -	    LOG.info("Exception: invalid properties format.");
    -	    throw new SAMLEngineException(e);
    -	} catch (IOException e) {
    -	    LOG.info("Exception: invalid file: " + fileConf);
    -	    throw new SAMLEngineException(e);
    -	} finally {
    -	    IOUtils.closeQuietly(inputStr);
    +	/** The Constant CONFIGURATION_FILE. */
    +	private static final String CONF_FILE = "configurationFile";
    +
    +	/**
    +	 * The Constant KEYSTORE_TYPE. private static final String KEYSTORE_TYPE = "keystoreType"
    +	 */
    +
    +	/** The logger. */
    +	private static final Logger LOG = LoggerFactory.getLogger(SignHW.class.getName());
    +
    +	/** The stork own key store. */
    +	private KeyStore storkOwnKeyStore = null;
    +
    +	/**
    +	 * Gets the stork own key store.
    +	 * 
    +	 * @return the stork own key store
    +	 */
    +	public KeyStore getStorkOwnKeyStore() {
    +		return storkOwnKeyStore;
    +	}
    +
    +	/**
    +	 * Gets the stork trustStore.
    +	 * 
    +	 * @return the stork own key store
    +	 */
    +	public KeyStore getTrustStore() {
    +		return storkOwnKeyStore;
    +	}
    +
    +	/**
    +	 * Sets the stork own key store.
    +	 * 
    +	 * @param newkOwnKeyStore
    +	 *            the new stork own key store
    +	 */
    +	public void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
    +		this.storkOwnKeyStore = newkOwnKeyStore;
    +	}
    +
    +	/**
    +	 * Gets the properties.
    +	 * 
    +	 * @return the properties
    +	 */
    +	public Properties getProperties() {
    +		return properties;
     	}
    -    }
    -
    -
    -    /**
    -     * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
    -     * @return the X509Certificate.
    -     */
    -    public X509Certificate getCertificate() {
    -	throw new NotImplementedException();
    -    }
    -
    -    /**
    -     * @see
    -     * eu.stork.peps.auth.engine.core.SAMLEngineSignI#sign(SignableSAMLObject tokenSaml)
    -     * @param tokenSaml signable SAML Object
    -     * @return the SAMLObject signed.
    -     * @throws SAMLEngineException error in sign token saml
    -     */
    -    public SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
    -
    -	try {
    -	    LOG.info("Star procces of sign");
    -	    final char[] pin = properties.getProperty("keyPassword")
    -		    .toCharArray();
    -
    -	    storkOwnKeyStore.load(null, pin);
    -
    -	    final String serialNumber = properties.getProperty("serialNumber");
    -	    final String issuer = properties.getProperty("issuer");
    -
    -	    String alias = null;
    -	    String aliasCert;
    -	    X509Certificate certificate;
    -
    -	    boolean find = false;
    -	    for (final Enumeration e = storkOwnKeyStore.aliases(); e
    -		    .hasMoreElements() && !find;) {
    -		aliasCert = e.nextElement();
    -		certificate = (X509Certificate) storkOwnKeyStore
    -			.getCertificate(aliasCert);
    -		// Verified serial number, issuer
    -
    -		final String serialNum = certificate.getSerialNumber()
    -			.toString(16);
    -		X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
    -		X509Principal issuerDNConf = new X509Principal(issuer);
    -
    -            if(serialNum.equalsIgnoreCase(serialNumber)
    -                    && X509PrincipalUtil.equals(issuerDN, issuerDNConf)){
    -		              alias = aliasCert;
    -		              find = true;
    +
    +	/**
    +	 * Sets the properties.
    +	 * 
    +	 * @param newProperties
    +	 *            the new properties
    +	 */
    +	public void setProperties(final Properties newProperties) {
    +		this.properties = newProperties;
    +	}
    +
    +	/** The HW sign prop. */
    +	private Properties properties = null;
    +
    +	/**
    +	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#init(java.lang.String)
    +	 * @param fileConf
    +	 *            file of configuration
    +	 * @throws SAMLEngineException
    +	 *             error in read file
    +	 */
    +	public void init(final String fileConf) throws SAMLEngineException {
    +		InputStream inputStr = null;
    +		try {
    +			inputStr = SignHW.class.getResourceAsStream("/" + fileConf);
    +			properties = new Properties();
    +
    +			properties.loadFromXML(inputStr);
    +		} catch (final InvalidPropertiesFormatException e) {
    +			LOG.info("Exception: invalid properties format.");
    +			throw new SAMLEngineException(e);
    +		} catch (IOException e) {
    +			LOG.info("Exception: invalid file: " + fileConf);
    +			throw new SAMLEngineException(e);
    +		} finally {
    +			IOUtils.closeQuietly(inputStr);
    +		}
    +	}
    +
    +	/**
    +	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
    +	 * @return the X509Certificate.
    +	 */
    +	public X509Certificate getCertificate() {
    +		throw new NotImplementedException();
    +	}
    +
    +	/**
    +	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#sign(SignableSAMLObject tokenSaml)
    +	 * @param tokenSaml
    +	 *            signable SAML Object
    +	 * @return the SAMLObject signed.
    +	 * @throws SAMLEngineException
    +	 *             error in sign token saml
    +	 */
    +	public SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
    +
    +		try {
    +			LOG.info("Star procces of sign");
    +			final char[] pin = properties.getProperty("keyPassword").toCharArray();
    +
    +			storkOwnKeyStore.load(null, pin);
    +
    +			final String serialNumber = properties.getProperty("serialNumber");
    +			final String issuer = properties.getProperty("issuer");
    +
    +			String alias = null;
    +			String aliasCert;
    +			X509Certificate certificate;
    +
    +			boolean find = false;
    +			for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements() && !find;) {
    +				aliasCert = e.nextElement();
    +				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
    +				// Verified serial number, issuer
    +
    +				final String serialNum = certificate.getSerialNumber().toString(16);
    +				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
    +				X509Principal issuerDNConf = new X509Principal(issuer);
    +
    +				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
    +					alias = aliasCert;
    +					find = true;
    +				}
    +
    +			}
    +
    +			if (!find) {
    +				throw new SAMLEngineException("Certificate cannot be found in keystore ");
    +			}
    +			certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
    +			final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(alias, pin);
    +
    +			LOG.info("Recover BasicX509Credential.");
    +			final BasicX509Credential credential = new BasicX509Credential();
    +
    +			LOG.debug("Load certificate");
    +			credential.setEntityCertificate(certificate);
    +
    +			LOG.debug("Load privateKey");
    +			credential.setPrivateKey(privateKey);
    +
    +			LOG.info("Star procces of sign");
    +			final Signature signature = (Signature) org.opensaml.xml.Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
    +
    +			LOG.debug("Begin signature with openSaml");
    +			signature.setSigningCredential(credential);
    +
    +			/*
    +			 * signature.setSignatureAlgorithm( SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
    +			 */
    +			signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    +
    +			final SecurityConfiguration securityConf = org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
    +			final NamedKeyInfoGeneratorManager keyInfoManager = securityConf.getKeyInfoGeneratorManager();
    +			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager.getDefaultManager();
    +			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager.getFactory(credential);
    +			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac.newInstance();
    +
    +			final KeyInfo keyInfo = keyInfoGenerator.generate(credential);
    +
    +			signature.setKeyInfo(keyInfo);
    +
    +			LOG.debug("Set Canonicalization Algorithm");
    +			signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    +
    +			// Create a second signature which will be used when signing assertion and response
    +			final Signature signature2 = (Signature) Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
    +			final SecurityConfiguration secConfiguration2 = Configuration.getGlobalSecurityConfiguration();
    +			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2.getKeyInfoGeneratorManager();
    +			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2.getDefaultManager();
    +			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2.getFactory(credential);
    +			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2.newInstance();
    +
    +			KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
    +			signature2.setSigningCredential(credential);
    +			signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    +			signature2.setKeyInfo(keyInfo2);
    +			signature2.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    +
    +			LOG.info("Marshall samlToken.");
    +			String qn = tokenSaml.getElementQName().toString();
    +
    +			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
    +				tokenSaml.setSignature(signature);
    +				CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
    +				mars.marshall(tokenSaml);
    +				Signer.signObject(signature);
    +			} else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
    +				Response res = (Response) tokenSaml;
    +				List asserts = res.getAssertions();
    +				// If multiple assertions we just sign the response and not the assertion
    +				if (asserts.size() > 1) {
    +					tokenSaml.setSignature(signature);
    +					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
    +					LOG.info("Sign samlToken.");
    +					Signer.signObject(signature);
    +				}
    +				// If single assertion we sign the assertion and response
    +				else {
    +					Assertion assertion = (Assertion) asserts.get(0);
    +					assertion.setSignature(signature);
    +					tokenSaml.setSignature(signature2);
    +					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
    +					LOG.info("Sign samlToken.");
    +					Signer.signObject(signature);
    +					Signer.signObject(signature2);
    +				}
    +			}
    +			// Normally we just sign the total saml response
    +			else {
    +				tokenSaml.setSignature(signature);
    +				Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
    +				LOG.info("Sign samlToken.");
    +				Signer.signObject(signature);
    +			}
    +
    +		} catch (final MarshallingException e) {
    +			LOG.error("MarshallingException");
    +			throw new SAMLEngineException(e);
    +		} catch (final NoSuchAlgorithmException e) {
    +			LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
    +			throw new SAMLEngineException(e);
    +		} catch (final KeyStoreException e) {
    +			LOG.error("Generic KeyStore exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (final SignatureException e) {
    +			LOG.error("Signature exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (final SecurityException e) {
    +			LOG.error("Security exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (final CertificateException e) {
    +			LOG.error("Certificate exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (final IOException e) {
    +			LOG.error("IO exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (final UnrecoverableKeyException e) {
    +			LOG.error("UnrecoverableKeyException exception.");
    +			throw new SAMLEngineException(e);
     		}
    -		
    -	    }
    -
    -        if (!find) {
    -            throw new SAMLEngineException("Certificate cannot be found in keystore ");
    -        }
    -	    certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
    -	    final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(
    -		    alias, pin);
    -
    -	    LOG.info("Recover BasicX509Credential.");
    -	    final BasicX509Credential credential = new BasicX509Credential();
    -
    -	    LOG.debug("Load certificate");
    -	    credential.setEntityCertificate(certificate);
    -
    -	    LOG.debug("Load privateKey");
    -	    credential.setPrivateKey(privateKey);
    -
    -	    LOG.info("Star procces of sign");
    -	    final Signature signature = (Signature) org.opensaml.xml.Configuration
    -		    .getBuilderFactory().getBuilder(
    -			    Signature.DEFAULT_ELEMENT_NAME).buildObject(
    -			    Signature.DEFAULT_ELEMENT_NAME);
    -
    -	    LOG.debug("Begin signature with openSaml");
    -	    signature.setSigningCredential(credential);
    -
    -	    /*signature.setSignatureAlgorithm(
    -	    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);*/
    -	    signature.setSignatureAlgorithm(
    -		    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    -
    -	 
    -
    -	    final SecurityConfiguration securityConf =
    -		org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
    -	    final NamedKeyInfoGeneratorManager keyInfoManager = securityConf
    -		    .getKeyInfoGeneratorManager();
    -	    final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager
    -		    .getDefaultManager();
    -	    final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager
    -		    .getFactory(credential);
    -	    final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac
    -		    .newInstance();
    -	    
    -	    final KeyInfo keyInfo = keyInfoGenerator.generate(credential);
    -
    -	    signature.setKeyInfo(keyInfo);
    -
    -	    LOG.debug("Set Canonicalization Algorithm");
    -	    signature.setCanonicalizationAlgorithm(
    -		    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    -
    -	  //Create a second signature which will be used when signing assertion and response
    -	    final Signature signature2 = (Signature) Configuration
    -	    .getBuilderFactory().getBuilder(
    -		    Signature.DEFAULT_ELEMENT_NAME).buildObject(
    -		    Signature.DEFAULT_ELEMENT_NAME);
    -	    final SecurityConfiguration secConfiguration2 = Configuration
    -	    .getGlobalSecurityConfiguration();
    -	    final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2
    -		    .getKeyInfoGeneratorManager();
    -	    final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2
    -		    .getDefaultManager();
    -	    final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2
    -		    .getFactory(credential);
    -	    final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2
    -		    .newInstance();
    -	    
    -	    KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
    -	    signature2.setSigningCredential(credential);
    -	    signature2.setSignatureAlgorithm(
    -			    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    -	    signature2.setKeyInfo(keyInfo2);
    -	    signature2.setCanonicalizationAlgorithm(
    -		    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    -	    	 	    
    -
    -	    LOG.info("Marshall samlToken.");
    -	    String qn = tokenSaml.getElementQName().toString();
    -	    
    -	    if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
    -	    {	    
    -	  		tokenSaml.setSignature(signature);
    -	    	CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
    -	    	mars.marshall(tokenSaml);
    -	    	Signer.signObject(signature);
    -	    }
    -	    else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME))
    -	    {
    -	    	Response res = (Response)tokenSaml;
    -	    	List asserts = res.getAssertions();
    -	    	//If multiple assertions we just sign the response and not the assertion
    -	    	if (asserts.size() > 1)
    -	    	{	    		
    -	    		tokenSaml.setSignature(signature);
    -	    		Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -			    .marshall(tokenSaml);
    -	    		LOG.info("Sign samlToken.");
    -	    	    Signer.signObject(signature);
    -	    	}
    -	    	//If single assertion we sign the assertion and response
    -	    	else
    -	    	{
    -			    Assertion assertion = (Assertion)asserts.get(0);
    -			    assertion.setSignature(signature);			    
    -			    tokenSaml.setSignature(signature2);
    -			    Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -			    .marshall(tokenSaml);
    -			    LOG.info("Sign samlToken.");
    -			    Signer.signObject(signature);
    -			    Signer.signObject(signature2);
    -	    	}
    -	    }
    -	    //Normally we just sign the total saml response
    -	    else
    -	    {
    -	    	tokenSaml.setSignature(signature);
    -	    	Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -		    .marshall(tokenSaml);
    -	    	LOG.info("Sign samlToken.");
    -		    Signer.signObject(signature);
    -	    }
    -
    -	} catch (final MarshallingException e) {
    -	    LOG.error("MarshallingException");
    -	    throw new SAMLEngineException(e);
    -	} catch (final NoSuchAlgorithmException e) {
    -	    LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
    -	    throw new SAMLEngineException(e);
    -	} catch (final KeyStoreException e) {
    -	    LOG.error("Generic KeyStore exception.");
    -	    throw new SAMLEngineException(e);
    -	} catch (final SignatureException e) {
    -	    LOG.error("Signature exception.");
    -	    throw new SAMLEngineException(e);
    -	} catch (final SecurityException e) {
    -	    LOG.error("Security exception.");
    -	    throw new SAMLEngineException(e);
    -	} catch (final CertificateException e) {
    -	    LOG.error("Certificate exception.");
    -	    throw new SAMLEngineException(e);
    -	} catch (final IOException e) {
    -	    LOG.error("IO exception.");
    -	    throw new SAMLEngineException(e);
    -	} catch (final UnrecoverableKeyException e) {
    -	    LOG.error("UnrecoverableKeyException exception.");
    -	    throw new SAMLEngineException(e);
    +
    +		return tokenSaml;
     	}
     
    -	return tokenSaml;
    -    }
    -
    -    /**
    -     * @see
    -     * eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(SignableSAMLObject)
    -     * @param tokenSaml the token saml
    -     * @return the SAMLObject validated.
    -     * @throws SAMLEngineException exception in validate signature
    -     */
    -    public SAMLObject validateSignature(final SignableSAMLObject tokenSaml)
    -	    throws SAMLEngineException {
    -	LOG.info("Start signature validation.");
    -	try {
    -
    -	    // Validate structure signature
    -	    final SAMLSignatureProfileValidator signProfValidator = 
    -		new SAMLSignatureProfileValidator();
    -
    -	    // Indicates signature id conform to SAML Signature profile
    -	    signProfValidator.validate(tokenSaml.getSignature());
    -
    -	    String aliasCert;
    -	    X509Certificate certificate;
    -
    -	    final List trustedCred = new ArrayList();
    -
    -	    for (final Enumeration e = storkOwnKeyStore.aliases(); e
    -		    .hasMoreElements();) {
    -		aliasCert = e.nextElement();
    -		final BasicX509Credential credential = new BasicX509Credential();
    -		certificate = (X509Certificate) storkOwnKeyStore
    -			.getCertificate(aliasCert);
    -		credential.setEntityCertificate(certificate);
    -		trustedCred.add(credential);
    -	    }
    -
    -	    final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
    -	    final List listCertificates = KeyInfoHelper
    -		    .getCertificates(keyInfo);
    -
    -	    if (listCertificates.size() != 1) {
    -		throw new SAMLEngineException("Only must be one certificate");
    -	    }
    -
    -	    // Exist only one certificate
    -	    final BasicX509Credential entityX509Cred = new BasicX509Credential();
    -	    entityX509Cred.setEntityCertificate(listCertificates.get(0));
    -
    -	    final ExplicitKeyTrustEvaluator keyTrustEvaluator = 
    -		new ExplicitKeyTrustEvaluator();
    -	    if (!keyTrustEvaluator.validate(entityX509Cred, trustedCred)) {
    -		throw new SAMLEngineException("Certificate it is not trusted.");
    -	    }
    -
    -	    final SignatureValidator sigValidator = new SignatureValidator(
    -		    entityX509Cred);
    -
    -	    sigValidator.validate(tokenSaml.getSignature());
    -
    -	} catch (final ValidationException e) {
    -	    LOG.error("ValidationException.", e);
    -	    throw new SAMLEngineException(e);
    -	} catch (final KeyStoreException e) {
    -	    LOG.error("ValidationException.", e);
    -	    throw new SAMLEngineException(e);
    -	} catch (final CertificateException e) {
    -	    LOG.error("CertificateException.", e);
    -	    throw new SAMLEngineException(e);
    +	/**
    +	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(SignableSAMLObject)
    +	 * @param tokenSaml
    +	 *            the token saml
    +	 * @return the SAMLObject validated.
    +	 * @throws SAMLEngineException
    +	 *             exception in validate signature
    +	 */
    +	public SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
    +		LOG.info("Start signature validation.");
    +		try {
    +
    +			// Validate structure signature
    +			final SAMLSignatureProfileValidator signProfValidator = new SAMLSignatureProfileValidator();
    +
    +			// Indicates signature id conform to SAML Signature profile
    +			signProfValidator.validate(tokenSaml.getSignature());
    +
    +			String aliasCert;
    +			X509Certificate certificate;
    +
    +			final List trustedCred = new ArrayList();
    +
    +			for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements();) {
    +				aliasCert = e.nextElement();
    +				final BasicX509Credential credential = new BasicX509Credential();
    +				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
    +				credential.setEntityCertificate(certificate);
    +				trustedCred.add(credential);
    +			}
    +
    +			final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
    +			final List listCertificates = KeyInfoHelper.getCertificates(keyInfo);
    +
    +			if (listCertificates.size() != 1) {
    +				throw new SAMLEngineException("Only must be one certificate");
    +			}
    +
    +			// Exist only one certificate
    +			final BasicX509Credential entityX509Cred = new BasicX509Credential();
    +			entityX509Cred.setEntityCertificate(listCertificates.get(0));
    +
    +			final ExplicitKeyTrustEvaluator keyTrustEvaluator = new ExplicitKeyTrustEvaluator();
    +			if (!keyTrustEvaluator.validate(entityX509Cred, trustedCred)) {
    +				throw new SAMLEngineException("Certificate it is not trusted.");
    +			}
    +
    +			final SignatureValidator sigValidator = new SignatureValidator(entityX509Cred);
    +
    +			sigValidator.validate(tokenSaml.getSignature());
    +
    +		} catch (final ValidationException e) {
    +			LOG.error("ValidationException.", e);
    +			throw new SAMLEngineException(e);
    +		} catch (final KeyStoreException e) {
    +			LOG.error("ValidationException.", e);
    +			throw new SAMLEngineException(e);
    +		} catch (final CertificateException e) {
    +			LOG.error("CertificateException.", e);
    +			throw new SAMLEngineException(e);
    +		}
    +		return tokenSaml;
     	}
    -	return tokenSaml;
    -    }
    -
    -    /**
    -     * load cryptographic service provider.
    -     * 
    -     * @throws SAMLEngineException the SAML engine exception
    -     * Note this class was using pkcs11Provider
    -     * final Provider pkcs11Provider = new sun.security.pkcs11.SunPKCS11(inputStream)
    -     * if (Security.getProperty(pkcs11Provider.getName()) == null) {
    -     * Security.insertProviderAt(pkcs11Provider, Security .getProviders().length)
    -     * }
    -     * storkOwnKeyStore = KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE))
    -     */
    -    public void loadCryptServiceProvider() throws SAMLEngineException {
    -	LOG.info("Load Cryptographic Service Provider");
    -	InputStream inputStream = null; 
    -	 
    -	try {
    -	    inputStream = SignHW.class.getResourceAsStream("/"
    -		    + properties.getProperty(CONF_FILE));
    -
    -	} catch (final Exception e) {	       
    -	    throw new SAMLEngineException(
    -		    "Error loading CryptographicServiceProvider", e);
    -	} finally {
    -	    IOUtils.closeQuietly(inputStream);
    +
    +	/**
    +	 * load cryptographic service provider.
    +	 * 
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception Note this class was using pkcs11Provider final Provider pkcs11Provider = new sun.security.pkcs11.SunPKCS11(inputStream) if
    +	 *             (Security.getProperty(pkcs11Provider.getName()) == null) { Security.insertProviderAt(pkcs11Provider, Security .getProviders().length) } storkOwnKeyStore =
    +	 *             KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE))
    +	 */
    +	public void loadCryptServiceProvider() throws SAMLEngineException {
    +		LOG.info("Load Cryptographic Service Provider");
    +		InputStream inputStream = null;
    +
    +		try {
    +			inputStream = SignHW.class.getResourceAsStream("/" + properties.getProperty(CONF_FILE));
    +
    +		} catch (final Exception e) {
    +			throw new SAMLEngineException("Error loading CryptographicServiceProvider", e);
    +		} finally {
    +			IOUtils.closeQuietly(inputStream);
    +		}
     	}
    -    }
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
    index c37074eab..66d0201d5 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
    @@ -30,35 +30,35 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
     
     public final class SignModuleFactory {
     
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(SignModuleFactory.class.getName());
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(SignModuleFactory.class.getName());
     
    -    /**
    -     * Instantiates a new module sign factory.
    -     */
    -    private SignModuleFactory() {
    +	/**
    +	 * Instantiates a new module sign factory.
    +	 */
    +	private SignModuleFactory() {
     
    -    }
    -
    -    /**
    -     * Gets the single instance of SignModuleFactory.
    -     * 
    -     * @param className the class name
    -     * 
    -     * @return single instance of SignModuleFactory
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    public static SAMLEngineSignI getInstance(final String className)
    -	    throws STORKSAMLEngineException {
    -	LOG.info("[START]SignModuleFactory static");
    -	try {
    -	    final Class cls = Class.forName(className);
    -	    return (SAMLEngineSignI) cls.newInstance();
    -	} catch (Exception e) {
    -	    throw new STORKSAMLEngineException(e);
     	}
     
    -    }
    +	/**
    +	 * Gets the single instance of SignModuleFactory.
    +	 * 
    +	 * @param className
    +	 *            the class name
    +	 * 
    +	 * @return single instance of SignModuleFactory
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	public static SAMLEngineSignI getInstance(final String className) throws STORKSAMLEngineException {
    +		LOG.info("[START]SignModuleFactory static");
    +		try {
    +			final Class cls = Class.forName(className);
    +			return (SAMLEngineSignI) cls.newInstance();
    +		} catch (Exception e) {
    +			throw new STORKSAMLEngineException(e);
    +		}
    +
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
    index 06e80dc14..c91f11444 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
    @@ -74,26 +74,21 @@ import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
     import eu.stork.peps.exceptions.SAMLEngineException;
     
     /**
    - * The Class SWSign. Class responsible for signing and validating of messages
    - * SAML with a certificate store software.
    + * The Class SWSign. Class responsible for signing and validating of messages SAML with a certificate store software.
      * 
      * @author fjquevedo
      */
     public final class SignP12 implements SAMLEngineSignI {
     
     	/** The logger. */
    -	private static final Logger LOG = LoggerFactory.getLogger(SignP12.class
    -			.getName());
    -
    +	private static final Logger LOG = LoggerFactory.getLogger(SignP12.class.getName());
     
     	/** The p12 store. */
     	private KeyStore p12Store = null;
     
    -
     	/** The trust store. */
     	private KeyStore trustStore = null;
     
    -
     	/**
     	 * Gets the trust store.
     	 * 
    @@ -107,7 +102,8 @@ public final class SignP12 implements SAMLEngineSignI {
     	/**
     	 * Sets the trust store.
     	 * 
    -	 * @param newTrustStore the new trust store
    +	 * @param newTrustStore
    +	 *            the new trust store
     	 */
     	public void setTrustStore(final KeyStore newTrustStore) {
     		this.trustStore = newTrustStore;
    @@ -123,8 +119,6 @@ public final class SignP12 implements SAMLEngineSignI {
     		return properties;
     	}
     
    -
    -
     	/**
     	 * Gets the p12 store.
     	 * 
    @@ -134,23 +128,21 @@ public final class SignP12 implements SAMLEngineSignI {
     		return p12Store;
     	}
     
    -
    -
     	/**
     	 * Sets the p12 store.
     	 * 
    -	 * @param newP12Store the new p12 store
    +	 * @param newP12Store
    +	 *            the new p12 store
     	 */
     	public void setP12Store(final KeyStore newP12Store) {
     		this.p12Store = newP12Store;
     	}
     
    -
    -
     	/**
     	 * Sets the properties.
     	 * 
    -	 * @param newProperties the new properties
    +	 * @param newProperties
    +	 *            the new properties
     	 */
     	public void setProperties(final Properties newProperties) {
     		this.properties = newProperties;
    @@ -159,13 +151,14 @@ public final class SignP12 implements SAMLEngineSignI {
     	/** The SW sign prop. */
     	private Properties properties = null;
     
    -
     	/**
     	 * Initialize the file configuration.
     	 * 
    -	 * @param fileConf name of the file configuration
    +	 * @param fileConf
    +	 *            name of the file configuration
     	 * 
    -	 * @throws SAMLEngineException error at the load from  file configuration
    +	 * @throws SAMLEngineException
    +	 *             error at the load from file configuration
     	 */
     	@Override
     	public void init(final String fileConf) throws SAMLEngineException {
    @@ -209,7 +202,7 @@ public final class SignP12 implements SAMLEngineSignI {
     	 * Gets the certificate.
     	 * 
     	 * @return the X509Certificate
    -	 *     
    +	 * 
     	 */
     	@Override
     	public X509Certificate getCertificate() {
    @@ -219,16 +212,17 @@ public final class SignP12 implements SAMLEngineSignI {
     	/**
     	 * Sign the token SAML.
     	 * 
    -	 * @param tokenSaml token SAML
    +	 * @param tokenSaml
    +	 *            token SAML
     	 * 
     	 * @return the X509Certificate signed.
     	 * 
    -	 * @throws SAMLEngineException error at sign SAML token
    +	 * @throws SAMLEngineException
    +	 *             error at sign SAML token
     	 *
     	 */
     	@Override
    -	public SAMLObject sign(final SignableSAMLObject tokenSaml)
    -			throws SAMLEngineException {
    +	public SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
     		LOG.info("Start Sign process");
     		try {
     
    @@ -240,30 +234,24 @@ public final class SignP12 implements SAMLEngineSignI {
     			X509Certificate certificate;
     
     			boolean find = false;
    -			for (final Enumeration e = p12Store.aliases(); e
    -					.hasMoreElements() && !find;) {
    +			for (final Enumeration e = p12Store.aliases(); e.hasMoreElements() && !find;) {
     				aliasCert = e.nextElement();
    -				certificate = (X509Certificate) p12Store
    -						.getCertificate(aliasCert);
    +				certificate = (X509Certificate) p12Store.getCertificate(aliasCert);
     
    -				final String serialNum = certificate.getSerialNumber()
    -						.toString(16);
    +				final String serialNum = certificate.getSerialNumber().toString(16);
     
     				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
     				X509Principal issuerDNConf = new X509Principal(issuer);
     
    -				if(serialNum.equalsIgnoreCase(serialNumber)
    -						&& X509PrincipalUtil.equals(issuerDN, issuerDNConf)){
    +				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
     					alias = aliasCert;
     					find = true;
     				}
     
     			}
     
    -			certificate = (X509Certificate) p12Store
    -					.getCertificate(alias);
    -			final PrivateKey privateKey = (PrivateKey) p12Store.getKey(
    -					alias, properties.getProperty("keyPassword").toCharArray());
    +			certificate = (X509Certificate) p12Store.getCertificate(alias);
    +			final PrivateKey privateKey = (PrivateKey) p12Store.getKey(alias, properties.getProperty("keyPassword").toCharArray());
     
     			LOG.info("Recover BasicX509Credential.");
     			final BasicX509Credential credential = new BasicX509Credential();
    @@ -275,102 +263,73 @@ public final class SignP12 implements SAMLEngineSignI {
     			credential.setPrivateKey(privateKey);
     
     			LOG.debug("Begin signature with openSaml");
    -			final Signature signature = (Signature) org.opensaml.xml.Configuration
    -					.getBuilderFactory().getBuilder(
    -							Signature.DEFAULT_ELEMENT_NAME).buildObject(
    -									Signature.DEFAULT_ELEMENT_NAME);
    +			final Signature signature = (Signature) org.opensaml.xml.Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
     
     			signature.setSigningCredential(credential);
     
    -			/*signature.setSignatureAlgorithm(
    -	    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);*/
    -			signature.setSignatureAlgorithm(
    -					SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    -
    -			final SecurityConfiguration secConfiguration = org.opensaml.xml.Configuration
    -					.getGlobalSecurityConfiguration();
    -			final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration
    -					.getKeyInfoGeneratorManager();
    -			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager
    -					.getDefaultManager();
    -			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager
    -					.getFactory(credential);
    -			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac
    -					.newInstance();
    +			/*
    +			 * signature.setSignatureAlgorithm( SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
    +			 */
    +			signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    +
    +			final SecurityConfiguration secConfiguration = org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
    +			final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration.getKeyInfoGeneratorManager();
    +			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager.getDefaultManager();
    +			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager.getFactory(credential);
    +			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac.newInstance();
     
     			final KeyInfo keyInfo = keyInfoGenerator.generate(credential);
     
     			signature.setKeyInfo(keyInfo);
    -			signature.setCanonicalizationAlgorithm(
    -					SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    -
    -			//Create a second signature which will be used when signing assertion and response
    -			final Signature signature2 = (Signature) org.opensaml.xml.Configuration
    -					.getBuilderFactory().getBuilder(
    -							Signature.DEFAULT_ELEMENT_NAME).buildObject(
    -									Signature.DEFAULT_ELEMENT_NAME);
    -			final SecurityConfiguration secConfiguration2 = org.opensaml.xml.Configuration
    -					.getGlobalSecurityConfiguration();
    -			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2
    -					.getKeyInfoGeneratorManager();
    -			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2
    -					.getDefaultManager();
    -			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2
    -					.getFactory(credential);
    -			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2
    -					.newInstance();
    +			signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    +
    +			// Create a second signature which will be used when signing assertion and response
    +			final Signature signature2 = (Signature) org.opensaml.xml.Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
    +			final SecurityConfiguration secConfiguration2 = org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
    +			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2.getKeyInfoGeneratorManager();
    +			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2.getDefaultManager();
    +			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2.getFactory(credential);
    +			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2.newInstance();
     
     			KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
     			signature2.setSigningCredential(credential);
    -			signature2.setSignatureAlgorithm(
    -					SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    +			signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
     			signature2.setKeyInfo(keyInfo2);
    -			signature2.setCanonicalizationAlgorithm(
    -					SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    -
    +			signature2.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
     
     			LOG.info("Marshall samlToken.");
     			String qn = tokenSaml.getElementQName().toString();
     
    -			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
    -			{	    
    +			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
     				tokenSaml.setSignature(signature);
     				CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
     				mars.marshall(tokenSaml);
     				Signer.signObject(signature);
    -			}
    -			else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME))
    -			{
    -				Response res = (Response)tokenSaml;
    +			} else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
    +				Response res = (Response) tokenSaml;
     				List asserts = res.getAssertions();
    -				//If multiple assertions we just sign the response and not the assertion
    -				if (asserts.size() > 1)
    -				{	    		
    +				// If multiple assertions we just sign the response and not the assertion
    +				if (asserts.size() > 1) {
     					tokenSaml.setSignature(signature);
    -					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -					.marshall(tokenSaml);
    +					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
     					LOG.info("Sign samlToken.");
     					Signer.signObject(signature);
     				}
    -				//If single assertion we sign the assertion and response
    -				else
    -				{
    +				// If single assertion we sign the assertion and response
    +				else {
     					Assertion assertion = asserts.get(0);
    -					assertion.setSignature(signature);			    
    +					assertion.setSignature(signature);
     					tokenSaml.setSignature(signature2);
    -					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -					.marshall(tokenSaml);
    +					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
     					LOG.info("Sign samlToken.");
     					Signer.signObject(signature);
     					Signer.signObject(signature2);
     				}
     			}
    -			//Normally we just sign the total saml response
    -			else
    -			{
    +			// Normally we just sign the total saml response
    +			else {
     				tokenSaml.setSignature(signature);
    -				org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -				.marshall(tokenSaml);
    +				org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
     				LOG.info("Sign samlToken.");
     				Signer.signObject(signature);
     			}
    @@ -401,22 +360,22 @@ public final class SignP12 implements SAMLEngineSignI {
     	/**
     	 * Validate signature.
     	 * 
    -	 * @param tokenSaml token SAML
    +	 * @param tokenSaml
    +	 *            token SAML
     	 * 
     	 * @return the SAMLObject validated.
     	 * 
    -	 * @throws SAMLEngineException error validate signature
    +	 * @throws SAMLEngineException
    +	 *             error validate signature
     	 * 
     	 */
     	@Override
    -	public SAMLObject validateSignature(final SignableSAMLObject tokenSaml)
    -			throws SAMLEngineException {
    +	public SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
     		LOG.info("Start signature validation.");
     		try {
     
     			// Validate structure signature
    -			final SAMLSignatureProfileValidator sigProfValidator = 
    -					new SAMLSignatureProfileValidator();
    +			final SAMLSignatureProfileValidator sigProfValidator = new SAMLSignatureProfileValidator();
     			try {
     				// Indicates signature id conform to SAML Signature profile
     				sigProfValidator.validate(tokenSaml.getSignature());
    @@ -430,64 +389,43 @@ public final class SignP12 implements SAMLEngineSignI {
     
     			final List trustCred = new ArrayList();
     
    -			for (final Enumeration e = trustStore.aliases(); e
    -					.hasMoreElements();) 
    -			{
    +			for (final Enumeration e = trustStore.aliases(); e.hasMoreElements();) {
     				aliasCert = e.nextElement();
     				final BasicX509Credential credential = new BasicX509Credential();
    -				certificate = (X509Certificate) trustStore
    -						.getCertificate(aliasCert);
    +				certificate = (X509Certificate) trustStore.getCertificate(aliasCert);
     				credential.setEntityCertificate(certificate);
     				trustCred.add(credential);
     			}
     
     			final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
     
    -			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
    -					.getX509Datas().get(0).getX509Certificates().get(0);
    +			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
     
    -			final CertificateFactory certFact = CertificateFactory
    -					.getInstance("X.509");
    -			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
    -					.decode(xmlCert.getValue()));
    -			final X509Certificate cert = (X509Certificate) certFact
    -					.generateCertificate(bis);
    +			final CertificateFactory certFact = CertificateFactory.getInstance("X.509");
    +			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
    +			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
     
     			// Exist only one certificate
     			final BasicX509Credential entityX509Cred = new BasicX509Credential();
     			entityX509Cred.setEntityCertificate(cert);
     
    -			/* A better use of PKI based validation but not wanted for STORK...
    -			boolean trusted = false;
    -
    -			for (final Enumeration e = trustStore.aliases(); e.hasMoreElements();) 
    -			{
    -				aliasCert = e.nextElement();		
    -				certificate = (X509Certificate) trustStore.getCertificate(aliasCert);					
    -				try {
    -					cert.verify(certificate.getPublicKey());
    -					trusted = true;
    -					break;
    -				}
    -				catch (Exception ex) {
    -					//Do nothing - cert not trusted yet
    -				}
    -			}
    -
    -			if (!trusted)
    -				throw new SAMLEngineException("Certificate is not trusted.");*/
    +			/*
    +			 * A better use of PKI based validation but not wanted for STORK... boolean trusted = false;
    +			 * 
    +			 * for (final Enumeration e = trustStore.aliases(); e.hasMoreElements();) { aliasCert = e.nextElement(); certificate = (X509Certificate) trustStore.getCertificate(aliasCert); try {
    +			 * cert.verify(certificate.getPublicKey()); trusted = true; break; } catch (Exception ex) { //Do nothing - cert not trusted yet } }
    +			 * 
    +			 * if (!trusted) throw new SAMLEngineException("Certificate is not trusted.");
    +			 */
     
     			// Validate trust certificates
    -			final ExplicitKeyTrustEvaluator keyTrustEvaluator = 
    -					new ExplicitKeyTrustEvaluator();
    -			if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) 
    -			{
    +			final ExplicitKeyTrustEvaluator keyTrustEvaluator = new ExplicitKeyTrustEvaluator();
    +			if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) {
     				throw new SAMLEngineException("Certificate it is not trusted.");
     			}
     
     			// Validate signature
    -			final SignatureValidator sigValidator = new SignatureValidator(
    -					entityX509Cred);
    +			final SignatureValidator sigValidator = new SignatureValidator(entityX509Cred);
     			sigValidator.validate(tokenSaml.getSignature());
     
     		} catch (ValidationException e) {
    @@ -503,11 +441,11 @@ public final class SignP12 implements SAMLEngineSignI {
     		return tokenSaml;
     	}
     
    -
     	/**
     	 * Load cryptographic service provider.
     	 * 
    -	 * @throws SAMLEngineException the SAML engine exception
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
     	 */
     	@Override
     	public void loadCryptServiceProvider() throws SAMLEngineException {
    @@ -517,48 +455,40 @@ public final class SignP12 implements SAMLEngineSignI {
     		FileInputStream fisTrustStore = null;
     
     		try {
    -//			// Dynamically register Bouncy Castle provider.
    -//			boolean found = false;
    -//			// Check if BouncyCastle is already registered as a provider
    -//			final Provider[] providers = Security.getProviders();
    -//			for (int i = 0; i < providers.length; i++) {
    -//				if (providers[i].getName().equals(
    -//						BouncyCastleProvider.PROVIDER_NAME)) {
    -//					found = true;
    -//				}
    -//			}
    -//
    -//			// Register only if the provider has not been previously registered
    -//			if (!found) {
    -//				LOG.debug("SAMLCore: Register Bouncy Castle provider.");
    -//				Security.insertProviderAt(new BouncyCastleProvider(), Security
    -//						.getProviders().length);
    -//			}
    -
    -			p12Store = KeyStore.getInstance(properties
    -					.getProperty("keystoreType"));
    -
    -			fis = new FileInputStream(properties
    -					.getProperty("keystorePath"));
    -
    -			p12Store.load(fis, properties.getProperty(
    -					"keyStorePassword").toCharArray());
    -
    -
    -			trustStore = KeyStore.getInstance(properties
    -					.getProperty("trustStoreType"));
    -
    -			fisTrustStore = new FileInputStream(properties
    -					.getProperty("trustStorePath"));
    -			trustStore.load(fisTrustStore, properties.getProperty(
    -					"trustStorePassword").toCharArray());
    +			// // Dynamically register Bouncy Castle provider.
    +			// boolean found = false;
    +			// // Check if BouncyCastle is already registered as a provider
    +			// final Provider[] providers = Security.getProviders();
    +			// for (int i = 0; i < providers.length; i++) {
    +			// if (providers[i].getName().equals(
    +			// BouncyCastleProvider.PROVIDER_NAME)) {
    +			// found = true;
    +			// }
    +			// }
    +			//
    +			// // Register only if the provider has not been previously registered
    +			// if (!found) {
    +			// LOG.debug("SAMLCore: Register Bouncy Castle provider.");
    +			// Security.insertProviderAt(new BouncyCastleProvider(), Security
    +			// .getProviders().length);
    +			// }
    +
    +			p12Store = KeyStore.getInstance(properties.getProperty("keystoreType"));
    +
    +			fis = new FileInputStream(properties.getProperty("keystorePath"));
    +
    +			p12Store.load(fis, properties.getProperty("keyStorePassword").toCharArray());
    +
    +			trustStore = KeyStore.getInstance(properties.getProperty("trustStoreType"));
    +
    +			fisTrustStore = new FileInputStream(properties.getProperty("trustStorePath"));
    +			trustStore.load(fisTrustStore, properties.getProperty("trustStorePassword").toCharArray());
     
     		} catch (Exception e) {
    -			throw new SAMLEngineException(
    -					"Error loading CryptographicServiceProvider", e);
    -		}  finally {
    +			throw new SAMLEngineException("Error loading CryptographicServiceProvider", e);
    +		} finally {
     			IOUtils.closeQuietly(fis);
     			IOUtils.closeQuietly(fisTrustStore);
    -		}	
    +		}
     	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
    index 0984bb9ca..e1ae2b8e2 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
    @@ -61,471 +61,415 @@ import java.security.cert.CertificateNotYetValidException;
     import java.security.cert.X509Certificate;
     import java.util.*;
     
    -
     /**
    - * The Class SWSign. Class responsible for signing and validating of messages
    - * SAML with a certificate store software.
    + * The Class SWSign. Class responsible for signing and validating of messages SAML with a certificate store software.
      *
      * @author fjquevedo
      */
     public class SignSW implements SAMLEngineSignI {
     
    -    /**
    -     * The Constant KEYSTORE_TYPE.
    -     */
    -    private static final String KEYSTORE_TYPE = "keystoreType";
    -
    -    /**
    -     * The Constant KEY_STORE_PASSWORD.
    -     */
    -    private static final String KEY_STORE_PASS = "keyStorePassword";
    -
    -    /**
    -     * The logger.
    -     */
    -    private static final Logger LOG = LoggerFactory.getLogger(SignSW.class
    -            .getName());
    -
    -    /**
    -     * The stork own key store.
    -     */
    -    private KeyStore storkOwnKeyStore = null;
    -
    -    /**
    -     * The instance.
    -     *
    -     * @return the properties
    -     */
    -
    -    public final Properties getProperties() {
    -        return properties;
    -    }
    -
    -    /**
    -     * Gets the stork own key store.
    -     *
    -     * @return the stork own key store
    -     */
    -    public final KeyStore getStorkOwnKeyStore() {
    -        return storkOwnKeyStore;
    -    }
    -
    -    /**
    -     * Gets the stork trustStore.
    -     *
    -     * @return the stork own key store
    -     */
    -    public KeyStore getTrustStore() {
    -        return storkOwnKeyStore;
    -    }
    -
    -    /**
    -     * Sets the stork own key store.
    -     *
    -     * @param newkOwnKeyStore the new stork own key store
    -     */
    -    public final void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
    -        this.storkOwnKeyStore = newkOwnKeyStore;
    -    }
    -
    -    /**
    -     * Sets the properties.
    -     *
    -     * @param newProperties the new properties
    -     */
    -    public final void setProperties(final Properties newProperties) {
    -        this.properties = newProperties;
    -    }
    -
    -    /**
    -     * The SW sign prop.
    -     */
    -    private Properties properties = null;
    -
    -
    -    /**
    -     * Inits the file configuration.
    -     *
    -     * @param fileConf name of the file configuration
    -     * @throws SAMLEngineException error at the load from  file configuration
    -     */
    -    public final void init(final String fileConf)
    -            throws SAMLEngineException {
    -        InputStream fileProperties = null;
    -        // fetch base from system properties, give a default if there is nothing configured
    -        String base = System.getProperty("eu.stork.samlengine.config.location");
    -        if (null != base) {
    -            if (!base.endsWith("/")) {
    -                base += "/";
    -            }
    -        } else {
    -            base = "/";
    -        }
    -
    -        try {
    -            if (null != base)
    -                fileProperties = new FileInputStream(base + fileConf);
    -            else
    -                fileProperties = SignSW.class.getResourceAsStream("/"
    -                        + fileConf);
    -            properties = new Properties();
    -
    -            properties.loadFromXML(fileProperties);
    -            fileProperties.close();
    -        } catch (InvalidPropertiesFormatException e) {
    -            LOG.info("Exception: invalid properties format.");
    -            throw new SAMLEngineException(e);
    -        } catch (IOException e) {
    -            LOG.info("Exception: invalid file: " + fileConf);
    -            throw new SAMLEngineException(e);
    -        } finally {
    -            IOUtils.closeQuietly(fileProperties);
    -        }
    -    }
    -
    -    /**
    -     * @return the X509Certificate
    -     * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
    -     */
    -    public final X509Certificate getCertificate() {
    -        throw new NotImplementedException();
    -    }
    -
    -
    -    /**
    -     * Sign the token SAML.
    -     *
    -     * @param tokenSaml the token SAML.
    -     * @return the SAML object
    -     * @throws SAMLEngineException the SAML engine exception
    -     */
    -    public final SAMLObject sign(final SignableSAMLObject tokenSaml)
    -            throws SAMLEngineException {
    -        LOG.info("Start Sign process.");
    -        try {
    -            final String serialNumber = properties.getProperty("serialNumber");
    -            final String issuer = properties.getProperty("issuer");
    -
    -            String alias = null;
    -            String aliasCert;
    -            X509Certificate certificate;
    -            boolean find = false;
    -
    -            for (final Enumeration e = storkOwnKeyStore.aliases(); e
    -                    .hasMoreElements() && !find; ) {
    -                aliasCert = e.nextElement();
    -                certificate = (X509Certificate) storkOwnKeyStore
    -                        .getCertificate(aliasCert);
    -
    -                final String serialNum = certificate.getSerialNumber()
    -                        .toString(16);
    -
    -                try {
    -                    X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
    -                    X509Principal issuerDNConf = new X509Principal(issuer);
    -
    -                    if (serialNum.equalsIgnoreCase(serialNumber)
    -                            && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
    -                        alias = aliasCert;
    -                        find = true;
    -                    }
    -                } catch (Exception ex) {
    -                    LOG.error("Exception during signing: " + ex.getMessage());     // Added as a workaround for Bouncycastle email error
    -                }
    -            }
    -            if (!find) {
    -                throw new SAMLEngineException("Certificate cannot be found in keystore ");
    -            }
    -            certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
    -            final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(
    -                    alias, properties.getProperty("keyPassword").toCharArray());
    -
    -            LOG.info("Recover BasicX509Credential.");
    -            final BasicX509Credential credential = new BasicX509Credential();
    -
    -            LOG.debug("Load certificate");
    -            credential.setEntityCertificate(certificate);
    -
    -            LOG.debug("Load privateKey");
    -            credential.setPrivateKey(privateKey);
    -
    -            LOG.debug("Begin signature with openSaml");
    -            final Signature signature = (Signature) Configuration
    -                    .getBuilderFactory().getBuilder(
    -                            Signature.DEFAULT_ELEMENT_NAME).buildObject(
    -                            Signature.DEFAULT_ELEMENT_NAME);
    -
    -            signature.setSigningCredential(credential);
    -            signature.setSignatureAlgorithm(
    -                    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    -            //signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
    -
    -
    -            final SecurityConfiguration secConfiguration = Configuration
    -                    .getGlobalSecurityConfiguration();
    -            final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration
    -                    .getKeyInfoGeneratorManager();
    -            final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager
    -                    .getDefaultManager();
    -            final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager
    -                    .getFactory(credential);
    -            final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac
    -                    .newInstance();
    -
    -            KeyInfo keyInfo = keyInfoGenerator.generate(credential);
    -
    -            signature.setKeyInfo(keyInfo);
    -            signature.setCanonicalizationAlgorithm(
    -                    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    -
    -            //Create a second signature which will be used when signing assertion and response
    -            final Signature signature2 = (Signature) Configuration
    -                    .getBuilderFactory().getBuilder(
    -                            Signature.DEFAULT_ELEMENT_NAME).buildObject(
    -                            Signature.DEFAULT_ELEMENT_NAME);
    -            final SecurityConfiguration secConfiguration2 = Configuration
    -                    .getGlobalSecurityConfiguration();
    -            final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2
    -                    .getKeyInfoGeneratorManager();
    -            final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2
    -                    .getDefaultManager();
    -            final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2
    -                    .getFactory(credential);
    -            final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2
    -                    .newInstance();
    -
    -            KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
    -            signature2.setSigningCredential(credential);
    -            signature2.setSignatureAlgorithm(
    -                    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    -            //signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
    -            signature2.setKeyInfo(keyInfo2);
    -            signature2.setCanonicalizationAlgorithm(
    -                    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    -
    -
    -            LOG.info("Marshall samlToken.");
    -            String qn = tokenSaml.getElementQName().toString();
    -
    -            if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
    -                tokenSaml.setSignature(signature);
    -                CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
    -                mars.marshall(tokenSaml);
    -                Signer.signObject(signature);
    -            } else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
    -                Response res = (Response) tokenSaml;
    -                List asserts = res.getAssertions();
    -                //If multiple assertions we just sign the response and not the assertion
    -                if (asserts.size() > 1) {
    -                    tokenSaml.setSignature(signature);
    -                    Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -                            .marshall(tokenSaml);
    -                    LOG.info("Sign samlToken.");
    -                    Signer.signObject(signature);
    -                }
    -                //If single assertion we sign the assertion and response
    -                else {
    -                    Assertion assertion = (Assertion) asserts.get(0);
    -                    assertion.setSignature(signature);
    -                    tokenSaml.setSignature(signature2);
    -                    Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -                            .marshall(tokenSaml);
    -                    LOG.info("Sign samlToken.");
    -                    Signer.signObject(signature);
    -                    Signer.signObject(signature2);
    -                }
    -            }
    -            //Normally we just sign the total saml response
    -            else {
    -                tokenSaml.setSignature(signature);
    -                Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
    -                        .marshall(tokenSaml);
    -                LOG.info("Sign samlToken.");
    -                Signer.signObject(signature);
    -            }
    -
    -
    -        } catch (MarshallingException e) {
    -            LOG.error("MarshallingException");
    -            throw new SAMLEngineException(e);
    -        } catch (NoSuchAlgorithmException e) {
    -            LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
    -            throw new SAMLEngineException(e);
    -        } catch (KeyStoreException e) {
    -            LOG.error("Generic KeyStore exception.");
    -            throw new SAMLEngineException(e);
    -        } catch (SignatureException e) {
    -            LOG.error("Signature exception.");
    -            throw new SAMLEngineException(e);
    -        } catch (SecurityException e) {
    -            LOG.error("Security exception.");
    -            throw new SAMLEngineException(e);
    -        } catch (UnrecoverableKeyException e) {
    -            LOG.error("UnrecoverableKey exception.");
    -            throw new SAMLEngineException(e);
    -        }
    -
    -        return tokenSaml;
    -    }
    -
    -    /**
    -     * @param tokenSaml token SAML
    -     * @return the SAMLObject validated.
    -     * @throws SAMLEngineException error validate signature
    -     * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(org.opensaml.common.SignableSAMLObject)
    -     */
    -    public final SAMLObject validateSignature(final SignableSAMLObject tokenSaml)
    -            throws SAMLEngineException {
    -        LOG.info("Start signature validation.");
    -        try {
    -
    -            // Validate structure signature
    -            final SAMLSignatureProfileValidator sigProfValidator =
    -                    new SAMLSignatureProfileValidator();
    -            try {
    -                // Indicates signature id conform to SAML Signature profile
    -                sigProfValidator.validate(tokenSaml.getSignature());
    -            } catch (ValidationException e) {
    -                LOG.error("ValidationException: signature isn't conform to SAML Signature profile.");
    -                throw new SAMLEngineException(e);
    -            }
    -
    -            String aliasCert = null;
    -            X509Certificate certificate;
    -
    -            final List trustCred = new ArrayList();
    -
    -            for (final Enumeration e = storkOwnKeyStore.aliases(); e
    -                    .hasMoreElements(); ) {
    -                aliasCert = e.nextElement();
    -                final BasicX509Credential credential = new BasicX509Credential();
    -                certificate = (X509Certificate) storkOwnKeyStore
    -                        .getCertificate(aliasCert);
    -                credential.setEntityCertificate(certificate);
    -                trustCred.add(credential);
    -            }
    -
    -            final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
    -
    -            final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
    -                    .getX509Datas().get(0).getX509Certificates().get(0);
    -
    -            final CertificateFactory certFact = CertificateFactory
    -                    .getInstance("X.509");
    -            final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
    -                    .decode(xmlCert.getValue()));
    -            final X509Certificate cert = (X509Certificate) certFact
    -                    .generateCertificate(bis);
    -
    -            // Exist only one certificate
    -            final BasicX509Credential entityX509Cred = new BasicX509Credential();
    -            entityX509Cred.setEntityCertificate(cert);
    -
    -            try {
    -                cert.checkValidity();
    -            } catch (CertificateExpiredException exp) {
    -                throw new SAMLEngineException("Certificate expired.");
    -            } catch (CertificateNotYetValidException exp) {
    -                throw new SAMLEngineException("Certificate not yet valid.");
    -            }
    -
    -		/* A better use of PKI based validation but not wanted for STORK... 
    -        boolean trusted = false;
    -		
    -		for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements();) 
    -	    {
    -	    	aliasCert = e.nextElement();		
    -	    	certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);					
    -	    	try {
    -	    		cert.verify(certificate.getPublicKey());
    -	    		trusted = true;
    -	    		break;
    -	    	}
    -	    	catch (Exception ex) {
    -	    		//Do nothing - cert not trusted yet
    -	    	}
    -	    }
    -		
    -		if (!trusted)
    -		    throw new SAMLEngineException("Certificate is not trusted.");*/
    -
    -            // Validate trust certificates
    -            final ExplicitX509CertificateTrustEvaluator chainTrustEvaluator = new ExplicitX509CertificateTrustEvaluator();
    -
    -            if (!chainTrustEvaluator.validate(entityX509Cred, trustCred)) {
    -                throw new SAMLEngineException("Certificate is not trusted.");
    -            }
    -            final ExplicitKeyTrustEvaluator keyTrustEvaluator =
    -                    new ExplicitKeyTrustEvaluator();
    -
    -            if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) {
    -            	throw new SAMLEngineException("Certificate is not trusted.");
    -            }
    -
    -            // Validate signature
    -            final SignatureValidator sigValidator = new SignatureValidator(
    -                    entityX509Cred);
    -            sigValidator.validate(tokenSaml.getSignature());
    -
    -        } catch (ValidationException e) {
    -            LOG.error("ValidationException.");
    -            throw new SAMLEngineException(e);
    -        } catch (KeyStoreException e) {
    -            LOG.error("KeyStoreException.", e);
    -            throw new SAMLEngineException(e);
    -        } catch (GeneralSecurityException e) {
    -            LOG.error("GeneralSecurityException.", e);
    -            throw new SAMLEngineException(e);
    -        }
    -        LOG.info(tokenSaml.getSignatureReferenceID());
    -        LOG.info("Start signature validation - END.");
    -        return tokenSaml;
    -    }
    -
    -
    -    /**
    -     * Load cryptographic service provider.
    -     *
    -     * @throws SAMLEngineException the SAML engine exception
    -     */
    -    public final void loadCryptServiceProvider() throws SAMLEngineException {
    -        LOG.info("Load Cryptographic Service Provider");
    -        FileInputStream fis = null;
    -        try {
    -//            // Dynamically register Bouncy Castle provider.
    -//            boolean found = false;
    -//            // Check if BouncyCastle is already registered as a provider
    -//            final Provider[] providers = Security.getProviders();
    -//            for (int i = 0; i < providers.length; i++) {
    -//                if (providers[i].getName().equals(
    -//                        BouncyCastleProvider.PROVIDER_NAME)) {
    -//                    found = true;
    -//                }
    -//            }
    -//
    -//            // Register only if the provider has not been previously registered
    -//            if (!found) {
    -//                LOG.info("SAMLCore: Register Bouncy Castle provider.");
    -//                Security.insertProviderAt(new BouncyCastleProvider(), Security
    -//                        .getProviders().length);
    -//            }
    -
    -            storkOwnKeyStore = KeyStore.getInstance(properties
    -                    .getProperty(KEYSTORE_TYPE));
    -
    -            LOG.info("Loading KeyInfo from keystore file " + properties.getProperty("keystorePath"));
    -            fis = new FileInputStream(properties
    -                    .getProperty("keystorePath"));
    -
    -            storkOwnKeyStore.load(fis, properties.getProperty(
    -                    KEY_STORE_PASS).toCharArray());
    -
    -        } catch (Exception e) {
    -            LOG.error("Error loading CryptographicServiceProvider", e);
    -            throw new SAMLEngineException(
    -                    "Error loading CryptographicServiceProvider", e);
    -        } finally {
    -            IOUtils.closeQuietly(fis);
    -        }
    -    }
    +	/**
    +	 * The Constant KEYSTORE_TYPE.
    +	 */
    +	private static final String KEYSTORE_TYPE = "keystoreType";
    +
    +	/**
    +	 * The Constant KEY_STORE_PASSWORD.
    +	 */
    +	private static final String KEY_STORE_PASS = "keyStorePassword";
    +
    +	/**
    +	 * The logger.
    +	 */
    +	private static final Logger LOG = LoggerFactory.getLogger(SignSW.class.getName());
    +
    +	/**
    +	 * The stork own key store.
    +	 */
    +	private KeyStore storkOwnKeyStore = null;
    +
    +	/**
    +	 * The instance.
    +	 *
    +	 * @return the properties
    +	 */
    +
    +	public final Properties getProperties() {
    +		return properties;
    +	}
    +
    +	/**
    +	 * Gets the stork own key store.
    +	 *
    +	 * @return the stork own key store
    +	 */
    +	public final KeyStore getStorkOwnKeyStore() {
    +		return storkOwnKeyStore;
    +	}
    +
    +	/**
    +	 * Gets the stork trustStore.
    +	 *
    +	 * @return the stork own key store
    +	 */
    +	public KeyStore getTrustStore() {
    +		return storkOwnKeyStore;
    +	}
    +
    +	/**
    +	 * Sets the stork own key store.
    +	 *
    +	 * @param newkOwnKeyStore
    +	 *            the new stork own key store
    +	 */
    +	public final void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
    +		this.storkOwnKeyStore = newkOwnKeyStore;
    +	}
    +
    +	/**
    +	 * Sets the properties.
    +	 *
    +	 * @param newProperties
    +	 *            the new properties
    +	 */
    +	public final void setProperties(final Properties newProperties) {
    +		this.properties = newProperties;
    +	}
    +
    +	/**
    +	 * The SW sign prop.
    +	 */
    +	private Properties properties = null;
    +
    +	/**
    +	 * Inits the file configuration.
    +	 *
    +	 * @param fileConf
    +	 *            name of the file configuration
    +	 * @throws SAMLEngineException
    +	 *             error at the load from file configuration
    +	 */
    +	public final void init(final String fileConf) throws SAMLEngineException {
    +		InputStream fileProperties = null;
    +		// fetch base from system properties, give a default if there is nothing configured
    +		String base = System.getProperty("eu.stork.samlengine.config.location");
    +		if (null != base) {
    +			if (!base.endsWith("/")) {
    +				base += "/";
    +			}
    +		} else {
    +			base = "/";
    +		}
    +
    +		try {
    +			if (null != base)
    +				fileProperties = new FileInputStream(base + fileConf);
    +			else
    +				fileProperties = SignSW.class.getResourceAsStream("/" + fileConf);
    +			properties = new Properties();
    +
    +			properties.loadFromXML(fileProperties);
    +			fileProperties.close();
    +		} catch (InvalidPropertiesFormatException e) {
    +			LOG.info("Exception: invalid properties format.");
    +			throw new SAMLEngineException(e);
    +		} catch (IOException e) {
    +			LOG.info("Exception: invalid file: " + fileConf);
    +			throw new SAMLEngineException(e);
    +		} finally {
    +			IOUtils.closeQuietly(fileProperties);
    +		}
    +	}
    +
    +	/**
    +	 * @return the X509Certificate
    +	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
    +	 */
    +	public final X509Certificate getCertificate() {
    +		throw new NotImplementedException();
    +	}
    +
    +	/**
    +	 * Sign the token SAML.
    +	 *
    +	 * @param tokenSaml
    +	 *            the token SAML.
    +	 * @return the SAML object
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
    +	 */
    +	public final SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
    +		LOG.info("Start Sign process.");
    +		try {
    +			final String serialNumber = properties.getProperty("serialNumber");
    +			final String issuer = properties.getProperty("issuer");
    +
    +			String alias = null;
    +			String aliasCert;
    +			X509Certificate certificate;
    +			boolean find = false;
    +
    +			for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements() && !find;) {
    +				aliasCert = e.nextElement();
    +				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
    +
    +				final String serialNum = certificate.getSerialNumber().toString(16);
    +
    +				try {
    +					X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
    +					X509Principal issuerDNConf = new X509Principal(issuer);
    +
    +					if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
    +						alias = aliasCert;
    +						find = true;
    +					}
    +				} catch (Exception ex) {
    +					LOG.error("Exception during signing: " + ex.getMessage()); // Added as a workaround for Bouncycastle email error
    +				}
    +			}
    +			if (!find) {
    +				throw new SAMLEngineException("Certificate cannot be found in keystore ");
    +			}
    +			certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
    +			final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(alias, properties.getProperty("keyPassword").toCharArray());
    +
    +			LOG.info("Recover BasicX509Credential.");
    +			final BasicX509Credential credential = new BasicX509Credential();
    +
    +			LOG.debug("Load certificate");
    +			credential.setEntityCertificate(certificate);
    +
    +			LOG.debug("Load privateKey");
    +			credential.setPrivateKey(privateKey);
    +
    +			LOG.debug("Begin signature with openSaml");
    +			final Signature signature = (Signature) Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
    +
    +			signature.setSigningCredential(credential);
    +			signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    +			// signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
    +
    +			final SecurityConfiguration secConfiguration = Configuration.getGlobalSecurityConfiguration();
    +			final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration.getKeyInfoGeneratorManager();
    +			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager.getDefaultManager();
    +			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager.getFactory(credential);
    +			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac.newInstance();
    +
    +			KeyInfo keyInfo = keyInfoGenerator.generate(credential);
    +
    +			signature.setKeyInfo(keyInfo);
    +			signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    +
    +			// Create a second signature which will be used when signing assertion and response
    +			final Signature signature2 = (Signature) Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
    +			final SecurityConfiguration secConfiguration2 = Configuration.getGlobalSecurityConfiguration();
    +			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2.getKeyInfoGeneratorManager();
    +			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2.getDefaultManager();
    +			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2.getFactory(credential);
    +			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2.newInstance();
    +
    +			KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
    +			signature2.setSigningCredential(credential);
    +			signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
    +			// signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
    +			signature2.setKeyInfo(keyInfo2);
    +			signature2.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
    +
    +			LOG.info("Marshall samlToken.");
    +			String qn = tokenSaml.getElementQName().toString();
    +
    +			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
    +				tokenSaml.setSignature(signature);
    +				CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
    +				mars.marshall(tokenSaml);
    +				Signer.signObject(signature);
    +			} else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
    +				Response res = (Response) tokenSaml;
    +				List asserts = res.getAssertions();
    +				// If multiple assertions we just sign the response and not the assertion
    +				if (asserts.size() > 1) {
    +					tokenSaml.setSignature(signature);
    +					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
    +					LOG.info("Sign samlToken.");
    +					Signer.signObject(signature);
    +				}
    +				// If single assertion we sign the assertion and response
    +				else {
    +					Assertion assertion = (Assertion) asserts.get(0);
    +					assertion.setSignature(signature);
    +					tokenSaml.setSignature(signature2);
    +					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
    +					LOG.info("Sign samlToken.");
    +					Signer.signObject(signature);
    +					Signer.signObject(signature2);
    +				}
    +			}
    +			// Normally we just sign the total saml response
    +			else {
    +				tokenSaml.setSignature(signature);
    +				Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
    +				LOG.info("Sign samlToken.");
    +				Signer.signObject(signature);
    +			}
    +
    +		} catch (MarshallingException e) {
    +			LOG.error("MarshallingException");
    +			throw new SAMLEngineException(e);
    +		} catch (NoSuchAlgorithmException e) {
    +			LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
    +			throw new SAMLEngineException(e);
    +		} catch (KeyStoreException e) {
    +			LOG.error("Generic KeyStore exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (SignatureException e) {
    +			LOG.error("Signature exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (SecurityException e) {
    +			LOG.error("Security exception.");
    +			throw new SAMLEngineException(e);
    +		} catch (UnrecoverableKeyException e) {
    +			LOG.error("UnrecoverableKey exception.");
    +			throw new SAMLEngineException(e);
    +		}
    +
    +		return tokenSaml;
    +	}
    +
    +	/**
    +	 * @param tokenSaml
    +	 *            token SAML
    +	 * @return the SAMLObject validated.
    +	 * @throws SAMLEngineException
    +	 *             error validate signature
    +	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(org.opensaml.common.SignableSAMLObject)
    +	 */
    +	public final SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
    +		LOG.info("Start signature validation.");
    +		try {
    +
    +			// Validate structure signature
    +			final SAMLSignatureProfileValidator sigProfValidator = new SAMLSignatureProfileValidator();
    +			try {
    +				// Indicates signature id conform to SAML Signature profile
    +				sigProfValidator.validate(tokenSaml.getSignature());
    +			} catch (ValidationException e) {
    +				LOG.error("ValidationException: signature isn't conform to SAML Signature profile.");
    +				throw new SAMLEngineException(e);
    +			}
    +
    +			String aliasCert = null;
    +			X509Certificate certificate;
    +
    +			final List trustCred = new ArrayList();
    +
    +			for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements();) {
    +				aliasCert = e.nextElement();
    +				final BasicX509Credential credential = new BasicX509Credential();
    +				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
    +				credential.setEntityCertificate(certificate);
    +				trustCred.add(credential);
    +			}
    +
    +			final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
    +
    +			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
    +
    +			final CertificateFactory certFact = CertificateFactory.getInstance("X.509");
    +			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
    +			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
    +
    +			// Exist only one certificate
    +			final BasicX509Credential entityX509Cred = new BasicX509Credential();
    +			entityX509Cred.setEntityCertificate(cert);
    +
    +			try {
    +				cert.checkValidity();
    +			} catch (CertificateExpiredException exp) {
    +				throw new SAMLEngineException("Certificate expired.");
    +			} catch (CertificateNotYetValidException exp) {
    +				throw new SAMLEngineException("Certificate not yet valid.");
    +			}
    +
    +			/*
    +			 * A better use of PKI based validation but not wanted for STORK... boolean trusted = false;
    +			 * 
    +			 * for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements();) { aliasCert = e.nextElement(); certificate = (X509Certificate)
    +			 * storkOwnKeyStore.getCertificate(aliasCert); try { cert.verify(certificate.getPublicKey()); trusted = true; break; } catch (Exception ex) { //Do nothing - cert not trusted yet } }
    +			 * 
    +			 * if (!trusted) throw new SAMLEngineException("Certificate is not trusted.");
    +			 */
    +
    +			// Validate trust certificates
    +			final ExplicitX509CertificateTrustEvaluator chainTrustEvaluator = new ExplicitX509CertificateTrustEvaluator();
    +
    +			if (!chainTrustEvaluator.validate(entityX509Cred, trustCred)) {
    +				throw new SAMLEngineException("Certificate is not trusted.");
    +			}
    +			final ExplicitKeyTrustEvaluator keyTrustEvaluator = new ExplicitKeyTrustEvaluator();
    +
    +			if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) {
    +				throw new SAMLEngineException("Certificate is not trusted.");
    +			}
    +
    +			// Validate signature
    +			final SignatureValidator sigValidator = new SignatureValidator(entityX509Cred);
    +			sigValidator.validate(tokenSaml.getSignature());
    +
    +		} catch (ValidationException e) {
    +			LOG.error("ValidationException.");
    +			throw new SAMLEngineException(e);
    +		} catch (KeyStoreException e) {
    +			LOG.error("KeyStoreException.", e);
    +			throw new SAMLEngineException(e);
    +		} catch (GeneralSecurityException e) {
    +			LOG.error("GeneralSecurityException.", e);
    +			throw new SAMLEngineException(e);
    +		}
    +		LOG.info(tokenSaml.getSignatureReferenceID());
    +		LOG.info("Start signature validation - END.");
    +		return tokenSaml;
    +	}
    +
    +	/**
    +	 * Load cryptographic service provider.
    +	 *
    +	 * @throws SAMLEngineException
    +	 *             the SAML engine exception
    +	 */
    +	public final void loadCryptServiceProvider() throws SAMLEngineException {
    +		LOG.info("Load Cryptographic Service Provider");
    +		FileInputStream fis = null;
    +		try {
    +			// // Dynamically register Bouncy Castle provider.
    +			// boolean found = false;
    +			// // Check if BouncyCastle is already registered as a provider
    +			// final Provider[] providers = Security.getProviders();
    +			// for (int i = 0; i < providers.length; i++) {
    +			// if (providers[i].getName().equals(
    +			// BouncyCastleProvider.PROVIDER_NAME)) {
    +			// found = true;
    +			// }
    +			// }
    +			//
    +			// // Register only if the provider has not been previously registered
    +			// if (!found) {
    +			// LOG.info("SAMLCore: Register Bouncy Castle provider.");
    +			// Security.insertProviderAt(new BouncyCastleProvider(), Security
    +			// .getProviders().length);
    +			// }
    +
    +			storkOwnKeyStore = KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE));
    +
    +			LOG.info("Loading KeyInfo from keystore file " + properties.getProperty("keystorePath"));
    +			fis = new FileInputStream(properties.getProperty("keystorePath"));
    +
    +			storkOwnKeyStore.load(fis, properties.getProperty(KEY_STORE_PASS).toCharArray());
    +
    +		} catch (Exception e) {
    +			LOG.error("Error loading CryptographicServiceProvider", e);
    +			throw new SAMLEngineException("Error loading CryptographicServiceProvider", e);
    +		} finally {
    +			IOUtils.closeQuietly(fis);
    +		}
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java
    index a60515593..332882a03 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java
    @@ -26,16 +26,15 @@ import eu.stork.peps.auth.engine.core.VIDPAuthenticationAttributes;
      * @author fjquevedo
      */
     public final class VIDPAuthenticationAttributesBuilder extends AbstractSAMLObjectBuilder {
    -    
     
    -    /** {@inheritDoc} */
    -    public VIDPAuthenticationAttributes buildObject() {
    -        return buildObject(SAMLCore.STORK10P_NS.getValue(), VIDPAuthenticationAttributes.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    -    }
    +	/** {@inheritDoc} */
    +	public VIDPAuthenticationAttributes buildObject() {
    +		return buildObject(SAMLCore.STORK10P_NS.getValue(), VIDPAuthenticationAttributes.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
    +	}
    +
    +	/** {@inheritDoc} */
    +	public VIDPAuthenticationAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    +		return new VIDPAuthenticationAttributesImpl(namespaceURI, localName, namespacePrefix);
    +	}
     
    -    /** {@inheritDoc} */
    -    public VIDPAuthenticationAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
    -        return new VIDPAuthenticationAttributesImpl(namespaceURI, localName, namespacePrefix);
    -    }
    -    
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
    index 25737e307..d7d92ea74 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
    @@ -33,100 +33,102 @@ import org.slf4j.LoggerFactory;
      * 
      * @author fjquevedo
      */
    -public final class VIDPAuthenticationAttributesImpl extends AbstractSignableSAMLObject implements
    -VIDPAuthenticationAttributes {
    +public final class VIDPAuthenticationAttributesImpl extends AbstractSignableSAMLObject implements VIDPAuthenticationAttributes {
     
    -    private static final Logger LOGGER = LoggerFactory.getLogger(VIDPAuthenticationAttributesImpl.class.getName());
    -    /** The citizen country code. */
    -    private CitizenCountryCode citizenCountryCode;
    -    
    -    /** The SP information. */
    -    private SPInformation spInformation;
    +	private static final Logger LOGGER = LoggerFactory.getLogger(VIDPAuthenticationAttributesImpl.class.getName());
    +	/** The citizen country code. */
    +	private CitizenCountryCode citizenCountryCode;
    +
    +	/** The SP information. */
    +	private SPInformation spInformation;
    +
    +	/**
    +	 * Instantiates a new requested attributes implement.
    +	 * 
    +	 * @param namespaceURI
    +	 *            the namespace URI
    +	 * @param elementLocalName
    +	 *            the element local name
    +	 * @param namespacePrefix
    +	 *            the namespace prefix
    +	 */
    +	protected VIDPAuthenticationAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
    +		super(namespaceURI, elementLocalName, namespacePrefix);
    +	}
     
     	/**
    -     * Instantiates a new requested attributes implement.
    -     * 
    -     * @param namespaceURI the namespace URI
    -     * @param elementLocalName the element local name
    -     * @param namespacePrefix the namespace prefix
    -     */
    -    protected VIDPAuthenticationAttributesImpl(final String namespaceURI,
    -	    final String elementLocalName, final String namespacePrefix) {	
    -	super(namespaceURI, elementLocalName, namespacePrefix);
    -    }
    -    
    -   
    -    /**
    -     * getCitizenCountryCode.
    -     * 
    -     * @return the citizen country code
    -     */    
    -    public CitizenCountryCode getCitizenCountryCode() {
    -    	return citizenCountryCode;
    -    }
    -    
    -    /**
    -     * getSPInformation
    -     * 
    -     * @return the SP information
    -     */
    -    public SPInformation getSPInformation() {
    +	 * getCitizenCountryCode.
    +	 * 
    +	 * @return the citizen country code
    +	 */
    +	public CitizenCountryCode getCitizenCountryCode() {
    +		return citizenCountryCode;
    +	}
    +
    +	/**
    +	 * getSPInformation
    +	 * 
    +	 * @return the SP information
    +	 */
    +	public SPInformation getSPInformation() {
     		return spInformation;
     	}
     
    -    /**
    -     * Gets the ordered children.
    -     * 
    -     * @return the ordered children
    -     *
    -     */
    -    public List getOrderedChildren() {
    -	final ArrayList children = new ArrayList();
    -
    -	children.add(citizenCountryCode);
    -	children.add(spInformation);
    -		
    -	if (getSignature() != null) {
    -	    children.add(getSignature());
    +	/**
    +	 * Gets the ordered children.
    +	 * 
    +	 * @return the ordered children
    +	 *
    +	 */
    +	public List getOrderedChildren() {
    +		final ArrayList children = new ArrayList();
    +
    +		children.add(citizenCountryCode);
    +		children.add(spInformation);
    +
    +		if (getSignature() != null) {
    +			children.add(getSignature());
    +		}
    +
    +		return Collections.unmodifiableList(children);
    +
    +	}
    +
    +	/**
    +	 * Gets the signature reference id.
    +	 * 
    +	 * @return the signature reference id
    +	 *
    +	 */
    +	public String getSignatureReferenceID() {
    +		return null;
    +	}
    +
    +	/**
    +	 * Sets the citizen country code.
    +	 * 
    +	 * @param newCitizenCountryCode
    +	 *            the new citizen country code
    +	 *
    +	 */
    +	public void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode) {
    +		this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);
     	}
    -	
    -	return Collections.unmodifiableList(children);
    -
    -    }
    -
    -    /**
    -     * Gets the signature reference id.
    -     * 
    -     * @return the signature reference id
    -     *
    -     */
    -    public String getSignatureReferenceID() {
    -	return null;
    -    }
    -    
    -    /**
    -     * Sets the citizen country code.
    -     * 
    -     * @param newCitizenCountryCode the new citizen country code
    -     *
    -     */
    -    public void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode) {
    -	this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);	
    -    }    
    -    
    -    /**
    -     * Sets the SP information.
    -     * 
    -     * @param newSPInformation the new SP information
    -     *
    -     */
    -    public void setSPInformation(SPInformation newSPInformation) {
    +
    +	/**
    +	 * Sets the SP information.
    +	 * 
    +	 * @param newSPInformation
    +	 *            the new SP information
    +	 *
    +	 */
    +	public void setSPInformation(SPInformation newSPInformation) {
     		this.spInformation = prepareForAssignment(this.spInformation, newSPInformation);
     	}
     
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
    +	@Override
    +	public int hashCode() {
    +		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    +		return super.hashCode();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java
    index 5635ddd6b..73e0ca6f5 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java
    @@ -24,10 +24,10 @@ import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
      */
     public class VIDPAuthenticationAttributesMarshaller extends AbstractSAMLObjectMarshaller {
     
    -    /**
    -     * Instantiates a new vIDP authentication attributes marshaller.
    -     */
    -    public VIDPAuthenticationAttributesMarshaller() {
    -	super();
    -    }
    +	/**
    +	 * Instantiates a new vIDP authentication attributes marshaller.
    +	 */
    +	public VIDPAuthenticationAttributesMarshaller() {
    +		super();
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
    index ba4a4fe3a..dadf86254 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
    @@ -28,28 +28,29 @@ import eu.stork.peps.auth.engine.core.VIDPAuthenticationAttributes;
      * 
      * @author fjquevedo
      */
    -public class VIDPAuthenticationAttributesUnmarshaller extends
    -	AbstractSAMLObjectUnmarshaller {
    +public class VIDPAuthenticationAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
    -    /**
    -     * Process child element.
    -     * 
    -     * @param parentObject the parent object
    -     * @param childObject the child object
    -     * 
    -     * @throws UnmarshallingException the unmarshalling exception
    -     *
    -     */
    -    protected final void processChildElement(final XMLObject parentObject,
    -	    final XMLObject childObject) throws UnmarshallingException {
    -	final VIDPAuthenticationAttributes vIDPAuthenticationAttr = (VIDPAuthenticationAttributes) parentObject;
    +	/**
    +	 * Process child element.
    +	 * 
    +	 * @param parentObject
    +	 *            the parent object
    +	 * @param childObject
    +	 *            the child object
    +	 * 
    +	 * @throws UnmarshallingException
    +	 *             the unmarshalling exception
    +	 *
    +	 */
    +	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
    +		final VIDPAuthenticationAttributes vIDPAuthenticationAttr = (VIDPAuthenticationAttributes) parentObject;
     
    -	if (childObject instanceof CitizenCountryCode) {
    -	    vIDPAuthenticationAttr.setCitizenCountryCode((CitizenCountryCode) childObject);
    -	} else if (childObject instanceof SPInformation) {
    -		vIDPAuthenticationAttr.setSPInformation((SPInformation) childObject);
    -	} else {
    -	    super.processChildElement(parentObject, childObject);
    -	}	
    -    }
    +		if (childObject instanceof CitizenCountryCode) {
    +			vIDPAuthenticationAttr.setCitizenCountryCode((CitizenCountryCode) childObject);
    +		} else if (childObject instanceof SPInformation) {
    +			vIDPAuthenticationAttr.setSPInformation((SPInformation) childObject);
    +		} else {
    +			super.processChildElement(parentObject, childObject);
    +		}
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
    index c602ad38a..be06dcfb4 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
    @@ -7,13 +7,15 @@ import org.opensaml.xml.validation.Validator;
     import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
     
     public class CustomAttributeQueryValidator implements Validator {
    -	
    +
     	/**
     	 * Validate action.
     	 * 
    -	 * @param attrQuery the attribute query to validate
    +	 * @param attrQuery
    +	 *            the attribute query to validate
     	 * 
    -	 * @throws ValidationException the validation exception
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
     	public final void validate(final CustomAttributeQuery attrQuery) throws ValidationException {
     		validateAssertion(attrQuery);
    @@ -21,49 +23,58 @@ public class CustomAttributeQueryValidator implements Validator {
     
    +	/**
    +	 * validate the extensions.
    +	 * 
    +	 * @param extensions
    +	 *            the extensions
    +	 * 
    +	 * @throws ValidationException
    +	 *             the validation exception
    +	 */
    +	public final void validate(final Extensions extensions) throws ValidationException {
    +		if (extensions.getUnknownXMLObjects() == null || extensions.getUnknownXMLObjects().size() <= 0) {
    +			throw new ValidationException("Extension element is empty or not exist.");
    +		}
    +
    +		List qaa = extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME);
    +
    +		if (qaa.size() == 1) {
    +			final Validator validatorQaa = new QAAAttributeSchemaValidator();
    +			validatorQaa.validate((QAAAttribute) qaa.get(0));
    +		} else {
    +			throw new ValidationException("Extensions must contain only one element QAALevel.");
    +		}
     
    -    /**
    -     * validate the extensions.
    -     * 
    -     * @param extensions the extensions
    -     * 
    -     * @throws ValidationException the validation exception
    -     */
    -    public final void validate(final Extensions extensions)
    -    throws ValidationException {
    -	if (extensions.getUnknownXMLObjects() == null
    -		|| extensions.getUnknownXMLObjects().size() <= 0) {
    -	    throw new ValidationException("Extension element is empty or not exist.");
     	}
    -	
    -	List qaa = extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME);
    -	
    -	if (qaa.size() == 1) {
    -		final Validator validatorQaa = new QAAAttributeSchemaValidator();
    -		validatorQaa.validate((QAAAttribute) qaa.get(0));
    -	} else {
    -		throw new ValidationException(
    -	    "Extensions must contain only one element QAALevel.");
    -	}
    -
    -    }
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
    index 72639c8ee..0d3dbb5e9 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
    @@ -4,77 +4,90 @@ import org.opensaml.saml2.core.Response;
     import org.opensaml.xml.validation.ValidationException;
     import org.opensaml.xml.validation.Validator;
     
    -
     public class MultipleAssertionResponseValidator implements Validator {
    -	
    +
     	/**
     	 * Validate action.
     	 * 
    -	 * @param response the response to validate
    +	 * @param response
    +	 *            the response to validate
     	 * 
    -	 * @throws ValidationException the validation exception
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
     	public final void validate(final Response response) throws ValidationException {
     		validateAssertion(response);
     		validateConsent(response);
    -		validateDestination(response);		
    +		validateDestination(response);
     		validateTime(response);
     		validateId(response);
     	}
     
    -
     	/**
     	 * Validate assertion.
     	 * 
    -	 * @param response the attribute query
    +	 * @param response
    +	 *            the attribute query
     	 * 
    -	 * @throws ValidationException the validation exception
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
    -	protected final void validateAssertion(final Response response)
    -	throws ValidationException {
    +	protected final void validateAssertion(final Response response) throws ValidationException {
     		if (response.getAssertions() == null || response.getAssertions().size() < 2) {
     			throw new ValidationException("Multiple assertions must be specified.");
     		}
     	}
    -	
    +
     	/**
     	 * Validate the Consent
    -	 * @param response the response to validate
    -	 * @throws ValidationException the validation exception
    +	 * 
    +	 * @param response
    +	 *            the response to validate
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
     	protected void validateConsent(Response response) throws ValidationException {
    -        if (response.getConsent() == null)
    -            throw new ValidationException("Consent is required");
    -    }
    -	
    +		if (response.getConsent() == null)
    +			throw new ValidationException("Consent is required");
    +	}
    +
     	/**
     	 * Validate the destination
    -	 * @param response the response to validate
    -	 * @throws ValidationException the validation exception
    +	 * 
    +	 * @param response
    +	 *            the response to validate
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
     	protected void validateDestination(Response response) throws ValidationException {
    -        if (response.getDestination() == null)
    -            throw new ValidationException("Destination is required");
    -    }
    -	
    +		if (response.getDestination() == null)
    +			throw new ValidationException("Destination is required");
    +	}
    +
     	/**
     	 * Validate issue times
    -	 * @param response the response to validate
    -	 * @throws ValidationException the validation exception
    +	 * 
    +	 * @param response
    +	 *            the response to validate
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
    -	protected void validateTime(Response response) throws ValidationException {		
    -        if (response.getIssueInstant().isAfterNow())
    -            throw new ValidationException("Issue time is in the futue");
    -    }
    -	
    +	protected void validateTime(Response response) throws ValidationException {
    +		if (response.getIssueInstant().isAfterNow())
    +			throw new ValidationException("Issue time is in the futue");
    +	}
    +
     	/**
     	 * Validate ids
    -	 * @param response the response to validate
    -	 * @throws ValidationException the validation exception
    +	 * 
    +	 * @param response
    +	 *            the response to validate
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
    -	protected void validateId(Response response) throws ValidationException {		
    -        if (response.getID() == null || response.getInResponseTo() == null)
    -            throw new ValidationException("Id and response id is required");
    -    }
    +	protected void validateId(Response response) throws ValidationException {
    +		if (response.getID() == null || response.getInResponseTo() == null)
    +			throw new ValidationException("Id and response id is required");
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
    index 44c9db380..bf7626dc5 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
    @@ -28,28 +28,29 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
      */
     public class QAAAttributeSchemaValidator implements Validator {
     
    -
     	/**
     	 * Validate action.
     	 * 
    -	 * @param qaa the quality authentication assurance level attribute
    +	 * @param qaa
    +	 *            the quality authentication assurance level attribute
     	 * 
    -	 * @throws ValidationException the validation exception
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
     	public final void validate(final QAAAttribute qaa) throws ValidationException {
     		validateAction(qaa);
     	}
     
    -
     	/**
     	 * Validate action.
     	 * 
    -	 * @param qaaAttribute the quality authentication assurance level attribute.
    +	 * @param qaaAttribute
    +	 *            the quality authentication assurance level attribute.
     	 * 
    -	 * @throws ValidationException the validation exception
    +	 * @throws ValidationException
    +	 *             the validation exception
     	 */
    -	protected final void validateAction(final QAAAttribute qaaAttribute)
    -	throws ValidationException {
    +	protected final void validateAction(final QAAAttribute qaaAttribute) throws ValidationException {
     		if (DatatypeHelper.isEmpty(qaaAttribute.getQaaLevel())) {
     			throw new ValidationException("QAALevel label must be specified.");
     		}
    @@ -57,8 +58,7 @@ public class QAAAttributeSchemaValidator implements Validator {
     		final int qaa = Integer.valueOf(qaaAttribute.getQaaLevel());
     
     		if (qaa < QAAAttribute.MIN_VALUE || qaa > QAAAttribute.MAX_VALUE) {
    -			throw new ValidationException(
    -					"QAALevel label must be greater than 0.");
    +			throw new ValidationException("QAALevel label must be greater than 0.");
     		}
     	}
     
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    index c53e18662..6e76c52a6 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    @@ -35,108 +35,99 @@ import java.util.Properties;
      */
     public final class ConfigurationCreator {
     
    -    /**
    -     * The Constant LOGGER.
    -     */
    -    private static final Logger LOGGER = LoggerFactory
    -            .getLogger(ConfigurationCreator.class.getName());
    -
    -    /**
    -     * Creates the configuration.
    -     *
    -     * @param instanceConfs the instance configuration
    -     * @return the map< string, map< string, object>>
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    public static Map> createConfiguration(
    -            final Map instanceConfs) throws STORKSAMLEngineException {
    -
    -        final HashMap> instances =
    -                new HashMap>();
    -
    -        LOGGER.info("Create configuration.");
    -        try {
    -            // Only create instances for SAMLEngine configuration.
    -            // INSTANCE
    -            for (Map.Entry entry : instanceConfs
    -                    .entrySet()) {
    -                final InstanceEngine iEngine = entry.getValue();
    -
    -                final Map intance = new HashMap();
    -
    -                // CONFIGURATION
    -                for (ConfigurationEngine configuration : iEngine
    -                        .getConfiguration()) {
    -                    // Properties only for configuration SamlEngine.
    -                    if (configuration.getName().equalsIgnoreCase(
    -                            "SamlEngineConf")) {
    -                        intance.put(configuration.getName(),
    -                                getNewInstance(configuration.getParameters()
    -                                        .get("fileConfiguration")));
    -                    } else {
    -                        intance.put(configuration.getName(), configuration
    -                                .getParameters());
    -                    }
    -                }
    -                instances.put(entry.getKey(), intance);
    -            }
    -        } catch (STORKSAMLEngineException ex) {
    -            LOGGER.error("Can not create instance from file configuration.");
    -            throw new STORKSAMLEngineException(ex);
    -        }
    -        return instances;
    -    }
    -
    -
    -    /**
    -     * Gets the new instance.
    -     *
    -     * @param fileName the file name
    -     * @return the properties from the new instance
    -     * @throws STORKSAMLEngineException the STORKSAML engine
    -     *                                  runtime exception
    -     */
    -    private static Properties getNewInstance(final String fileName)
    -            throws STORKSAMLEngineException {
    -        InputStream fileEngineProp = null;
    -
    -        // fetch base from system properties, give a default if there is nothing configured
    -        String base = System.getProperty("eu.stork.samlengine.config.location");
    -        if (null != base) {
    -            if (!base.endsWith("/")) {
    -                base += "/";
    -            }
    -        } else {
    -            base = "/";
    -        }
    -
    -        LOGGER.info("Create file configuration properties to Stork Saml Engine: " + base + fileName);
    -
    -        try {
    -
    -            if (null != base)
    -                fileEngineProp = new FileInputStream(base + fileName);
    -            else
    -                fileEngineProp = ConfigurationCreator.class
    -                        .getResourceAsStream(base + fileName);
    -
    -            final Properties configuration = new Properties();
    -            configuration.loadFromXML(fileEngineProp);
    -            return configuration;
    -        } catch (InvalidPropertiesFormatException e) {
    -            LOGGER.error("Invalid properties format.");
    -            throw new STORKSAMLEngineException(e);
    -        } catch (IOException e) {
    -            LOGGER.error("Error read file: " + base + fileName);
    -            throw new STORKSAMLEngineException(e);
    -        } finally {
    -            IOUtils.closeQuietly(fileEngineProp);
    -        }
    -    }
    -
    -    /**
    -     * Instantiates a new instance creator.
    -     */
    -    private ConfigurationCreator() {
    -    }
    +	/**
    +	 * The Constant LOGGER.
    +	 */
    +	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationCreator.class.getName());
    +
    +	/**
    +	 * Creates the configuration.
    +	 *
    +	 * @param instanceConfs
    +	 *            the instance configuration
    +	 * @return the map< string, map< string, object>>
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	public static Map> createConfiguration(final Map instanceConfs) throws STORKSAMLEngineException {
    +
    +		final HashMap> instances = new HashMap>();
    +
    +		LOGGER.info("Create configuration.");
    +		try {
    +			// Only create instances for SAMLEngine configuration.
    +			// INSTANCE
    +			for (Map.Entry entry : instanceConfs.entrySet()) {
    +				final InstanceEngine iEngine = entry.getValue();
    +
    +				final Map intance = new HashMap();
    +
    +				// CONFIGURATION
    +				for (ConfigurationEngine configuration : iEngine.getConfiguration()) {
    +					// Properties only for configuration SamlEngine.
    +					if (configuration.getName().equalsIgnoreCase("SamlEngineConf")) {
    +						intance.put(configuration.getName(), getNewInstance(configuration.getParameters().get("fileConfiguration")));
    +					} else {
    +						intance.put(configuration.getName(), configuration.getParameters());
    +					}
    +				}
    +				instances.put(entry.getKey(), intance);
    +			}
    +		} catch (STORKSAMLEngineException ex) {
    +			LOGGER.error("Can not create instance from file configuration.");
    +			throw new STORKSAMLEngineException(ex);
    +		}
    +		return instances;
    +	}
    +
    +	/**
    +	 * Gets the new instance.
    +	 *
    +	 * @param fileName
    +	 *            the file name
    +	 * @return the properties from the new instance
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine runtime exception
    +	 */
    +	private static Properties getNewInstance(final String fileName) throws STORKSAMLEngineException {
    +		InputStream fileEngineProp = null;
    +
    +		// fetch base from system properties, give a default if there is nothing configured
    +		String base = System.getProperty("eu.stork.samlengine.config.location");
    +		if (null != base) {
    +			if (!base.endsWith("/")) {
    +				base += "/";
    +			}
    +		} else {
    +			base = "/";
    +		}
    +
    +		LOGGER.info("Create file configuration properties to Stork Saml Engine: " + base + fileName);
    +
    +		try {
    +
    +			if (null != base)
    +				fileEngineProp = new FileInputStream(base + fileName);
    +			else
    +				fileEngineProp = ConfigurationCreator.class.getResourceAsStream(base + fileName);
    +
    +			final Properties configuration = new Properties();
    +			configuration.loadFromXML(fileEngineProp);
    +			return configuration;
    +		} catch (InvalidPropertiesFormatException e) {
    +			LOGGER.error("Invalid properties format.");
    +			throw new STORKSAMLEngineException(e);
    +		} catch (IOException e) {
    +			LOGGER.error("Error read file: " + base + fileName);
    +			throw new STORKSAMLEngineException(e);
    +		} finally {
    +			IOUtils.closeQuietly(fileEngineProp);
    +		}
    +	}
    +
    +	/**
    +	 * Instantiates a new instance creator.
    +	 */
    +	private ConfigurationCreator() {
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java
    index d9e7e467a..9dbed386e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java
    @@ -24,46 +24,48 @@ import java.util.Map;
      */
     public class ConfigurationEngine {
     
    -    /** The name of the configuration file. */
    -    private String name;
    +	/** The name of the configuration file. */
    +	private String name;
     
    -    /** The parameters. */
    -    private Map parameters;
    +	/** The parameters. */
    +	private Map parameters;
     
    -    /**
    -     * Gets the name.
    -     * 
    -     * @return the name
    -     */
    -    public final String getName() {
    -	return name;
    -    }
    +	/**
    +	 * Gets the name.
    +	 * 
    +	 * @return the name
    +	 */
    +	public final String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Gets the parameters.
    -     * 
    -     * @return the parameters
    -     */
    -    public final Map getParameters() {
    -	return parameters;
    -    }
    +	/**
    +	 * Gets the parameters.
    +	 * 
    +	 * @return the parameters
    +	 */
    +	public final Map getParameters() {
    +		return parameters;
    +	}
     
    -    /**
    -     * Sets the name.
    -     * 
    -     * @param newName the new name
    -     */
    -    public final void setName(final String newName) {
    -	this.name = newName;
    -    }
    +	/**
    +	 * Sets the name.
    +	 * 
    +	 * @param newName
    +	 *            the new name
    +	 */
    +	public final void setName(final String newName) {
    +		this.name = newName;
    +	}
     
    -    /**
    -     * Sets the parameters.
    -     * 
    -     * @param newParameters the parameters
    -     */
    -    public final void setParameters(final Map newParameters) {
    -	this.parameters = newParameters;
    -    }
    +	/**
    +	 * Sets the parameters.
    +	 * 
    +	 * @param newParameters
    +	 *            the parameters
    +	 */
    +	public final void setParameters(final Map newParameters) {
    +		this.parameters = newParameters;
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java
    index 7968c77ff..f68060154 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java
    @@ -46,189 +46,172 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
      */
     public final class ConfigurationReader {
     
    -    /** The Constant SAML_ENGINE_CONFIGURATION_FILE. */
    -    private static final String ENGINE_CONF_FILE = "SamlEngine.xml";
    -
    -    /** The Constant LOGGER. */
    -    private static final Logger LOGGER = LoggerFactory
    -    .getLogger(ConfigurationReader.class.getName());
    -
    -    /** The Constant NODE_CONFIGURATION. */
    -    private static final String NODE_CONF = "configuration";
    -
    -    /** The Constant NODE_CONFIGURATION_NAME. */
    -    private static final String NODE_CONF_NAME = "name";
    -
    -    /** The Constant NODE_INSTANCE_NAME. */
    -    private static final String NODE_INST_NAME = "name";
    -
    -    /** The Constant NODE_INSTANCE. */
    -    private static final String NODE_INSTANCE = "instance";
    -
    -    /** The Constant NODE_CONFIGURATION_NAME. */
    -    private static final String NODE_PARAM_NAME = "name";
    -
    -    /** The Constant NODE_CONFIGURATION_NAME. */
    -    private static final String NODE_PARAM_VALUE = "value";
    -
    -    /** The Constant NODE_CONFIGURATION_NAME. */
    -    private static final String NODE_PARAMETER = "parameter";
    -
    -    /**
    -     * Generate parameters.
    -     * 
    -     * @param configurationNode the configuration node
    -     * 
    -     * @return the map< string, string>
    -     */
    -    private static Map generateParam(
    -	    final Element configurationNode) {
    -
    -	final HashMap parameters = new HashMap();
    -
    -	final NodeList parameterNodes = configurationNode
    -	.getElementsByTagName(NODE_PARAMETER);
    -
    -	String parameterName;
    -	String parameterValue;
    -
    -	for (int k = 0; k < parameterNodes.getLength(); ++k) {
    -	    // for every parameter find, process.
    -	    final Element parameterNode = (Element) parameterNodes.item(k);
    -	    parameterName = parameterNode.getAttribute(NODE_PARAM_NAME);
    -	    parameterValue = parameterNode.getAttribute(NODE_PARAM_VALUE);
    -
    -	    // verified the content.
    -	    if (StringUtils.isBlank(parameterName)
    -		    || StringUtils.isBlank(parameterValue)) {
    -		throw new STORKSAMLEngineRuntimeException(
    -		"Error reader parameters (name - value).");
    -	    } else {
    -		parameters.put(parameterName.trim(), parameterValue.trim());
    -	    }
    -	}
    -	return parameters;
    -    }
    -
    -    /**
    -     * Read configuration.
    -     * 
    -     * @return the map< string, instance engine>
    -     * 
    -     * @throws SAMLEngineException the STORKSAML engine runtime
    -     *             exception
    -     */
    -    public static Map readConfiguration()
    -    throws SAMLEngineException {
    -
    -        // fetch base from system properties, give a default if there is nothing configured
    -        String base = System.getProperty("eu.stork.samlengine.config.location");
    -        if(null != base)
    -            if(!base.endsWith("/"))
    -                base += "/";
    -
    -
    -	LOGGER.info("Init reader: " + base + ENGINE_CONF_FILE);
    -	final Map instanceConfs = 
    -	    new HashMap();
    -
    -	Document document = null;
    -	// Load configuration file
    -	final DocumentBuilderFactory factory = DocumentBuilderFactory
    -	.newInstance();
    -	DocumentBuilder builder;
    -
    -	InputStream engineConf = null;
    -	try {
    -
    -	    factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
    -
    -	    builder = factory.newDocumentBuilder();
    -	    
    -	    if (null != base)
    -            engineConf = new FileInputStream(base + ENGINE_CONF_FILE);
    -        else
    -            engineConf = ConfigurationReader.class.getResourceAsStream("/" + ENGINE_CONF_FILE);
    -	    
    -	    document = builder.parse(engineConf);
    -
    -	    // Read instance
    -	    final NodeList list = document.getElementsByTagName(NODE_INSTANCE);
    -
    -	    for (int indexElem = 0; indexElem < list.getLength(); ++indexElem) {
    -		final Element element = (Element) list.item(indexElem);
    -
    -		final InstanceEngine instanceConf = new InstanceEngine();
    -
    -		// read every configuration.
    -		final String instanceName = element
    -		.getAttribute(NODE_INST_NAME);
    -
    -		if (StringUtils.isBlank(instanceName)) {
    -		    throw new STORKSAMLEngineRuntimeException(
    -		    "Error reader instance name.");
    +	/** The Constant SAML_ENGINE_CONFIGURATION_FILE. */
    +	private static final String ENGINE_CONF_FILE = "SamlEngine.xml";
    +
    +	/** The Constant LOGGER. */
    +	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationReader.class.getName());
    +
    +	/** The Constant NODE_CONFIGURATION. */
    +	private static final String NODE_CONF = "configuration";
    +
    +	/** The Constant NODE_CONFIGURATION_NAME. */
    +	private static final String NODE_CONF_NAME = "name";
    +
    +	/** The Constant NODE_INSTANCE_NAME. */
    +	private static final String NODE_INST_NAME = "name";
    +
    +	/** The Constant NODE_INSTANCE. */
    +	private static final String NODE_INSTANCE = "instance";
    +
    +	/** The Constant NODE_CONFIGURATION_NAME. */
    +	private static final String NODE_PARAM_NAME = "name";
    +
    +	/** The Constant NODE_CONFIGURATION_NAME. */
    +	private static final String NODE_PARAM_VALUE = "value";
    +
    +	/** The Constant NODE_CONFIGURATION_NAME. */
    +	private static final String NODE_PARAMETER = "parameter";
    +
    +	/**
    +	 * Generate parameters.
    +	 * 
    +	 * @param configurationNode
    +	 *            the configuration node
    +	 * 
    +	 * @return the map< string, string>
    +	 */
    +	private static Map generateParam(final Element configurationNode) {
    +
    +		final HashMap parameters = new HashMap();
    +
    +		final NodeList parameterNodes = configurationNode.getElementsByTagName(NODE_PARAMETER);
    +
    +		String parameterName;
    +		String parameterValue;
    +
    +		for (int k = 0; k < parameterNodes.getLength(); ++k) {
    +			// for every parameter find, process.
    +			final Element parameterNode = (Element) parameterNodes.item(k);
    +			parameterName = parameterNode.getAttribute(NODE_PARAM_NAME);
    +			parameterValue = parameterNode.getAttribute(NODE_PARAM_VALUE);
    +
    +			// verified the content.
    +			if (StringUtils.isBlank(parameterName) || StringUtils.isBlank(parameterValue)) {
    +				throw new STORKSAMLEngineRuntimeException("Error reader parameters (name - value).");
    +			} else {
    +				parameters.put(parameterName.trim(), parameterValue.trim());
    +			}
     		}
    -		instanceConf.setName(instanceName.trim());
    +		return parameters;
    +	}
    +
    +	/**
    +	 * Read configuration.
    +	 * 
    +	 * @return the map< string, instance engine>
    +	 * 
    +	 * @throws SAMLEngineException
    +	 *             the STORKSAML engine runtime exception
    +	 */
    +	public static Map readConfiguration() throws SAMLEngineException {
     
    -		final NodeList confNodes = element
    -		.getElementsByTagName(NODE_CONF);
    +		// fetch base from system properties, give a default if there is nothing configured
    +		String base = System.getProperty("eu.stork.samlengine.config.location");
    +		if (null != base)
    +			if (!base.endsWith("/"))
    +				base += "/";
     
    -		for (int indexNode = 0; indexNode < confNodes.getLength(); ++indexNode) {
    +		LOGGER.info("Init reader: " + base + ENGINE_CONF_FILE);
    +		final Map instanceConfs = new HashMap();
     
    -		    final Element configurationNode = (Element) confNodes
    -		    .item(indexNode);
    +		Document document = null;
    +		// Load configuration file
    +		final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
    +		DocumentBuilder builder;
     
    -		    final String configurationName = configurationNode
    -		    .getAttribute(NODE_CONF_NAME);
    +		InputStream engineConf = null;
    +		try {
     
    -		    if (StringUtils.isBlank(configurationName)) {
    -			throw new STORKSAMLEngineRuntimeException(
    -				"Error reader configuration name.");
    -		    }
    +			factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
     
    -		    final ConfigurationEngine confSamlEngine = 
    -			new ConfigurationEngine();
    +			builder = factory.newDocumentBuilder();
     
    -		    // Set configuration name.
    -		    confSamlEngine.setName(configurationName.trim());
    +			if (null != base)
    +				engineConf = new FileInputStream(base + ENGINE_CONF_FILE);
    +			else
    +				engineConf = ConfigurationReader.class.getResourceAsStream("/" + ENGINE_CONF_FILE);
     
    -		    // Read every parameter for this configuration.
    -		    final Map parameters = 
    -			generateParam(configurationNode);
    +			document = builder.parse(engineConf);
     
    -		    // Set parameters
    -		    confSamlEngine.setParameters(parameters);
    +			// Read instance
    +			final NodeList list = document.getElementsByTagName(NODE_INSTANCE);
     
    -		    // Add parameters to the configuration.
    -		    instanceConf.getConfiguration().add(confSamlEngine);
    +			for (int indexElem = 0; indexElem < list.getLength(); ++indexElem) {
    +				final Element element = (Element) list.item(indexElem);
    +
    +				final InstanceEngine instanceConf = new InstanceEngine();
    +
    +				// read every configuration.
    +				final String instanceName = element.getAttribute(NODE_INST_NAME);
    +
    +				if (StringUtils.isBlank(instanceName)) {
    +					throw new STORKSAMLEngineRuntimeException("Error reader instance name.");
    +				}
    +				instanceConf.setName(instanceName.trim());
    +
    +				final NodeList confNodes = element.getElementsByTagName(NODE_CONF);
    +
    +				for (int indexNode = 0; indexNode < confNodes.getLength(); ++indexNode) {
    +
    +					final Element configurationNode = (Element) confNodes.item(indexNode);
    +
    +					final String configurationName = configurationNode.getAttribute(NODE_CONF_NAME);
    +
    +					if (StringUtils.isBlank(configurationName)) {
    +						throw new STORKSAMLEngineRuntimeException("Error reader configuration name.");
    +					}
    +
    +					final ConfigurationEngine confSamlEngine = new ConfigurationEngine();
    +
    +					// Set configuration name.
    +					confSamlEngine.setName(configurationName.trim());
    +
    +					// Read every parameter for this configuration.
    +					final Map parameters = generateParam(configurationNode);
    +
    +					// Set parameters
    +					confSamlEngine.setParameters(parameters);
    +
    +					// Add parameters to the configuration.
    +					instanceConf.getConfiguration().add(confSamlEngine);
    +				}
    +
    +				// Add to the list of configurations.
    +				instanceConfs.put(element.getAttribute(NODE_INST_NAME), instanceConf);
    +			}
    +
    +		} catch (SAXException e) {
    +			LOGGER.error("Error: init library parser.");
    +			throw new SAMLEngineException(e);
    +		} catch (ParserConfigurationException e) {
    +			LOGGER.error("Error: parser configuration file xml.");
    +			throw new SAMLEngineException(e);
    +		} catch (IOException e) {
    +			LOGGER.error("Error: read configuration file.");
    +			throw new SAMLEngineException(e);
    +		} finally {
    +			IOUtils.closeQuietly(engineConf);
     		}
     
    -		// Add to the list of configurations.
    -		instanceConfs.put(element.getAttribute(NODE_INST_NAME),
    -			instanceConf);
    -	    }
    -
    -	} catch (SAXException e) {
    -	    LOGGER.error("Error: init library parser.");
    -	    throw new SAMLEngineException(e);
    -	} catch (ParserConfigurationException e) {
    -	    LOGGER.error("Error: parser configuration file xml.");
    -	    throw new SAMLEngineException(e);
    -	} catch (IOException e) {
    -	    LOGGER.error("Error: read configuration file.");
    -	    throw new SAMLEngineException(e);
    -	} finally {
    -	    IOUtils.closeQuietly(engineConf);
    +		return instanceConfs;
     	}
     
    -	return instanceConfs;
    -    }
    +	/**
    +	 * Instantiates a new configuration reader.
    +	 */
    +	private ConfigurationReader() {
     
    -    /**
    -     * Instantiates a new configuration reader.
    -     */
    -    private ConfigurationReader() {
    -
    -    }
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java
    index d00607853..4a382fe99 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java
    @@ -31,44 +31,44 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
      */
     public final class ConfigurationSingleton {
     
    -    /** The instance of every engine SAML. */
    -    private static Map instanceConfigs;
    +	/** The instance of every engine SAML. */
    +	private static Map instanceConfigs;
     
    -    /** The instances of SAML engine. */
    -    private static Map> instances;
    +	/** The instances of SAML engine. */
    +	private static Map> instances;
     
    -    /** The Constant LOGGER. */
    -    private static final Logger LOGGER = LoggerFactory
    -	    .getLogger(ConfigurationSingleton.class.getName());
    +	/** The Constant LOGGER. */
    +	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationSingleton.class.getName());
     
    -    static {
    -	LOGGER.debug("Read all file configurations. (instances of SAMLEngine)");
    -	try {
    -	    instanceConfigs = ConfigurationReader.readConfiguration();
    -	} catch (SAMLEngineException e) {
    -	    LOGGER.error("Error read configuration file.");
    -	    throw new STORKSAMLEngineRuntimeException(e);
    +	static {
    +		LOGGER.debug("Read all file configurations. (instances of SAMLEngine)");
    +		try {
    +			instanceConfigs = ConfigurationReader.readConfiguration();
    +		} catch (SAMLEngineException e) {
    +			LOGGER.error("Error read configuration file.");
    +			throw new STORKSAMLEngineRuntimeException(e);
    +		}
     	}
    -    }
     
    -    /**
    -     * Gets the new instance.
    -     * 
    -     * @param fileName the file name
    -     * 
    -     * @return the properties from the new instance
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine runtime exception
    -     */
    -    private static Map> getInstance(
    -	    final String fileName) throws STORKSAMLEngineException {
    -	return ConfigurationCreator.createConfiguration(instanceConfigs);
    -    }
    +	/**
    +	 * Gets the new instance.
    +	 * 
    +	 * @param fileName
    +	 *            the file name
    +	 * 
    +	 * @return the properties from the new instance
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine runtime exception
    +	 */
    +	private static Map> getInstance(final String fileName) throws STORKSAMLEngineException {
    +		return ConfigurationCreator.createConfiguration(instanceConfigs);
    +	}
     
    -    /**
    -     * Instantiates a new instance creator.
    -     */
    -    private ConfigurationSingleton() {
    -    }
    +	/**
    +	 * Instantiates a new instance creator.
    +	 */
    +	private ConfigurationSingleton() {
    +	}
     
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
    index 4d9bba8e7..0343d915a 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
    @@ -25,46 +25,48 @@ import java.util.List;
      */
     public class InstanceEngine {
     
    -    /** The configuration. */
    -    private List configuration = new ArrayList();
    +	/** The configuration. */
    +	private List configuration = new ArrayList();
     
    -    /** The name. */
    -    private String name;
    +	/** The name. */
    +	private String name;
     
    -    /**
    -     * Gets the parameters.
    -     * 
    -     * @return the parameters
    -     */
    -    public final List getConfiguration() {
    -	return this.configuration;
    -    }
    +	/**
    +	 * Gets the parameters.
    +	 * 
    +	 * @return the parameters
    +	 */
    +	public final List getConfiguration() {
    +		return this.configuration;
    +	}
     
    -    /**
    -     * Gets the name.
    -     * 
    -     * @return the name
    -     */
    -    public final String getName() {
    -	return name;
    -    }
    +	/**
    +	 * Gets the name.
    +	 * 
    +	 * @return the name
    +	 */
    +	public final String getName() {
    +		return name;
    +	}
     
    -    /**
    -     * Sets the parameters.
    -     * 
    -     * @param newConfiguration the new parameters
    -     */
    -    public final void setConfiguration(final List newConfiguration) {
    -	this.configuration = newConfiguration;
    -    }
    +	/**
    +	 * Sets the parameters.
    +	 * 
    +	 * @param newConfiguration
    +	 *            the new parameters
    +	 */
    +	public final void setConfiguration(final List newConfiguration) {
    +		this.configuration = newConfiguration;
    +	}
     
    -    /**
    -     * Sets the name.
    -     * 
    -     * @param newName the new name
    -     */
    -    public final void setName(final String newName) {
    -	this.name = newName;
    -    }
    +	/**
    +	 * Sets the name.
    +	 * 
    +	 * @param newName
    +	 *            the new name
    +	 */
    +	public final void setName(final String newName) {
    +		this.name = newName;
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java
    index 344368e03..e6676342d 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java
    @@ -17,3 +17,4 @@
      * Provides the classes necessary to create a SAML message instance.
      */
     package eu.stork.peps.configuration;
    +
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java
    index ac46f73e4..cc3bf3676 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java
    @@ -22,36 +22,39 @@ package eu.stork.peps.exceptions;
      */
     public class SAMLEngineException extends Exception {
     
    -    /** The Constant serialVersionUID. */
    -    private static final long serialVersionUID = 2611361164977849837L;
    +	/** The Constant serialVersionUID. */
    +	private static final long serialVersionUID = 2611361164977849837L;
     
    -    /**
    -     * Instantiates a new SAMLEngine exception.
    -     * 
    -     * @param wrappedException the wrapped exception
    -     */
    -    public SAMLEngineException(final Exception wrappedException) {
    -	super(wrappedException);
    -    }
    +	/**
    +	 * Instantiates a new SAMLEngine exception.
    +	 * 
    +	 * @param wrappedException
    +	 *            the wrapped exception
    +	 */
    +	public SAMLEngineException(final Exception wrappedException) {
    +		super(wrappedException);
    +	}
     
    -    /**
    -     * Instantiates a new SAMLEngine exception.
    -     * 
    -     * @param message the message
    -     */
    -    public SAMLEngineException(final String message) {
    -	super(message);
    -    }
    +	/**
    +	 * Instantiates a new SAMLEngine exception.
    +	 * 
    +	 * @param message
    +	 *            the message
    +	 */
    +	public SAMLEngineException(final String message) {
    +		super(message);
    +	}
     
    -    /**
    -     * Instantiates a new SAMLEngine exception.
    -     * 
    -     * @param message the message
    -     * @param wrappedException the wrapped exception
    -     */
    -    public SAMLEngineException(final String message,
    -	    final Exception wrappedException) {
    -	super(message, wrappedException);
    -    }
    +	/**
    +	 * Instantiates a new SAMLEngine exception.
    +	 * 
    +	 * @param message
    +	 *            the message
    +	 * @param wrappedException
    +	 *            the wrapped exception
    +	 */
    +	public SAMLEngineException(final String message, final Exception wrappedException) {
    +		super(message, wrappedException);
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java
    index bddcbd1b3..d0d9d721d 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java
    @@ -22,114 +22,119 @@ package eu.stork.peps.exceptions;
      */
     public class STORKSAMLEngineException extends Exception {
     
    -    /** The Constant serialVersionUID. */
    -    private static final long serialVersionUID = -8319723167019122930L;
    -
    -    /** The error code. */
    -    private String errorCode;
    -
    -    /** The error detail. */
    -    private String errorDetail;
    -
    -    /**
    -     * Instantiates a new sTORKSAML engine exception.
    -     * 
    -     * @param wrappedException the wrapped exception
    -     */
    -    public STORKSAMLEngineException(final Exception wrappedException) {
    -	super(wrappedException);
    -    }
    -
    -    /**
    -     * Instantiates a new sTORKSAML engine exception.
    -     * 
    -     * @param errorMessage the error message
    -     */
    -    public STORKSAMLEngineException(final String errorMessage) {
    -	super(errorMessage);
    -    }
    -
    -    /**
    -     * Instantiates a new sTORKSAML engine exception.
    -     * 
    -     * @param message the message
    -     * @param wrappedException the wrapped exception
    -     */
    -    public STORKSAMLEngineException(final String message,
    -	    final Exception wrappedException) {
    -	super(message, wrappedException);
    -    }
    -
    -    /**
    -     * Instantiates a new sTORKSAML engine exception.
    -     * 
    -     * @param newErrorCode the error code
    -     * @param errorMessage the error message
    -     * @param newErrorDetail the error detail
    -     */
    -    public STORKSAMLEngineException(final String newErrorCode,
    -	    final String errorMessage, final String newErrorDetail) {
    -	super(errorMessage);
    -	this.errorCode = newErrorCode;
    -	this.errorDetail = newErrorDetail;
    -    }
    -
    -    /**
    -     * Gets the error code.
    -     * 
    -     * @return the error code
    -     */
    -    public final String getErrorCode() {
    -	return this.errorCode;
    -    }
    -
    -    /**
    -     * Gets the error detail.
    -     * 
    -     * @return the error detail
    -     */
    -    public final String getErrorDetail() {
    -	return errorDetail;
    -    }
    -
    -    /**
    -     * Gets the error message.
    -     * 
    -     * @return the error message
    -     */
    -    public final String getErrorMessage() {
    -	return super.getMessage();
    -    }
    -
    -
    -    /**
    -     * Gets the message.
    -     * 
    -     * @return the message of the exception.
    -     * 
    -     * @see java.lang.Throwable#getMessage()
    -     */
    -    public final String getMessage() {
    -	return "Error (no. " + errorCode + ") processing request : "
    -		+ super.getMessage();
    -    }
    -
    -    /**
    -     * Sets the error code.
    -     * 
    -     * @param newErrorCode the new error code
    -     */
    -    public final void setErrorCode(final String newErrorCode) {
    -        this.errorCode = newErrorCode;
    -    }
    -
    -    /**
    -     * Sets the error detail.
    -     * 
    -     * @param newErrorDetail the new error detail
    -     */
    -    public final void setErrorDetail(final String newErrorDetail) {
    -        this.errorDetail = newErrorDetail;
    -    }
    +	/** The Constant serialVersionUID. */
    +	private static final long serialVersionUID = -8319723167019122930L;
    +
    +	/** The error code. */
    +	private String errorCode;
    +
    +	/** The error detail. */
    +	private String errorDetail;
    +
    +	/**
    +	 * Instantiates a new sTORKSAML engine exception.
    +	 * 
    +	 * @param wrappedException
    +	 *            the wrapped exception
    +	 */
    +	public STORKSAMLEngineException(final Exception wrappedException) {
    +		super(wrappedException);
    +	}
    +
    +	/**
    +	 * Instantiates a new sTORKSAML engine exception.
    +	 * 
    +	 * @param errorMessage
    +	 *            the error message
    +	 */
    +	public STORKSAMLEngineException(final String errorMessage) {
    +		super(errorMessage);
    +	}
    +
    +	/**
    +	 * Instantiates a new sTORKSAML engine exception.
    +	 * 
    +	 * @param message
    +	 *            the message
    +	 * @param wrappedException
    +	 *            the wrapped exception
    +	 */
    +	public STORKSAMLEngineException(final String message, final Exception wrappedException) {
    +		super(message, wrappedException);
    +	}
    +
    +	/**
    +	 * Instantiates a new sTORKSAML engine exception.
    +	 * 
    +	 * @param newErrorCode
    +	 *            the error code
    +	 * @param errorMessage
    +	 *            the error message
    +	 * @param newErrorDetail
    +	 *            the error detail
    +	 */
    +	public STORKSAMLEngineException(final String newErrorCode, final String errorMessage, final String newErrorDetail) {
    +		super(errorMessage);
    +		this.errorCode = newErrorCode;
    +		this.errorDetail = newErrorDetail;
    +	}
    +
    +	/**
    +	 * Gets the error code.
    +	 * 
    +	 * @return the error code
    +	 */
    +	public final String getErrorCode() {
    +		return this.errorCode;
    +	}
    +
    +	/**
    +	 * Gets the error detail.
    +	 * 
    +	 * @return the error detail
    +	 */
    +	public final String getErrorDetail() {
    +		return errorDetail;
    +	}
    +
    +	/**
    +	 * Gets the error message.
    +	 * 
    +	 * @return the error message
    +	 */
    +	public final String getErrorMessage() {
    +		return super.getMessage();
    +	}
    +
    +	/**
    +	 * Gets the message.
    +	 * 
    +	 * @return the message of the exception.
    +	 * 
    +	 * @see java.lang.Throwable#getMessage()
    +	 */
    +	public final String getMessage() {
    +		return "Error (no. " + errorCode + ") processing request : " + super.getMessage();
    +	}
    +
    +	/**
    +	 * Sets the error code.
    +	 * 
    +	 * @param newErrorCode
    +	 *            the new error code
    +	 */
    +	public final void setErrorCode(final String newErrorCode) {
    +		this.errorCode = newErrorCode;
    +	}
    +
    +	/**
    +	 * Sets the error detail.
    +	 * 
    +	 * @param newErrorDetail
    +	 *            the new error detail
    +	 */
    +	public final void setErrorDetail(final String newErrorDetail) {
    +		this.errorDetail = newErrorDetail;
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
    index fb01fd5aa..f43c1bd78 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
    @@ -22,35 +22,38 @@ package eu.stork.peps.exceptions;
      */
     public class STORKSAMLEngineRuntimeException extends RuntimeException {
     
    -    /** The Constant serialVersionUID. */
    -    private static final long serialVersionUID = 5829810358581493517L;
    +	/** The Constant serialVersionUID. */
    +	private static final long serialVersionUID = 5829810358581493517L;
     
    -    /**
    -     * Instantiates a new sTORKSAML engine runtime exception.
    -     * 
    -     * @param wrappedException the wrapped exception
    -     */
    -    public STORKSAMLEngineRuntimeException(final Exception wrappedException) {
    -	super(wrappedException);
    -    }
    +	/**
    +	 * Instantiates a new sTORKSAML engine runtime exception.
    +	 * 
    +	 * @param wrappedException
    +	 *            the wrapped exception
    +	 */
    +	public STORKSAMLEngineRuntimeException(final Exception wrappedException) {
    +		super(wrappedException);
    +	}
     
    -    /**
    -     * Creates a new instance of application exception.
    -     * 
    -     * @param cause the exception cause.
    -     */
    -    public STORKSAMLEngineRuntimeException(final String cause) {
    -	super(cause);
    -    }
    +	/**
    +	 * Creates a new instance of application exception.
    +	 * 
    +	 * @param cause
    +	 *            the exception cause.
    +	 */
    +	public STORKSAMLEngineRuntimeException(final String cause) {
    +		super(cause);
    +	}
     
    -    /**
    -     * Instantiates a new sTORKSAML engine runtime exception.
    -     * 
    -     * @param message the message
    -     * @param wrappedException the wrapped exception
    -     */
    -    public STORKSAMLEngineRuntimeException(final String message,
    -	    final Exception wrappedException) {
    -	super(message, wrappedException);
    -    }
    +	/**
    +	 * Instantiates a new sTORKSAML engine runtime exception.
    +	 * 
    +	 * @param message
    +	 *            the message
    +	 * @param wrappedException
    +	 *            the wrapped exception
    +	 */
    +	public STORKSAMLEngineRuntimeException(final String message, final Exception wrappedException) {
    +		super(message, wrappedException);
    +	}
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java
    index eb885eea9..b421dce8c 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java
    @@ -44,130 +44,130 @@ import org.w3c.dom.Element;
      * The Class SSETestUtils.
      */
     public final class SSETestUtils {
    -    
    -    
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(SSETestUtils.class.getName());
    -    
    -    /**
    -     * Instantiates a new sSE test utils.
    -     */
    -    private SSETestUtils() {	
    -    }
    -
    -    /**
    -     * Prints the tree DOM.
    -     * 
    -     * @param samlToken the SAML token
    -     * @param isIndent the is indent
    -     * 
    -     * @return the string
    -     * @throws TransformerException the exception     
    -     */
    -    public static String printTreeDOM(final Element samlToken, final boolean isIndent) throws TransformerException {
    -	// set up a transformer
    -	final TransformerFactory transfac = TransformerFactory.newInstance();
    -	final Transformer trans = transfac.newTransformer();
    -	trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
    -	trans.setOutputProperty(OutputKeys.INDENT, String.valueOf(isIndent));
    -
    -	// create string from XML tree
    -	final StringWriter stringWriter = new StringWriter();
    -	final StreamResult result = new StreamResult(stringWriter);
    -	final DOMSource source = new DOMSource(samlToken);
    -	trans.transform(source, result);
    -	final String xmlString = stringWriter.toString();
    -
    -	return xmlString;
    -    }
    -
    -    /**
    -     * Marshall.
    -     * 
    -     * @param samlToken the SAML token
    -     * 
    -     * @return the byte[]
    -     * 
    -     * @throws MarshallingException the marshalling exception
    -     * @throws ParserConfigurationException the parser configuration exception
    -     * @throws TransformerException the transformer exception
    -     */
    -    public static byte[] marshall(final XMLObject samlToken)
    -	    throws MarshallingException, ParserConfigurationException,
    -	    TransformerException {
    -
    -	final javax.xml.parsers.DocumentBuilderFactory dbf = javax.xml.parsers.DocumentBuilderFactory
    -		.newInstance();
    -	dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
    -	dbf.setNamespaceAware(true);
    -	dbf.setIgnoringComments(true);
    -	final javax.xml.parsers.DocumentBuilder docBuild = dbf
    -		.newDocumentBuilder();
    -
    -	// Get the marshaller factory
    -	final MarshallerFactory marshallerFactory = Configuration
    -		.getMarshallerFactory();
    -
    -	// Get the Subject marshaller
    -	final Marshaller marshaller = marshallerFactory
    -		.getMarshaller(samlToken);
    -
    -	final Document doc = docBuild.newDocument();
    -
    -	// Marshall the SAML token
    -	marshaller.marshall(samlToken, doc);
    -
    -	// Obtain a byte array representation of the marshalled SAML object
    -	final DOMSource domSource = new DOMSource(doc);
    -	final StringWriter writer = new StringWriter();
    -	final StreamResult result = new StreamResult(writer);
    -	final TransformerFactory transFact = TransformerFactory.newInstance();
    -	final Transformer transformer = transFact.newTransformer();
    -	transformer.transform(domSource, result);
    -
    -	return writer.toString().getBytes();
    -    }
    -
    -    /**
    -     * Encode SAML token.
    -     * 
    -     * @param samlToken the SAML token
    -     * 
    -     * @return the string
    -     */
    -    public static String encodeSAMLToken(final byte[] samlToken) {
    -    	return new String(Base64.encode(samlToken));
    -    }
    -
    -    /**
    -     * Read stork SAML from file.
    -     * 
    -     * @param resource the resource
    -     * 
    -     * @return the byte[]
    -     * @throws IOException the exception
    -     * 
    -     */
    -    public static byte[] readStorkSamlFromFile(final String resource)
    -	    throws IOException {
    -	InputStream inputStream = null;
    -	byte[] bytes;
    -	
    -	try {
    -	    inputStream = StorkAuthRequestTest.class
    -		.getResourceAsStream(resource);
    -	
    -	    // Create the byte array to hold the data
    -	    bytes = new byte[(int) inputStream.available()];
    -	    inputStream.read(bytes);
    -	} catch (IOException e) {	    
    -	    LOG.error("Error read from file: " + resource);
    -	    throw e;
    -	} finally {
    -	    IOUtils.closeQuietly(inputStream);
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(SSETestUtils.class.getName());
    +
    +	/**
    +	 * Instantiates a new sSE test utils.
    +	 */
    +	private SSETestUtils() {
    +	}
    +
    +	/**
    +	 * Prints the tree DOM.
    +	 * 
    +	 * @param samlToken
    +	 *            the SAML token
    +	 * @param isIndent
    +	 *            the is indent
    +	 * 
    +	 * @return the string
    +	 * @throws TransformerException
    +	 *             the exception
    +	 */
    +	public static String printTreeDOM(final Element samlToken, final boolean isIndent) throws TransformerException {
    +		// set up a transformer
    +		final TransformerFactory transfac = TransformerFactory.newInstance();
    +		final Transformer trans = transfac.newTransformer();
    +		trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
    +		trans.setOutputProperty(OutputKeys.INDENT, String.valueOf(isIndent));
    +
    +		// create string from XML tree
    +		final StringWriter stringWriter = new StringWriter();
    +		final StreamResult result = new StreamResult(stringWriter);
    +		final DOMSource source = new DOMSource(samlToken);
    +		trans.transform(source, result);
    +		final String xmlString = stringWriter.toString();
    +
    +		return xmlString;
    +	}
    +
    +	/**
    +	 * Marshall.
    +	 * 
    +	 * @param samlToken
    +	 *            the SAML token
    +	 * 
    +	 * @return the byte[]
    +	 * 
    +	 * @throws MarshallingException
    +	 *             the marshalling exception
    +	 * @throws ParserConfigurationException
    +	 *             the parser configuration exception
    +	 * @throws TransformerException
    +	 *             the transformer exception
    +	 */
    +	public static byte[] marshall(final XMLObject samlToken) throws MarshallingException, ParserConfigurationException, TransformerException {
    +
    +		final javax.xml.parsers.DocumentBuilderFactory dbf = javax.xml.parsers.DocumentBuilderFactory.newInstance();
    +		dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
    +		dbf.setNamespaceAware(true);
    +		dbf.setIgnoringComments(true);
    +		final javax.xml.parsers.DocumentBuilder docBuild = dbf.newDocumentBuilder();
    +
    +		// Get the marshaller factory
    +		final MarshallerFactory marshallerFactory = Configuration.getMarshallerFactory();
    +
    +		// Get the Subject marshaller
    +		final Marshaller marshaller = marshallerFactory.getMarshaller(samlToken);
    +
    +		final Document doc = docBuild.newDocument();
    +
    +		// Marshall the SAML token
    +		marshaller.marshall(samlToken, doc);
    +
    +		// Obtain a byte array representation of the marshalled SAML object
    +		final DOMSource domSource = new DOMSource(doc);
    +		final StringWriter writer = new StringWriter();
    +		final StreamResult result = new StreamResult(writer);
    +		final TransformerFactory transFact = TransformerFactory.newInstance();
    +		final Transformer transformer = transFact.newTransformer();
    +		transformer.transform(domSource, result);
    +
    +		return writer.toString().getBytes();
    +	}
    +
    +	/**
    +	 * Encode SAML token.
    +	 * 
    +	 * @param samlToken
    +	 *            the SAML token
    +	 * 
    +	 * @return the string
    +	 */
    +	public static String encodeSAMLToken(final byte[] samlToken) {
    +		return new String(Base64.encode(samlToken));
     	}
    -	return bytes;
     
    -    }
    +	/**
    +	 * Read stork SAML from file.
    +	 * 
    +	 * @param resource
    +	 *            the resource
    +	 * 
    +	 * @return the byte[]
    +	 * @throws IOException
    +	 *             the exception
    +	 * 
    +	 */
    +	public static byte[] readStorkSamlFromFile(final String resource) throws IOException {
    +		InputStream inputStream = null;
    +		byte[] bytes;
    +
    +		try {
    +			inputStream = StorkAuthRequestTest.class.getResourceAsStream(resource);
    +
    +			// Create the byte array to hold the data
    +			bytes = new byte[(int) inputStream.available()];
    +			inputStream.read(bytes);
    +		} catch (IOException e) {
    +			LOG.error("Error read from file: " + resource);
    +			throw e;
    +		} finally {
    +			IOUtils.closeQuietly(inputStream);
    +		}
    +		return bytes;
    +
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java
    index c52b8a779..bdb8780c3 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java
    @@ -22,43 +22,42 @@ import junit.framework.TestCase;
     import eu.stork.peps.auth.engine.STORKSAMLEngine;
     
     /**
    - * The Class SimpleBaseTest. Defines a set of test the initialization of the
    - * SAML engine.
    + * The Class SimpleBaseTest. Defines a set of test the initialization of the SAML engine.
      */
     @SuppressWarnings("deprecation")
     public class SimpleBaseTest extends TestCase {
     
    -    /**
    -     * Test SAML engine correct configuration name.
    -     */
    -    
    +	/**
    +	 * Test SAML engine correct configuration name.
    +	 */
    +
     	@Test
    -    public final void testSamlEngineCorrectInit() {
    -	Assert.assertNotNull(STORKSAMLEngine.getInstance("CONF1"));
    -    }
    +	public final void testSamlEngineCorrectInit() {
    +		Assert.assertNotNull(STORKSAMLEngine.getInstance("CONF1"));
    +	}
     
    -    /**
    -     * Test SAML engine error configuration name.
    -     */
    -    @Test
    -    public final void testSamlEngineErrorNameConf() {
    -	Assert.assertNull(STORKSAMLEngine.getInstance("CONF_ERROR"));
    -    }
    +	/**
    +	 * Test SAML engine error configuration name.
    +	 */
    +	@Test
    +	public final void testSamlEngineErrorNameConf() {
    +		Assert.assertNull(STORKSAMLEngine.getInstance("CONF_ERROR"));
    +	}
     
    -    /**
    -     * Test SAML engine error name null.
    -     */
    -    @Test
    -    public final void testSamlEngineErrorNameNull() {	
    -	Assert.assertNull(STORKSAMLEngine.getInstance(null));
    -    }
    +	/**
    +	 * Test SAML engine error name null.
    +	 */
    +	@Test
    +	public final void testSamlEngineErrorNameNull() {
    +		Assert.assertNull(STORKSAMLEngine.getInstance(null));
    +	}
    +
    +	/**
    +	 * Test SAML engine correct name configuration with spaces.
    +	 */
    +	@Test
    +	public final void testSamlEngineErrorNameSpaces() {
    +		Assert.assertNotNull(STORKSAMLEngine.getInstance("   CONF1    "));
    +	}
     
    -    /**
    -     * Test SAML engine correct name configuration with spaces.
    -     */
    -    @Test
    -    public final void testSamlEngineErrorNameSpaces() {
    -	Assert.assertNotNull(STORKSAMLEngine.getInstance("   CONF1    "));
    -    }
    -    
     }
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
    index 0eda1bfbf..502e0e461 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
    @@ -20,845 +20,821 @@ import eu.stork.peps.auth.engine.STORKSAMLEngine;
     import eu.stork.peps.exceptions.STORKSAMLEngineException;
     
     public class StorkAttrQueryRequestTest {
    -	
    -	/** The engines. */	
    -    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    -    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    -    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
    -    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    -            
    -
    -    /**
    -     * Instantiates a new stork authentication request test.
    -     */
    -    public StorkAttrQueryRequestTest() {
    -	pal = new PersonalAttributeList();
    -
    -	final PersonalAttribute isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(true);
    -	final ArrayList ages = new ArrayList();
    -	ages.add("16");
    -	ages.add("18");
    -	isAgeOver.setValue(ages);
    -	pal.add(isAgeOver);
    -	
    -	final PersonalAttribute dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	pal.add(dateOfBirth);
    -	
    -		final PersonalAttribute eIDNumber = new PersonalAttribute();	
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -	eIDNumber.setValue(Arrays.asList("ES/IS/1234567890"));
    -	pal.add(eIDNumber);
    -	
    -	final PersonalAttribute givenName = new PersonalAttribute();
    -	givenName.setName("givenName");
    -	givenName.setIsRequired(true);
    -	givenName.setValue(Arrays.asList("Sveinbjorn"));
    -	pal.add(givenName);
    -
    -	destination = "http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest";
    -	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    -	//spName = "University of Oxford";
    -	spSector = "EDU001";
    -	spInstitution = "OXF001";
    -	spApplication = "APP001";
    -	spCountry = "IS";
    -	
    -	spId = "EDU001-OXF001-APP001";
    -	
    -    }
    -
    -    /** The destination. */
    -    private String destination;
    -
    -    /** The service provider sector. */
    -    private String spSector;
    -
    -    /** The service provider institution. */
    -    private String spInstitution;
    -
    -    /** The service provider application. */
    -    private String spApplication;
    -
    -    /** The service provider country. */
    -    private String spCountry;
    -    
    -    /** The service provider id. */
    -    private String spId;
    -    
    -    /** The assertion consumer URL. */
    -    private String assertConsumerUrl;
    -
    -    /** The quality authentication assurance level. */
    -    private static final int QAAL = 3;
    -
    -    /** The List of Personal Attributes. */
    -    private IPersonalAttributeList pal;
    -
    -    /** The attribute query request. */
    -    private static byte[] attrRequest;
    -
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(StorkAttrQueryRequestTest.class.getName());
    -
    -    /** Parser manager used to parse XML. */
    -    private static BasicParserPool parser;
    -
    -    static {
    -	parser = new BasicParserPool();
    -	parser.setNamespaceAware(true);
    -    }
    -    
    -    /**
    -     * Test generate authentication request.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequest() throws STORKSAMLEngineException {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -
    -	// new parameters
    -	request.setEIDSectorShare(false);	
    -	request.setEIDCrossSectorShare(false);
    -	request.setEIDCrossBorderShare(false);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	request.setSpCountry(spCountry);
    -
    -	STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
    -	byte[] reqByte = req1.getTokenSaml();
    -	FileOutputStream output = null;
    -	
    -	try {
    -		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml"));
    -	} catch (FileNotFoundException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    +
    +	/** The engines. */
    +	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    +	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    +	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
    +	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    +
    +	/**
    +	 * Instantiates a new stork authentication request test.
    +	 */
    +	public StorkAttrQueryRequestTest() {
    +		pal = new PersonalAttributeList();
    +
    +		final PersonalAttribute isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(true);
    +		final ArrayList ages = new ArrayList();
    +		ages.add("16");
    +		ages.add("18");
    +		isAgeOver.setValue(ages);
    +		pal.add(isAgeOver);
    +
    +		final PersonalAttribute dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		pal.add(dateOfBirth);
    +
    +		final PersonalAttribute eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +		eIDNumber.setValue(Arrays.asList("ES/IS/1234567890"));
    +		pal.add(eIDNumber);
    +
    +		final PersonalAttribute givenName = new PersonalAttribute();
    +		givenName.setName("givenName");
    +		givenName.setIsRequired(true);
    +		givenName.setValue(Arrays.asList("Sveinbjorn"));
    +		pal.add(givenName);
    +
    +		destination = "http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest";
    +		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    +		// spName = "University of Oxford";
    +		spSector = "EDU001";
    +		spInstitution = "OXF001";
    +		spApplication = "APP001";
    +		spCountry = "IS";
    +
    +		spId = "EDU001-OXF001-APP001";
    +
     	}
    -	try {
    -		output.write(reqByte);
    -	} catch (IOException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    +
    +	/** The destination. */
    +	private String destination;
    +
    +	/** The service provider sector. */
    +	private String spSector;
    +
    +	/** The service provider institution. */
    +	private String spInstitution;
    +
    +	/** The service provider application. */
    +	private String spApplication;
    +
    +	/** The service provider country. */
    +	private String spCountry;
    +
    +	/** The service provider id. */
    +	private String spId;
    +
    +	/** The assertion consumer URL. */
    +	private String assertConsumerUrl;
    +
    +	/** The quality authentication assurance level. */
    +	private static final int QAAL = 3;
    +
    +	/** The List of Personal Attributes. */
    +	private IPersonalAttributeList pal;
    +
    +	/** The attribute query request. */
    +	private static byte[] attrRequest;
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(StorkAttrQueryRequestTest.class.getName());
    +
    +	/** Parser manager used to parse XML. */
    +	private static BasicParserPool parser;
    +
    +	static {
    +		parser = new BasicParserPool();
    +		parser.setNamespaceAware(true);
     	}
    -	
    -	LOG.info("STORKAttrQueryRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
    -	
    -	request.setCitizenCountryCode("IS");
    -	LOG.info("STORKAttrQueryRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
    -    }
    -    
    -    /**
    -     * Test generate authentication request error personal attribute name error.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestPALsErr1() {
    -	
    -	final IPersonalAttributeList palWrong = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("attrNotValid");
    -	worngAttr.setIsRequired(true);
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(palWrong);
    -
    -	// news parameters
    -	request.setEIDSectorShare(false);	
    -	request.setEIDCrossSectorShare(false);
    -	request.setEIDCrossBorderShare(false);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequest() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +
    +		// new parameters
    +		request.setEIDSectorShare(false);
    +		request.setEIDCrossSectorShare(false);
    +		request.setEIDCrossBorderShare(false);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +		request.setSpCountry(spCountry);
    +
    +		STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
    +		byte[] reqByte = req1.getTokenSaml();
    +		FileOutputStream output = null;
    +
    +		try {
    +			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml"));
    +		} catch (FileNotFoundException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +		try {
    +			output.write(reqByte);
    +		} catch (IOException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +
    +		LOG.info("STORKAttrQueryRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
    +
    +		request.setCitizenCountryCode("IS");
    +		LOG.info("STORKAttrQueryRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
     	}
    -    }
    -    
    -    
    -    
    -    /**
    -     * Test generate authentication request error personal attribute value error.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestPALsErr2() {
    -	
    -	final IPersonalAttributeList palWrong = new PersonalAttributeList();
    -
    -	final PersonalAttribute attrNotValid = new PersonalAttribute();
    -	attrNotValid.setName("attrNotValid");
    -	attrNotValid.setIsRequired(true);
    -	palWrong.add(attrNotValid);
    -
    -
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(palWrong);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request error personal attribute name error.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestPALsErr1() {
    +
    +		final IPersonalAttributeList palWrong = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("attrNotValid");
    +		worngAttr.setIsRequired(true);
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(palWrong);
    +
    +		// news parameters
    +		request.setEIDSectorShare(false);
    +		request.setEIDCrossSectorShare(false);
    +		request.setEIDCrossBorderShare(false);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request authentication assurance level
    -     * negative value.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestQaalErr1() {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(-1);
    -	request.setPersonalAttributeList(pal);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request error personal attribute value error.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestPALsErr2() {
    +
    +		final IPersonalAttributeList palWrong = new PersonalAttributeList();
    +
    +		final PersonalAttribute attrNotValid = new PersonalAttribute();
    +		attrNotValid.setName("attrNotValid");
    +		attrNotValid.setIsRequired(true);
    +		palWrong.add(attrNotValid);
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(palWrong);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider sector null.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestSectorErr() {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(null);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
     
    +	/**
    +	 * Test generate authentication request authentication assurance level negative value.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestQaalErr1() {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(-1);
    +		request.setPersonalAttributeList(pal);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider institution null.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestDestinationErr() {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(null);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(null);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    fail("generateSTORKAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");	    
    +
    +	/**
    +	 * Test generate authentication request service provider sector null.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestSectorErr() {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(null);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider application null.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestApplicationErr() {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(null);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +	/**
    +	 * Test generate authentication request service provider institution null.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestDestinationErr() {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(null);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(null);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +			fail("generateSTORKAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider country null.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestCountryErr() {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(null);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");	    
    +
    +	/**
    +	 * Test generate authentication request service provider application null.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestApplicationErr() {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(null);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		}
    +	}
    +
    +	/**
    +	 * Test generate authentication request service provider country null.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestCountryErr() {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(null);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request error with quality authentication
    -     * assurance level wrong.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestQaalErr2() {
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(0);
    -	request.setPersonalAttributeList(pal);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request error with quality authentication assurance level wrong.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestQaalErr2() {
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(0);
    +		request.setPersonalAttributeList(pal);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test generate authentication request personal attribute list null value.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestPALErr1() {
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(null);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			engine.generateSTORKAttrQueryRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request null parameter.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryRequestNullParam() throws STORKSAMLEngineException {
    +		try {
    +			engine.validateSTORKAttrQueryRequest(null);
    +			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request error bytes encode.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryRequestErrorEncode() throws STORKSAMLEngineException {
    +		try {
    +			engine.validateSTORKAttrQueryRequest("messageError".getBytes());
    +			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryRequest() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		attrRequest = engine.generateSTORKAttrQueryRequest(request).getTokenSaml();
    +
    +		final STORKAttrQueryRequest validatedRequest = engine.validateSTORKAttrQueryRequest(attrRequest);
    +
    +		assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
    +		assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(), false);
    +		assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
    +
    +	}
    +
    +	/**
    +	 * Test validate data authenticate request. Verified parameters after validation.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateDataAttrQueryRequest() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryRequest request = engine.validateSTORKAttrQueryRequest(attrRequest);
    +
    +		assertEquals("Sestination incorrect: ", request.getDestination(), destination);
    +
    +		assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
    +		assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
    +		assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);
    +
    +		assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
    +		assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);
    +		assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
    +		assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
    +		assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), null);
    +
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request personal attribute list null value.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestPALErr1() {
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(null);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    engine.generateSTORKAttrQueryRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate file attribute query request. Validate from XML file.
    +	 * 
    +	 * @throws Exception
    +	 *             the exception
    +	 */
    +	@Test
    +	public final void testValidateFileAttrQueryRequest() throws Exception {
    +
    +		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequest1.xml");
    +
    +		try {
    +			engine.validateSTORKAttrQueryRequest(bytes);
    +			fail("testValidateFileAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error(e.getMessage());
    +		}
     	}
    -    }
    -   
    -    /**
    -     * Test validate authentication request null parameter.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryRequestNullParam()
    -	    throws STORKSAMLEngineException {
    -	try {
    -	    engine.validateSTORKAttrQueryRequest(null);
    -	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate file authentication request tag delete.
    +	 * 
    +	 * @throws Exception
    +	 *             the exception
    +	 */
    +	@Test
    +	public final void testValidateFileAttrRequestTagDelete() throws Exception {
    +
    +		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml");
    +
    +		try {
    +			engine.validateSTORKAttrQueryRequest(bytes);
    +			fail("validateSTORKAttrQueryRequest(...) should have thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error(e.getMessage());
    +
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication request error bytes encode.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryRequestErrorEncode()
    -	    throws STORKSAMLEngineException {
    -	try {
    -	    engine.validateSTORKAttrQueryRequest("messageError".getBytes());
    -	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication request not trusted token.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryRequestNotTrustedErr1() throws STORKSAMLEngineException {
    +
    +		try {
    +			final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine.getInstance("CONF2");
    +
    +			final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +			request.setDestination(destination);
    +			request.setQaa(QAAL);
    +			request.setPersonalAttributeList(pal);
    +			request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +			// news parameters
    +			request.setSpSector(spSector);
    +			request.setSpInstitution(spInstitution);
    +			request.setSpApplication(spApplication);
    +			request.setSpCountry(spCountry);
    +
    +			final byte[] authReqNotTrust = engineNotTrusted.generateSTORKAttrQueryRequest(request).getTokenSaml();
    +
    +			engine.validateSTORKAttrQueryRequest(authReqNotTrust);
    +			fail("validateSTORKAttrQueryRequestNotTrusted(...) should have thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication request.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryRequest() throws STORKSAMLEngineException {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	
    -	attrRequest = engine.generateSTORKAttrQueryRequest(request).getTokenSaml();
    -	
    -	final STORKAttrQueryRequest validatedRequest = engine.validateSTORKAttrQueryRequest(attrRequest);	 
    -		
    -	assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
    -	assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(),	false);
    -	assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
    -	
    -    }
    -
    -    /**
    -     * Test validate data authenticate request. Verified parameters after
    -     * validation.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateDataAttrQueryRequest() throws STORKSAMLEngineException {
    -    	
    -    final STORKAttrQueryRequest request = engine.validateSTORKAttrQueryRequest(attrRequest);
    -
    -	assertEquals("Sestination incorrect: ", request.getDestination(), destination);
    -	
    -	assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
    -	assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
    -	assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);	
    -
    -	assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
    -	assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);		
    -	assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
    -	assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
    -	assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), null);
    -		
    -    }
    -
    -    /**
    -     * Test validate file attribute query request. Validate from XML file.
    -     *     
    -     * @throws Exception the exception
    -     */
    -    @Test
    -    public final void testValidateFileAttrQueryRequest() throws Exception {
    -
    -	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequest1.xml");
    -
    -	try {
    -	    engine.validateSTORKAttrQueryRequest(bytes);
    -        fail("testValidateFileAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error(e.getMessage());
    +
    +	/**
    +	 * Test validate authentication request trusted.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryRequestTrusted() throws STORKSAMLEngineException {
    +
    +		final STORKSAMLEngine engineTrusted = STORKSAMLEngine.getInstance("CONF3");
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		final byte[] authReqNotTrust = engineTrusted.generateSTORKAttrQueryRequest(request).getTokenSaml();
    +
    +		// engine ("CONF1") no have trust certificate from "CONF2"
    +		engine.validateSTORKAttrQueryRequest(authReqNotTrust);
    +
     	}
    -    }
     
    -    /**
    -     * Test validate file authentication request tag delete.
    -     * 
    -     * @throws Exception the exception
    -     */
    -    @Test
    -    public final void testValidateFileAttrRequestTagDelete() throws Exception {
    +	/**
    +	 * Test generate authentication request service provider application null.
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestNADA() {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +
    +		// news parameters
    +		request.setSpSector(null);
    +		request.setSpInstitution(null);
    +		request.setSpApplication(null);
    +		request.setSpCountry(null);
     
    -	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml");
    +		try {
     
    -	try {
    -	    engine.validateSTORKAttrQueryRequest(bytes);
    -        fail("validateSTORKAttrQueryRequest(...) should have thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error(e.getMessage());
    +			engine.validateSTORKAttrQueryRequest(attrRequest);
     
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication request not trusted token.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryRequestNotTrustedErr1()
    -	    throws STORKSAMLEngineException {
    -	
    -	try {
    -	    final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine
    -		    .getInstance("CONF2");
    -
    -	    final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	    request.setDestination(destination);
    -	    request.setQaa(QAAL);
    -	    request.setPersonalAttributeList(pal);
    -	    request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	    // news parameters
    -	    request.setSpSector(spSector);
    -	    request.setSpInstitution(spInstitution);
    -	    request.setSpApplication(spApplication);
    -	    request.setSpCountry(spCountry);
    -
    -	    final byte[] authReqNotTrust = engineNotTrusted
    -		    .generateSTORKAttrQueryRequest(request).getTokenSaml();
    -
    -	    engine.validateSTORKAttrQueryRequest(authReqNotTrust);
    -	    fail("validateSTORKAttrQueryRequestNotTrusted(...) should have thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");        
    -    }
    -    }
    -
    -    /**
    -     * Test validate authentication request trusted.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryRequestTrusted()
    -	    throws STORKSAMLEngineException {
    -
    -	final STORKSAMLEngine engineTrusted = STORKSAMLEngine
    -		.getInstance("CONF3");
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	final byte[] authReqNotTrust = engineTrusted.generateSTORKAttrQueryRequest(
    -		request).getTokenSaml();
    -
    -	// engine ("CONF1") no have trust certificate from "CONF2"
    -	engine.validateSTORKAttrQueryRequest(authReqNotTrust);
    -	
    -    }
    -    
    -    
    -    
    -    
    -    /**
    -     * Test generate authentication request service provider application null.
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestNADA() {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -
    -	// news parameters
    -	request.setSpSector(null);
    -	request.setSpInstitution(null);
    -	request.setSpApplication(null);
    -	request.setSpCountry(null);
    -
    -	try {
    -	       	
    -		engine.validateSTORKAttrQueryRequest(attrRequest);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +	/**
    +	 * Test validate authentication request with unknown elements.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryRequestWithUnknownElements() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +
    +		IPersonalAttributeList pAttList = new PersonalAttributeList();
    +
    +		final PersonalAttribute unknown = new PersonalAttribute();
    +		unknown.setName("unknown");
    +		unknown.setIsRequired(true);
    +		pAttList.add(unknown);
    +
    +		final PersonalAttribute eIdentifier = new PersonalAttribute();
    +		eIdentifier.setName("eIdentifier");
    +		eIdentifier.setIsRequired(true);
    +		pAttList.add(eIdentifier);
    +
    +		request.setPersonalAttributeList(pAttList);
    +
    +		// new parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		STORKAttrQueryRequest req = new STORKAttrQueryRequest();
    +
    +		req = engine3.generateSTORKAttrQueryRequest(request);
    +
    +		req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml());
    +
    +		assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
    +		assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
    +
     	}
    -    }
    -    
    -    /**
    -     * Test validate authentication request with unknown elements.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryRequestWithUnknownElements() throws STORKSAMLEngineException {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	
    -	IPersonalAttributeList pAttList = new PersonalAttributeList();
    -		
    -	final PersonalAttribute unknown = new PersonalAttribute();
    -	unknown.setName("unknown");
    -	unknown.setIsRequired(true);
    -	pAttList.add(unknown);	
    -	
    -	final PersonalAttribute eIdentifier = new PersonalAttribute();
    -	eIdentifier.setName("eIdentifier");
    -	eIdentifier.setIsRequired(true);
    -	pAttList.add(eIdentifier);	
    -	
    -	request.setPersonalAttributeList(pAttList);
    -
    -	// new parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	
    -	STORKAttrQueryRequest req = new STORKAttrQueryRequest();
    -		
    -	req  = engine3.generateSTORKAttrQueryRequest(request);
    -	
    -	req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml());
    -	
    -	assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
    -	assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
    -	
    -    }
    -    
    -    /**
    -     * Test generate Request with required elements by default
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	
    -	IPersonalAttributeList pAttList = new PersonalAttributeList();
    -		
    -	final PersonalAttribute eIdentifier = new PersonalAttribute();
    -	eIdentifier.setName("eIdentifier");
    -	eIdentifier.setIsRequired(true);
    -	pAttList.add(eIdentifier);	
    -	
    -	request.setPersonalAttributeList(pAttList);
    -
    -	// new parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	
    -	STORKAttrQueryRequest req = new STORKAttrQueryRequest();
    -	STORKAttrQueryRequest reqTrue = new STORKAttrQueryRequest();
    -	STORKAttrQueryRequest reqFalse = new STORKAttrQueryRequest();
    -		
    -	reqTrue  = engine.generateSTORKAttrQueryRequest(request);
    -	reqFalse = engine2.generateSTORKAttrQueryRequest(request);
    -	req  	 = engine3.generateSTORKAttrQueryRequest(request);
    -	
    -	
    -	String token = new String(req.getTokenSaml());
    -	String reqTrueToken = new String(reqTrue.getTokenSaml());
    -	String reqFalseToken = new String(reqFalse.getTokenSaml());
    -	
    -	assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
    -	assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
    -	assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
    -		
    -    }
    -    
    -    /**
    -     * Test validating attribute query and getting alias used to save 
    -     * the saml trusted certificate into trustore
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    /*@Test
    -    public final void testValidateAtrrQueryRequestGettingItsAlias() throws STORKSAMLEngineException {
    -
    -    	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -    	request.setDestination(destination);
    -    	request.setQaa(QAAL);
    -    	request.setPersonalAttributeList(pal);
    -    	
    -    	IPersonalAttributeList pAttList = new PersonalAttributeList();
    -    		
    -    	final PersonalAttribute eIdentifier = new PersonalAttribute();
    -    	eIdentifier.setName("eIdentifier");
    -    	eIdentifier.setIsRequired(true);
    -    	pAttList.add(eIdentifier);	
    -    	
    -    	request.setPersonalAttributeList(pAttList);
    -
    -    	// new parameters
    -    	request.setSpSector(spSector);
    -    	request.setSpInstitution(spInstitution);
    -    	request.setSpApplication(spApplication);
    -    	request.setSpCountry(spCountry);
    -    	request.setSPID(spId);
    -    	request.setCitizenCountryCode("IS");
    -    	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -    	
    -    	STORKAttrQueryRequest req = new STORKAttrQueryRequest();
    -    		
    -    	req  = engine3.generateSTORKAttrQueryRequest(request);
    -    	req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml());
    -    	String prufa = req.getAlias();
    -    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo"));
    -    	
    -    	req  = engine2.generateSTORKAttrQueryRequest(request);
    -    	req = engine2.validateSTORKAttrQueryRequest(req.getTokenSaml());
    -    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo2"));	
    -    }*/
    -    
    -    @Test
    -    public final void testGenerateAttrQueryRequestSignDoc() throws STORKSAMLEngineException {
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -
    -	request.setDestination(destination);
    -	request.setQaa(QAAL);
    -	PersonalAttributeList pal0 = new PersonalAttributeList();
    -	
    -	final PersonalAttribute signDoc = new PersonalAttribute();	
    -	signDoc.setName("docRequest");
    -	signDoc.setIsRequired(true);
    -	signDoc.setValue(Arrays.asList("IS/IS/fbea6e68-0393-401b-b616-f767fff9418c"));
    -	pal0.add(signDoc);
    -	
    -	request.setPersonalAttributeList(pal0);
    -
    -	// new parameters
    -	/*request.setEIDSectorShare(false);	
    -	request.setEIDCrossSectorShare(false);
    -	request.setEIDCrossBorderShare(false);*/
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	request.setSpCountry(spCountry);
    -
    -	STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
    -	byte[] reqByte = req1.getTokenSaml();
    -	FileOutputStream output = null;
    -	
    -	STORKAttrQueryRequest req2 = engine0.validateSTORKAttrQueryRequest(reqByte);
    -	//reqByte = req2.getTokenSaml();
    -	
    -	try {
    -		//output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml"));
    -		FileOutputStream fos;
    -        File outputDir = new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine");
    -        File saveFile = new File(outputDir, "AttrQueryRequestSdoc.xml");
    -        fos = new FileOutputStream(saveFile);
    -        fos.write(reqByte);
    -        fos.flush();
    -        fos.close();
    -	} catch (Exception e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    +
    +	/**
    +	 * Test generate Request with required elements by default
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +
    +		IPersonalAttributeList pAttList = new PersonalAttributeList();
    +
    +		final PersonalAttribute eIdentifier = new PersonalAttribute();
    +		eIdentifier.setName("eIdentifier");
    +		eIdentifier.setIsRequired(true);
    +		pAttList.add(eIdentifier);
    +
    +		request.setPersonalAttributeList(pAttList);
    +
    +		// new parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		STORKAttrQueryRequest req = new STORKAttrQueryRequest();
    +		STORKAttrQueryRequest reqTrue = new STORKAttrQueryRequest();
    +		STORKAttrQueryRequest reqFalse = new STORKAttrQueryRequest();
    +
    +		reqTrue = engine.generateSTORKAttrQueryRequest(request);
    +		reqFalse = engine2.generateSTORKAttrQueryRequest(request);
    +		req = engine3.generateSTORKAttrQueryRequest(request);
    +
    +		String token = new String(req.getTokenSaml());
    +		String reqTrueToken = new String(reqTrue.getTokenSaml());
    +		String reqFalseToken = new String(reqFalse.getTokenSaml());
    +
    +		assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
    +		assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
    +		assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
    +
     	}
    -	try {
    -		output.write(reqByte);
    -	} catch (IOException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    +
    +	/**
    +	 * Test validating attribute query and getting alias used to save the saml trusted certificate into trustore
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	/*
    +	 * @Test public final void testValidateAtrrQueryRequestGettingItsAlias() throws STORKSAMLEngineException {
    +	 * 
    +	 * final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +	 * 
    +	 * request.setDestination(destination); request.setQaa(QAAL); request.setPersonalAttributeList(pal);
    +	 * 
    +	 * IPersonalAttributeList pAttList = new PersonalAttributeList();
    +	 * 
    +	 * final PersonalAttribute eIdentifier = new PersonalAttribute(); eIdentifier.setName("eIdentifier"); eIdentifier.setIsRequired(true); pAttList.add(eIdentifier);
    +	 * 
    +	 * request.setPersonalAttributeList(pAttList);
    +	 * 
    +	 * // new parameters request.setSpSector(spSector); request.setSpInstitution(spInstitution); request.setSpApplication(spApplication); request.setSpCountry(spCountry); request.setSPID(spId);
    +	 * request.setCitizenCountryCode("IS"); request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +	 * 
    +	 * STORKAttrQueryRequest req = new STORKAttrQueryRequest();
    +	 * 
    +	 * req = engine3.generateSTORKAttrQueryRequest(request); req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml()); String prufa = req.getAlias();
    +	 * assertTrue("The alias should match this value", req.getAlias().equals("local-demo"));
    +	 * 
    +	 * req = engine2.generateSTORKAttrQueryRequest(request); req = engine2.validateSTORKAttrQueryRequest(req.getTokenSaml()); assertTrue("The alias should match this value",
    +	 * req.getAlias().equals("local-demo2")); }
    +	 */
    +
    +	@Test
    +	public final void testGenerateAttrQueryRequestSignDoc() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +
    +		request.setDestination(destination);
    +		request.setQaa(QAAL);
    +		PersonalAttributeList pal0 = new PersonalAttributeList();
    +
    +		final PersonalAttribute signDoc = new PersonalAttribute();
    +		signDoc.setName("docRequest");
    +		signDoc.setIsRequired(true);
    +		signDoc.setValue(Arrays.asList("IS/IS/fbea6e68-0393-401b-b616-f767fff9418c"));
    +		pal0.add(signDoc);
    +
    +		request.setPersonalAttributeList(pal0);
    +
    +		// new parameters
    +		/*
    +		 * request.setEIDSectorShare(false); request.setEIDCrossSectorShare(false); request.setEIDCrossBorderShare(false);
    +		 */
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +		request.setSpCountry(spCountry);
    +
    +		STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
    +		byte[] reqByte = req1.getTokenSaml();
    +		FileOutputStream output = null;
    +
    +		STORKAttrQueryRequest req2 = engine0.validateSTORKAttrQueryRequest(reqByte);
    +		// reqByte = req2.getTokenSaml();
    +
    +		try {
    +			// output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml"));
    +			FileOutputStream fos;
    +			File outputDir = new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine");
    +			File saveFile = new File(outputDir, "AttrQueryRequestSdoc.xml");
    +			fos = new FileOutputStream(saveFile);
    +			fos.write(reqByte);
    +			fos.flush();
    +			fos.close();
    +		} catch (Exception e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +		try {
    +			output.write(reqByte);
    +		} catch (IOException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +
    +		LOG.info("STORKAttrQueryRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
    +
    +		request.setCitizenCountryCode("IS");
    +		LOG.info("STORKAttrQueryRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
     	}
    -	
    -	LOG.info("STORKAttrQueryRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
    -	
    -	request.setCitizenCountryCode("IS");
    -	LOG.info("STORKAttrQueryRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
    -    }
    -    
    +
     }
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java
    index a98d5b7c3..0ecca1eab 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java
    @@ -36,842 +36,763 @@ import eu.stork.peps.auth.engine.STORKSAMLEngine;
     import eu.stork.peps.exceptions.STORKSAMLEngineException;
     
     public class StorkAttrQueryResponseTest {
    -	
    +
     	/** The engine. */
    -    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    -
    -    /**
    -     * Gets the engine.
    -     * 
    -     * @return the engine
    -     */
    -    public static STORKSAMLEngine getEngine() {
    -        return engine;
    -    }
    -
    -    /**
    -     * Sets the engine.
    -     * 
    -     * @param newEngine the new engine
    -     */
    -    public static void setEngine(final STORKSAMLEngine newEngine) {
    -    	StorkAttrQueryResponseTest.engine = newEngine;
    -    }
    -
    -    /** The destination. */
    -    private static String destination;
    -
    -        /** The service provider sector. */
    -    private static String spSector;
    -
    -    /** The service provider institution. */
    -    private static String spInstitution;
    -
    -    /** The service provider application. */
    -    private static String spApplication;
    -
    -    /** The service provider country. */
    -    private static String spCountry;
    -    
    -    /** The service provider id. */
    -    private static String spId;
    -
    -    /** The quality authentication assurance level. */
    -    private static final int QAAL = 3;
    -
    -    /** The state. */
    -    private static String state = "IS";
    -    
    -    /** The town. */
    -    private static String town = "Reykjavik";
    -    
    -    /** The postal code. */
    -    private static String postalCode = "105";
    -    
    -    /** The street name. */
    -    private static String streetName = "Gudrunartun";
    -    
    -    /** The street number. */
    -    private static String streetNumber = "10";    
    -
    -    /** The List of Personal Attributes. */
    -    private static IPersonalAttributeList pal;
    -
    -    /** The assertion consumer URL. */
    -    private static String assertConsumerUrl;
    -
    -    /** The attribute query request. */
    -    private static byte[] attrQueryRequest;
    -
    -    /** The attribute query response. */
    -    private static byte[] attrQueryResponse;
    -
    -    /** The attribute query request. */
    -    private static STORKAttrQueryRequest attrQueryenRequest;
    -
    -    /** The attribute query response. */
    -    private static STORKAttrQueryResponse attrQeuryenResponse;
    -
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(StorkAttrQueryResponseTest.class.getName());
    -
    -    /**
    -     * Instantiates a new stork response test.
    -     */
    -    public StorkAttrQueryResponseTest() {
    -	super();
    -    }
    -
    -    /** The IP address. */
    -    private static String ipAddress;
    -    
    -    /** The destination URL. */
    -    private static String destinationUrl;
    -
    -    /** The is hashing. */
    -    private final boolean isHashing = Boolean.TRUE;
    -
    -    /** The is not hashing. */
    -    private final boolean isNotHashing = Boolean.FALSE;
    -
    -    /** The ERROR text. */
    -    private static final String ERROR_TXT = "generateAttrQueryResponse(...) should've thrown an STORKSAMLEngineException!";
    -
    -
    -    /** Parser manager used to parse XML. */
    -    private static BasicParserPool parser;
    -    
    -    
    -
    -    static {
    -	parser = new BasicParserPool();
    -	parser.setNamespaceAware(true);
    -
    -	pal = new PersonalAttributeList();
    -
    -	PersonalAttribute isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(false);
    -	ArrayList ages = new ArrayList();
    -	ages.add("16");
    -	ages.add("18");
    -	isAgeOver.setValue(ages);
    -	pal.add(isAgeOver);
    -
    -	PersonalAttribute dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	pal.add(dateOfBirth);
    -
    -	PersonalAttribute eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	List eid = Arrays.asList("IS/IS/1234567890");	
    -	eIDNumber.setValue(eid);
    -	eIDNumber.setIsRequired(true);
    -	pal.add(eIDNumber);
    -
    -	final PersonalAttribute givenName = new PersonalAttribute();
    -	givenName.setName("givenName");
    -	givenName.setIsRequired(true);
    -	pal.add(givenName);
    -
    -	PersonalAttribute canRessAddress = new PersonalAttribute();
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	pal.add(canRessAddress);
    -	
    -	PersonalAttribute newAttribute = new PersonalAttribute();
    -	newAttribute.setName("newAttribute2");
    -	newAttribute.setIsRequired(true);
    -	pal.add(newAttribute);
    -
    -	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    -	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";	
    -	spSector = "EDU001";
    -	spInstitution = "OXF001";
    -	spApplication = "APP001";
    -	spCountry = "EN";
    -	
    -	spId = "EDU001-APP001-APP001";
    -
    -	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    -	request.setDestination(destination);
    -	//request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// new parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("IS");
    -
    -	try {
    -	    attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(request)
    -		    .getTokenSaml();
    -	    	    
    -	    attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    fail("Error create STORKAuthnRequest");
    +	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    +
    +	/**
    +	 * Gets the engine.
    +	 * 
    +	 * @return the engine
    +	 */
    +	public static STORKSAMLEngine getEngine() {
    +		return engine;
     	}
     
    -	ipAddress = "111.222.333.444";
    -	
    -	destinationUrl = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    -
    -	pal = new PersonalAttributeList();
    -
    -	isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(true);
    -	ages = new ArrayList();
    -
    -	ages.add("16");
    -	ages.add("18");
    -
    -	isAgeOver.setValue(ages);
    -	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(isAgeOver);
    -
    -	dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	final ArrayList date = new ArrayList();
    -	date.add("16/12/2008");
    -	dateOfBirth.setValue(date);
    -	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(dateOfBirth);
    -
    -	eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -	final ArrayList idNumber = new ArrayList();
    -	idNumber.add("123456789IS");
    -	eIDNumber.setValue(idNumber);
    -	eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(eIDNumber);
    -
    -	canRessAddress = new PersonalAttribute();
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap address = new HashMap();
    -
    -	address.put("state", state);
    -	address.put("town", town);
    -	address.put("postalCode", postalCode);
    -	address.put("streetName", streetName);
    -	address.put("streetNumber", streetNumber);
    -
    -	canRessAddress.setComplexValue(address);
    -	pal.add(canRessAddress);
    -    
    -	newAttribute = new PersonalAttribute();
    -	newAttribute.setName("newAttribute2");
    -	newAttribute.setIsRequired(true);
    -	newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap values = new HashMap();
    -	
    -	values.put("value1", "value1");
    -	values.put("value2", "value2");
    -	values.put("value3", "value3");
    -	values.put("value4", "value4");
    -	
    -	newAttribute.setComplexValue(values);
    -	pal.add(newAttribute);
    -	
    -    }
    -
    -    /**
    -     * Test generate attribute query request without errors.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryResponse() throws STORKSAMLEngineException {
    -
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	final STORKAttrQueryResponse storkResponse = getEngine()
    -		.generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress,
    -				destinationUrl, isNotHashing);
    -
    -	attrQueryResponse = storkResponse.getTokenSaml();
    -	
    -	FileOutputStream output = null;
    -	
    -	try {
    -		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml"));
    -	} catch (FileNotFoundException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    +	/**
    +	 * Sets the engine.
    +	 * 
    +	 * @param newEngine
    +	 *            the new engine
    +	 */
    +	public static void setEngine(final STORKSAMLEngine newEngine) {
    +		StorkAttrQueryResponseTest.engine = newEngine;
     	}
    -	try {
    -		output.write(attrQueryResponse);
    -	} catch (IOException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    +
    +	/** The destination. */
    +	private static String destination;
    +
    +	/** The service provider sector. */
    +	private static String spSector;
    +
    +	/** The service provider institution. */
    +	private static String spInstitution;
    +
    +	/** The service provider application. */
    +	private static String spApplication;
    +
    +	/** The service provider country. */
    +	private static String spCountry;
    +
    +	/** The service provider id. */
    +	private static String spId;
    +
    +	/** The quality authentication assurance level. */
    +	private static final int QAAL = 3;
    +
    +	/** The state. */
    +	private static String state = "IS";
    +
    +	/** The town. */
    +	private static String town = "Reykjavik";
    +
    +	/** The postal code. */
    +	private static String postalCode = "105";
    +
    +	/** The street name. */
    +	private static String streetName = "Gudrunartun";
    +
    +	/** The street number. */
    +	private static String streetNumber = "10";
    +
    +	/** The List of Personal Attributes. */
    +	private static IPersonalAttributeList pal;
    +
    +	/** The assertion consumer URL. */
    +	private static String assertConsumerUrl;
    +
    +	/** The attribute query request. */
    +	private static byte[] attrQueryRequest;
    +
    +	/** The attribute query response. */
    +	private static byte[] attrQueryResponse;
    +
    +	/** The attribute query request. */
    +	private static STORKAttrQueryRequest attrQueryenRequest;
    +
    +	/** The attribute query response. */
    +	private static STORKAttrQueryResponse attrQeuryenResponse;
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(StorkAttrQueryResponseTest.class.getName());
    +
    +	/**
    +	 * Instantiates a new stork response test.
    +	 */
    +	public StorkAttrQueryResponseTest() {
    +		super();
     	}
    -	
    -	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
    -	
    -	
    -    }
    -
    -    /**
    -     * Test validation id parameter mandatory.
    -     */
    -    @Test
    -    public final void testResponseMandatoryId() {
    -	final String identifier = attrQueryenRequest.getSamlId();
    -	attrQueryenRequest.setSamlId(null);
    -
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	try {
    -	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
    -		    ipAddress, destinationUrl, isHashing);
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    attrQueryenRequest.setSamlId(identifier);
    -	    LOG.error("Error");
    +
    +	/** The IP address. */
    +	private static String ipAddress;
    +
    +	/** The destination URL. */
    +	private static String destinationUrl;
    +
    +	/** The is hashing. */
    +	private final boolean isHashing = Boolean.TRUE;
    +
    +	/** The is not hashing. */
    +	private final boolean isNotHashing = Boolean.FALSE;
    +
    +	/** The ERROR text. */
    +	private static final String ERROR_TXT = "generateAttrQueryResponse(...) should've thrown an STORKSAMLEngineException!";
    +
    +	/** Parser manager used to parse XML. */
    +	private static BasicParserPool parser;
    +
    +	static {
    +		parser = new BasicParserPool();
    +		parser.setNamespaceAware(true);
    +
    +		pal = new PersonalAttributeList();
    +
    +		PersonalAttribute isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(false);
    +		ArrayList ages = new ArrayList();
    +		ages.add("16");
    +		ages.add("18");
    +		isAgeOver.setValue(ages);
    +		pal.add(isAgeOver);
    +
    +		PersonalAttribute dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		pal.add(dateOfBirth);
    +
    +		PersonalAttribute eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		List eid = Arrays.asList("IS/IS/1234567890");
    +		eIDNumber.setValue(eid);
    +		eIDNumber.setIsRequired(true);
    +		pal.add(eIDNumber);
    +
    +		final PersonalAttribute givenName = new PersonalAttribute();
    +		givenName.setName("givenName");
    +		givenName.setIsRequired(true);
    +		pal.add(givenName);
    +
    +		PersonalAttribute canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		pal.add(canRessAddress);
    +
    +		PersonalAttribute newAttribute = new PersonalAttribute();
    +		newAttribute.setName("newAttribute2");
    +		newAttribute.setIsRequired(true);
    +		pal.add(newAttribute);
    +
    +		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    +		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    +		spSector = "EDU001";
    +		spInstitution = "OXF001";
    +		spApplication = "APP001";
    +		spCountry = "EN";
    +
    +		spId = "EDU001-APP001-APP001";
    +
    +		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
    +		request.setDestination(destination);
    +		// request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// new parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("IS");
    +
    +		try {
    +			attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(request).getTokenSaml();
    +
    +			attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			fail("Error create STORKAuthnRequest");
    +		}
    +
    +		ipAddress = "111.222.333.444";
    +
    +		destinationUrl = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    +
    +		pal = new PersonalAttributeList();
    +
    +		isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(true);
    +		ages = new ArrayList();
    +
    +		ages.add("16");
    +		ages.add("18");
    +
    +		isAgeOver.setValue(ages);
    +		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(isAgeOver);
    +
    +		dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		final ArrayList date = new ArrayList();
    +		date.add("16/12/2008");
    +		dateOfBirth.setValue(date);
    +		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(dateOfBirth);
    +
    +		eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +		final ArrayList idNumber = new ArrayList();
    +		idNumber.add("123456789IS");
    +		eIDNumber.setValue(idNumber);
    +		eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(eIDNumber);
    +
    +		canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap address = new HashMap();
    +
    +		address.put("state", state);
    +		address.put("town", town);
    +		address.put("postalCode", postalCode);
    +		address.put("streetName", streetName);
    +		address.put("streetNumber", streetNumber);
    +
    +		canRessAddress.setComplexValue(address);
    +		pal.add(canRessAddress);
    +
    +		newAttribute = new PersonalAttribute();
    +		newAttribute.setName("newAttribute2");
    +		newAttribute.setIsRequired(true);
    +		newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap values = new HashMap();
    +
    +		values.put("value1", "value1");
    +		values.put("value2", "value2");
    +		values.put("value3", "value3");
    +		values.put("value4", "value4");
    +
    +		newAttribute.setComplexValue(values);
    +		pal.add(newAttribute);
    +
     	}
    -    }
    -
    -    /**
    -     * Test generate attribute query response in response to err1.
    -     */
    -    @Test
    -    public final void testResponseMandatoryIssuer() {
    -
    -	final String issuer = attrQueryenRequest.getIssuer();
    -	attrQueryenRequest.setIssuer(null);
    -
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	try {
    -	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
    -		    ipAddress, destinationUrl, isHashing);
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    attrQueryenRequest.setIssuer(issuer);
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate attribute query request without errors.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryResponse() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		final STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing);
    +
    +		attrQueryResponse = storkResponse.getTokenSaml();
    +
    +		FileOutputStream output = null;
    +
    +		try {
    +			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml"));
    +		} catch (FileNotFoundException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +		try {
    +			output.write(attrQueryResponse);
    +		} catch (IOException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +
    +		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
    +
     	}
    -    }
    -
    -    
    -    /**
    -     * Test generate attribute query response assertion consumer null.
    -     */
    -    /*@Test
    -    public final void testResponseMandatoryAssertionConsumerServiceURL() {
    -	final String asserConsumerUrl = attrQueryenRequest
    -		.getAssertionConsumerServiceURL();
    -	attrQueryenRequest.setAssertionConsumerServiceURL(null);
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(pal);
    -	try {
    -	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
    -		    ipAddress, isHashing);
    -	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    attrQueryenRequest.setAssertionConsumerServiceURL(asserConsumerUrl);
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validation id parameter mandatory.
    +	 */
    +	@Test
    +	public final void testResponseMandatoryId() {
    +		final String identifier = attrQueryenRequest.getSamlId();
    +		attrQueryenRequest.setSamlId(null);
    +
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		try {
    +			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isHashing);
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			attrQueryenRequest.setSamlId(identifier);
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate attribute query response IP address null.
    -     */
    -    @Test
    -    public final void testResponseValidationIP() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	try {
    -	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, null, 
    -	    		destinationUrl, isHashing);
    -	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate attribute query response in response to err1.
    +	 */
    +	@Test
    +	public final void testResponseMandatoryIssuer() {
    +
    +		final String issuer = attrQueryenRequest.getIssuer();
    +		attrQueryenRequest.setIssuer(null);
    +
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		try {
    +			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isHashing);
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			attrQueryenRequest.setIssuer(issuer);
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate attribute query response with personal attribute list null.
    -     */
    -    @Test
    -    public final void testResponseMandatoryPersonalAttributeList() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setPersonalAttributeList(null);
    -	
    -	
    -	try {
    -	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
    -		    ipAddress, destinationUrl, isHashing);
    -	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate attribute query response assertion consumer null.
    +	 */
    +	/*
    +	 * @Test public final void testResponseMandatoryAssertionConsumerServiceURL() { final String asserConsumerUrl = attrQueryenRequest .getAssertionConsumerServiceURL();
    +	 * attrQueryenRequest.setAssertionConsumerServiceURL(null);
    +	 * 
    +	 * final STORKAuthnResponse response = new STORKAuthnResponse(); response.setPersonalAttributeList(pal); try { getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress,
    +	 * isHashing); fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!"); } catch (STORKSAMLEngineException e) {
    +	 * attrQueryenRequest.setAssertionConsumerServiceURL(asserConsumerUrl); LOG.error("Error"); } }
    +	 * 
    +	 * /** Test generate attribute query response IP address null.
    +	 */
    +	@Test
    +	public final void testResponseValidationIP() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		try {
    +			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, null, destinationUrl, isHashing);
    +			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    /**
    -     * Test validate attribute query response token null.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersToken() {
    -	try {
    -	    getEngine().validateSTORKAttrQueryResponse(null, ipAddress);
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate attribute query response with personal attribute list null.
    +	 */
    +	@Test
    +	public final void testResponseMandatoryPersonalAttributeList() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setPersonalAttributeList(null);
    +
    +		try {
    +			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isHashing);
    +			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate attribute query response IP null.
    -     */
    -    @Test
    -    public final void STORKAttrQueryResponse() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setPersonalAttributeList(pal);
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false	    
    -	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response token null.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersToken() {
    +		try {
    +			getEngine().validateSTORKAttrQueryResponse(null, ipAddress);
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate attribute query response parameter name wrong.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttr() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("AttrWrong");
    -	wrongList.add(worngAttr);
    -	
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response IP null.
    +	 */
    +	@Test
    +	public final void STORKAttrQueryResponse() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setPersonalAttributeList(pal);
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate attribute query response set null value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrSimpleValue() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("isAgeOver");
    -	worngAttr.setValue(null);
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response parameter name wrong.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttr() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("AttrWrong");
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate attribute query response set null value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrNoValue() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("isAgeOver");
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response set null value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrSimpleValue() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("isAgeOver");
    +		worngAttr.setValue(null);
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate attribute query response set null value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrNoName() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();	
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response set null value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrNoValue() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("isAgeOver");
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate attribute query response set null value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrNoName() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate attribute query response set null complex value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrComplexValue() {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("isAgeOver");
    +		worngAttr.setComplexValue(null);
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate attribute query response set null complex value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrComplexValue() {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("isAgeOver");
    -	worngAttr.setComplexValue(null);
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response IP distinct and disabled validation IP.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersIPDistinct() {
    +		try {
    +			// ipAddress origin "111.222.333.444"
    +			// ipAddrValidation = false
    +			// Subject Confirmation Bearer.
    +
    +			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, "127.0.0.1");
    +		} catch (STORKSAMLEngineException e) {
    +			fail("validateAttributeQueryResponse(...) should've thrown an STORKSAMLEngineException!");
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test response invalid parameters invalid token.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersTokenMsg() {
    +		try {
    +			// ipAddress origin "111.222.333.444"
    +			// Subject Confirmation Bearer.
    +			getEngine().validateSTORKAttrQueryResponse("errorMessage".getBytes(), ipAddress);
    +			fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -	
    -    
    -    
    -
    -    /**
    -     * Test validate attribute query response IP distinct and disabled validation
    -     * IP.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersIPDistinct() {
    -	try {
    -	    // ipAddress origin "111.222.333.444"
    -	    // ipAddrValidation = false
    -	    // Subject Confirmation Bearer.
    -
    -	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, "127.0.0.1");	    
    -	} catch (STORKSAMLEngineException e) {
    -		fail("validateAttributeQueryResponse(...) should've thrown an STORKSAMLEngineException!");
    -	    LOG.error("Error");	    
    +
    +	/**
    +	 * Test validate attribute query response is fail.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	/*
    +	 * @Test public final void testValidateAuthenticationResponseIsFail() throws STORKSAMLEngineException { attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
    +	 * ipAddress);
    +	 * 
    +	 * assertFalse("Generate incorrect response: ", attrQeuryenResponse.isFail()); }
    +	 * 
    +	 * /** Test validate attribute query response destination.
    +	 * 
    +	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthenticationResponseDestination() throws STORKSAMLEngineException {
    +		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
    +
    +		assertEquals("Destination incorrect: ", attrQeuryenResponse.getInResponseTo(), attrQueryenRequest.getSamlId());
     	}
    -    }
    -
    -    /**
    -     * Test response invalid parameters invalid token.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersTokenMsg() {
    -	try {
    -	    // ipAddress origin "111.222.333.444"
    -	    // Subject Confirmation Bearer.
    -	    getEngine().validateSTORKAttrQueryResponse("errorMessage".getBytes(),
    -		    ipAddress);
    -	    fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response values.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthenticationResponseValuesComplex() throws STORKSAMLEngineException {
    +		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
    +
    +		assertEquals("Country incorrect:", attrQeuryenResponse.getCountry(), "ES");
    +
    +		final Iterator iterator = attrQeuryenResponse.getPersonalAttributeList().iterator();
    +
    +		while (iterator.hasNext()) {
    +			final PersonalAttribute attribute = iterator.next();
    +			if (attribute.getName().equalsIgnoreCase("canonicalResidenceAddress")) {
    +				assertEquals("State incorrect: ", state, attribute.getComplexValue().get("state"));
    +				assertEquals("Town incorrect: ", town, attribute.getComplexValue().get("town"));
    +				assertEquals("Postal code incorrect: ", postalCode, attribute.getComplexValue().get("postalCode"));
    +				assertEquals("Street name incorrect: ", streetName, attribute.getComplexValue().get("streetName"));
    +				assertEquals("Street number incorrect: ", streetNumber, attribute.getComplexValue().get("streetNumber"));
    +			}
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate attribute query response is fail.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    /*@Test
    -    public final void testValidateAuthenticationResponseIsFail()
    -	    throws STORKSAMLEngineException {
    -    	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
    -		ipAddress);
    -
    -	assertFalse("Generate incorrect response: ", attrQeuryenResponse.isFail());
    -    }
    -
    -    /**
    -     * Test validate attribute query response destination.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthenticationResponseDestination()
    -	    throws STORKSAMLEngineException {
    -    	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
    -		ipAddress);
    -
    -	assertEquals("Destination incorrect: ",
    -			attrQeuryenResponse.getInResponseTo(), attrQueryenRequest.getSamlId());
    -    }
    -
    -    /**
    -     * Test validate attribute query response values.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthenticationResponseValuesComplex()
    -	    throws STORKSAMLEngineException {
    -    	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
    -		ipAddress);
    -	
    -	assertEquals("Country incorrect:", attrQeuryenResponse.getCountry(), "ES");
    -	
    -	final Iterator iterator = attrQeuryenResponse
    -		.getPersonalAttributeList().iterator();
    -
    -	while (iterator.hasNext()) {
    -	    final PersonalAttribute attribute = iterator.next();
    -	    if (attribute.getName().equalsIgnoreCase(
    -		    "canonicalResidenceAddress")) {
    -		assertEquals("State incorrect: ", state, attribute
    -			.getComplexValue().get("state"));		
    -		assertEquals("Town incorrect: ", town, attribute
    -			.getComplexValue().get("town"));
    -		assertEquals("Postal code incorrect: ", postalCode, attribute
    -			.getComplexValue().get("postalCode"));
    -		assertEquals("Street name incorrect: ", streetName, attribute
    -			.getComplexValue().get("streetName"));
    -		assertEquals("Street number incorrect: ", streetNumber,
    -			attribute.getComplexValue().get("streetNumber"));		
    -	    }
    +
    +	/**
    +	 * Test generate attribute query response fail in response to it's null.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	// ( expected=STORKSAMLEngineException.class)
    +	public final void testGenerateAttrQueryResponseFailInResponseToNull() throws STORKSAMLEngineException {
    +		final String identifier = attrQueryenRequest.getSamlId();
    +		attrQueryenRequest.setSamlId(null);
    +
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    +		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    +		response.setMessage("");
    +
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			attrQueryenRequest.setSamlId(identifier);
    +			LOG.error("Error");
    +			// throw new STORKSAMLEngineException(e);
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate attribute query response fail in response to it's null.
    -     * @throws STORKSAMLEngineException 
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test //( expected=STORKSAMLEngineException.class)
    -    public final void testGenerateAttrQueryResponseFailInResponseToNull() throws STORKSAMLEngineException {
    -	final String identifier = attrQueryenRequest.getSamlId();
    -	attrQueryenRequest.setSamlId(null);
    -
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("");
    -
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    attrQueryenRequest.setSamlId(identifier);
    -	    LOG.error("Error");
    -	    //throw new STORKSAMLEngineException(e);
    +
    +	/**
    +	 * Test generate attribute query response fail assertion consumer URL err1.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	/*
    +	 * @Test public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull() throws STORKSAMLEngineException {
    +	 * 
    +	 * final String assertConsumerUrl = attrQueryenRequest .getAssertionConsumerServiceURL(); attrQueryenRequest.setAssertionConsumerServiceURL(null);
    +	 * 
    +	 * final STORKAuthnResponse response = new STORKAuthnResponse(); response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    +	 * response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString()); response.setMessage("");
    +	 * 
    +	 * try { attrQueryResponse = getEngine().generateSTORKAuthnResponseFail(attrQueryenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +	 * fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!"); } catch (STORKSAMLEngineException e) {
    +	 * attrQueryenRequest.setAssertionConsumerServiceURL(assertConsumerUrl); LOG.error("Error"); } }
    +	 * 
    +	 * /** Test generate attribute query response fail code error err1.
    +	 * 
    +	 * @throws STORKSAMLEngineException the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAttrQueryResponseFailCodeErrorNull() throws STORKSAMLEngineException {
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setStatusCode(null);
    +		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    +		response.setMessage("");
    +
    +		try {
    +			attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +			fail("generateAttrQueryResponseFail(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate attribute query response fail assertion consumer URL err1.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    /*@Test
    -    public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull()
    -	    throws STORKSAMLEngineException {
    -
    -	final String assertConsumerUrl = attrQueryenRequest
    -		.getAssertionConsumerServiceURL();
    -	attrQueryenRequest.setAssertionConsumerServiceURL(null);
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("");
    -
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAuthnResponseFail(attrQueryenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    attrQueryenRequest.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate attribute query request without errors.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryResponse() throws STORKSAMLEngineException {
    +
    +		IPersonalAttributeList palist = new PersonalAttributeList();
    +
    +		PersonalAttribute isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(true);
    +		ArrayList ages = new ArrayList();
    +		ages.add("16");
    +		ages.add("18");
    +		isAgeOver.setValue(ages);
    +		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		palist.add(isAgeOver);
    +
    +		PersonalAttribute dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		final ArrayList date = new ArrayList();
    +		date.add("16/12/2008");
    +		dateOfBirth.setValue(date);
    +		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		palist.add(dateOfBirth);
    +
    +		PersonalAttribute eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +
    +		final ArrayList idNumber = new ArrayList();
    +		idNumber.add("123456789PÑ");
    +
    +		final HashMap complex = new HashMap();
    +		complex.put("one", "two");
    +
    +		// eIDNumber.setValue(null);
    +		// eIDNumber.setValue(idNumber);
    +		// eIDNumber.setComplexValue(complex);
    +
    +		eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
    +		palist.add(eIDNumber);
    +
    +		PersonalAttribute canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap address = new HashMap();
    +
    +		address.put("state", state);
    +		address.put("town", town);
    +		address.put("postalCode", postalCode);
    +		address.put("streetName", streetName);
    +		address.put("streetNumber", streetNumber);
    +
    +		canRessAddress.setComplexValue(address);
    +		palist.add(canRessAddress);
    +
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +
    +		response.setPersonalAttributeList(palist);
    +
    +		final STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing);
    +
    +		attrQueryResponse = storkResponse.getTokenSaml();
    +		LOG.info("Request id: " + attrQueryenRequest.getSamlId());
    +
    +		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
    +
    +		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
    +
    +		LOG.info("RESPONSE ID: " + attrQeuryenResponse.getSamlId());
    +		LOG.info("RESPONSE IN_RESPONSE_TO: " + attrQeuryenResponse.getInResponseTo());
    +		LOG.info("RESPONSE COUNTRY: " + attrQeuryenResponse.getCountry());
    +
     	}
    -    }
    -
    -    /**
    -     * Test generate attribute query response fail code error err1.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAttrQueryResponseFailCodeErrorNull()
    -	    throws STORKSAMLEngineException {
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setStatusCode(null);
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("");
    -
    -	try {
    -	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest,
    -		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	    fail("generateAttrQueryResponseFail(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate attribute query response fail is fail.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAttrQueryResponseFailIsFail() throws STORKSAMLEngineException {
    +
    +		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    +		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    +		response.setMessage("message");
    +
    +		attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    +
    +		LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(attrQueryResponse));
    +
    +		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
    +
    +		LOG.info("COUNTRY: " + attrQeuryenResponse.getCountry());
    +		assertTrue("Generate incorrect response: ", attrQeuryenResponse.isFail());
     	}
    -    }
    -    
    -    
    -    
    -    
    -    /**
    -     * Test generate attribute query request without errors.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryResponse() throws STORKSAMLEngineException {
    -	
    -	IPersonalAttributeList palist = new PersonalAttributeList();
    -
    -	PersonalAttribute isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(true);
    -	ArrayList ages = new ArrayList();
    -	ages.add("16");
    -	ages.add("18");
    -	isAgeOver.setValue(ages);
    -	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	palist.add(isAgeOver);
    -
    -	PersonalAttribute dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	final ArrayList date = new ArrayList();
    -	date.add("16/12/2008");
    -	dateOfBirth.setValue(date);
    -	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	palist.add(dateOfBirth);
    -
    -	
    -	PersonalAttribute eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -
    -	final ArrayList idNumber = new ArrayList();
    -	idNumber.add("123456789PÑ");
    -	
    -	final HashMap complex = new HashMap();
    -	complex.put("one", "two");
    -
    -	//eIDNumber.setValue(null);
    -	//eIDNumber.setValue(idNumber);
    -	//eIDNumber.setComplexValue(complex);
    -	
    -	eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
    -	palist.add(eIDNumber);
    -
    -	PersonalAttribute canRessAddress = new PersonalAttribute();	
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap address = new HashMap();
    -
    -	address.put("state", state);
    -	address.put("town", town);
    -	address.put("postalCode", postalCode);
    -	address.put("streetName", streetName);
    -	address.put("streetNumber", streetNumber);
    -
    -	canRessAddress.setComplexValue(address);
    -	palist.add(canRessAddress);
    -
    -	
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -
    -	response.setPersonalAttributeList(palist);
    -
    -	final STORKAttrQueryResponse storkResponse = getEngine()
    -		.generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress,
    -			destinationUrl, isNotHashing);
    -
    -	attrQueryResponse = storkResponse.getTokenSaml();
    -	LOG.info("Request id: " + attrQueryenRequest.getSamlId());
    -	
    -	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
    -	
    -	
    -	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
    -		ipAddress);
    -	
    -	LOG.info("RESPONSE ID: " + attrQeuryenResponse.getSamlId());
    -	LOG.info("RESPONSE IN_RESPONSE_TO: " + attrQeuryenResponse.getInResponseTo());
    -	LOG.info("RESPONSE COUNTRY: " + attrQeuryenResponse.getCountry());
    -	
    -    }
    -    
    -    
    -   
    -
    -	
    -    /**
    -     * Test validate attribute query response fail is fail.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAttrQueryResponseFailIsFail()
    -	    throws STORKSAMLEngineException {
    -
    -	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("message");
    -
    -	attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest,
    -		response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
    -	
    -	LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(attrQueryResponse));
    -
    -	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
    -		ipAddress);
    -
    -	LOG.info("COUNTRY: " + attrQeuryenResponse.getCountry());
    -	assertTrue("Generate incorrect response: ", attrQeuryenResponse.isFail());
    -    }  
    -    
    +
     	/**
     	 * Test generate/validate response with signedDoc
     	 * 
    @@ -879,8 +800,7 @@ public class StorkAttrQueryResponseTest {
     	 *             the STORKSAML engine exception
     	 */
     	@Test
    -	public final void testGenerateAttrQueryResponseWithSignedDoc()
    -			throws STORKSAMLEngineException {
    +	public final void testGenerateAttrQueryResponseWithSignedDoc() throws STORKSAMLEngineException {
     
     		String signedDocResponse = "  urn:oasis:names:tc:dss:1.0:resultmajor:Success   <?xml version="1.0" encoding="UTF-8"?><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference Id="Reference-baba4d1a-a17e-42c6-97d2-beee13509503" Type="http://www.w3.org/2000/09/xmldsig#Object" URI="#Object-98733cde-8bcc-48a0-9b77-0e9997bdd058"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>Ck1VqNd45QIvq3AZd8XYQLvEhtA=</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>A5Y91n4qpLgytTW7fxjXCUeRv54=</ds:DigestValue></ds:Reference><ds:Reference URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>VPX4nKFyS6rF+F6cRR0PrNZdw6g=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignatureValue">LbKN//C7XkyxTtYTiCURr8nZzxAmstcMd0CgEACrK1dygRHqGcK4xts+WCU8PyEqWrRITYzIuw/7
V4Zz9TT60p4KTMewuQL64skESx2Yg2EdikSO+tKxWkhraUsmVbGbPmmcmDv97tHDw88747eFq5F5
v+aVSyAz03iUKmuSeH8=</ds:SignatureValue><ds:KeyInfo Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:KeyValue><ds:RSAKeyValue><ds:Modulus>wucmj9tIWrvwbSTUDfwKl+JtDMMER0cLd6DkBSr790t+rGNjESqYjRwEIeBnKoQHPx5HoReF88/t
qY9+ChEXpLHLs9p5aX7SDJubpQMfp1tDFX34ywgxSQvceeJQWBXjieuImfC21s4bOcgJbV1hbigS
zOKTQKr1TzdGR+uRy00=</ds:Modulus><ds:Exponent>AQAB</ds:Exponent></ds:RSAKeyValue></ds:KeyValue><ds:X509Data><ds:X509Certificate>MIIImTCCB4GgAwIBAgIDAXUUMA0GCSqGSIb3DQEBBQUAMIIBOzELMAkGA1UEBhMCRVMxOzA5BgNV
BAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQw
MgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMS4wLAYD
VQQLEyVTZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvIEVDVi0yMTUwMwYDVQQLEyxWZWdl
dSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzE1MDMGA1UECxMsRW50aXRh
dCBwdWJsaWNhIGRlIGNlcnRpZmljYWNpbyBkZSBjaXV0YWRhbnMxGzAZBgNVBAMTElBSRVBST0RV
Q0NJTyBJRENhdDAeFw0xMDAyMTExODIyMDRaFw0xNDAyMTAxODIyMDRaMIGwMQswCQYDVQQGEwJF
UzE1MDMGA1UECxMsVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVySURDYXQgKGMpMDMx
FjAUBgNVBAQTDUJFUkxBTkdBIFNPVE8xFzAVBgNVBCoTDk1BUklBIEVOR1JBQ0lBMRIwEAYDVQQF
EwkxMDAwMDk0NFMxJTAjBgNVBAMTHE1BUklBIEVOR1JBQ0lBIEJFUkxBTkdBIFNPVE8wgZ8wDQYJ
KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnJo/bSFq78G0k1A38CpfibQzDBEdHC3eg5AUq+/dLfqxj
YxEqmI0cBCHgZyqEBz8eR6EXhfPP7amPfgoRF6Sxy7PaeWl+0gybm6UDH6dbQxV9+MsIMUkL3Hni
UFgV44nriJnwttbOGznICW1dYW4oEszik0Cq9U83RkfrkctNAgMBAAGjggSwMIIErDAMBgNVHRMB
Af8EAjAAMA4GA1UdDwEB/wQEAwIFoDCBzAYDVR0RBIHEMIHBgQ9ic290b0BnbWFpbC5jb22kgYUw
gYIxCzAJBgNVBAYTAkVTMSswKQYDVQQKFCJBZ8OobmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2Fj
acOzMQ4wDAYDVQQLEwVJRENBVDEPMA0GA1UEBRMGMDE3NTE0MSUwIwYDVQQDExxNQVJJQSBFTkdS
QUNJQSBCRVJMQU5HQSBTT1RPoBAGCisGAQQB9XgBAQGgAgwAoBQGDlYEAAEDBgEEAfV4AQECoAIM
ADAfBgNVHRIEGDAWgRRlY19pZGNhdEBjYXRjZXJ0Lm5ldDAdBgNVHQ4EFgQUAFXjuNskB2MlyvUB
h7p8TJ0uJ0wwggFIBgNVHSMEggE/MIIBO4AURKvckUhN14h4Cn/gdODn6723KVyhggEPpIIBCzCC
AQcxCzAJBgNVBAYTAkVTMTswOQYDVQQKEzJBZ2VuY2lhIENhdGFsYW5hIGRlIENlcnRpZmljYWNp
byAoTklGIFEtMDgwMTE3Ni1JKTEoMCYGA1UECxMfU2VydmVpcyBQdWJsaWNzIGRlIENlcnRpZmlj
YWNpbzE8MDoGA1UECxMzVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVycHJlcHJvZHVj
Y2lvIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENh
dGFsYW5lczEcMBoGA1UEAxMTUFJFUFJPRFVDQ0lPIEVDLUFDQ4IQdwKTtM1EEU9FEPXUYHgghDAd
BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwEQYJYIZIAYb4QgEBBAQDAgWgMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cHM6Ly9vY3NwLmNhdGNlcnQubmV0MBgGCCsGAQUFBwED
BAwwCjAIBgYEAI5GAQEwgYYGA1UdHwR/MH0wPKA6oDiGNmh0dHA6Ly9lcHNjZC5jYXRjZXJ0Lm5l
dC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDA9oDugOYY3aHR0cDovL2Vwc2NkMi5jYXRj
ZXJ0Lm5ldC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDCB9gYDVR0gBIHuMIHrMIHoBgwr
BgEEAfV4AQMBVgEwgdcwLAYIKwYBBQUHAgEWIGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcklE
Q2F0MIGmBggrBgEFBQcCAjCBmRqBlkFxdWVzdCDvv71zIHVuIGNlcnRpZmljYXQgcGVyc29uYWwg
SURDQVQsIHJlY29uZWd1dCBkJ2lkZW50aWZpY2Fj77+9LCBzaWduYXR1cmEgaSB4aWZyYXQgZGUg
Y2xhc3NlIDIgaW5kaXZpZHVhbC4gVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVyRENh
dDAtBgNVHQkEJjAkMBAGCCsGAQUFBwkEMQQTAkVTMBAGCCsGAQUFBwkFMQQTAkVTMA0GCSqGSIb3
DQEBBQUAA4IBAQCq7780RGQMLB1gkdNMfLXngqMoRHGKZbvzkrqIAmT8WAd1E8rAphR9/xLJUtp5
lbg2fRr5bl2j8OVDBK2YmG41h8ADn4STI/ApeNINSfjZs6NRsnWzFyfXXmPCHYFB/XWzyimCExgv
vtuH+3QAwcwhn50PLEuhw5C5vlX7Ly5K6rLLMFNUUMbWVy1hZelK/CBTcAjIO38NY+vYRAMKSf4M
/gZQz4qBeFVJa52R7NcAqCfrfLfaXpbDSg98xoBeNs2inGzx8USgErLZjKJsdn/KjTD9gS/sTdQ6
Q7idqld2LFVlO2/b94ZNZBcS/78EODXgdWfkyPC7Rw8re9nI3/jT</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object Encoding="base64" Id="Object-98733cde-8bcc-48a0-9b77-0e9997bdd058" MimeType="application/octet-stream">SGVsbG8gV29ybGQ=</ds:Object><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-QualifyingProperties" Target="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><xades:SignedProperties Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><xades:SignedSignatureProperties><xades:SigningTime>2011-03-21T11:44:42+01:00</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>3m6w99ToySd9JpBl1gBk8Dz/bbU=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=PREPRODUCCIO IDCat, OU=Entitat publica de certificacio de ciutadans, OU=Vegeu https://www.catcert.net/verCIC-2 (c)03, OU=Serveis Publics de Certificacio ECV-2, L=Passatge de la Concepcio 11 08008 Barcelona, O=Agencia Catalana de Certificacio (NIF Q-0801176-I), C=ES</ds:X509IssuerName><ds:X509SerialNumber>95508</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#Reference-baba4d1a-a17e-42c6-97d2-beee13509503"><xades:MimeType>application/octet-stream</xades:MimeType><xades:Encoding>base64</xades:Encoding></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature>  ";
     
    @@ -909,117 +829,107 @@ public class StorkAttrQueryResponseTest {
     
     		response.setPersonalAttributeList(palist);
     
    -		final STORKAttrQueryResponse storkResponse = getEngine()
    -				.generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, 
    -						destinationUrl, isNotHashing);
    +		final STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing);
     
     		attrQueryResponse = storkResponse.getTokenSaml();
    -		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
    -				ipAddress);
    +		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
     
    -		assertTrue("SignedDoc response should be the same: ", attrQeuryenResponse
    -				.getPersonalAttributeList().get("signedDoc").getValue().get(0)
    -				.equals(signedDocResponse));
    +		assertTrue("SignedDoc response should be the same: ", attrQeuryenResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0).equals(signedDocResponse));
     
     	}
    -	
    +
     	@Test
     	public final void testEncodeDecode() {
    -	      STORKAttrQueryRequest attrRequest = new STORKAttrQueryRequest();
    -	      STORKAttrQueryRequest request;
    -	      IPersonalAttributeList list = null;
    -	      boolean outcome = false;
    -	      
    -	      try {
    -	    	 //STEP 1: Create the STORKAttrQueryRequest and get the SAML bytes
    -	    	 attrRequest.setSpSector("NOT AVAILABLE");
    -	    	 attrRequest.setSpInstitution("NOT AVAILABLE");
    -	    	 attrRequest.setSpApplication("NOT AVAILABLE");
    -	         attrRequest.setSpCountry("NOT AVAILABLE");
    -
    -	         attrRequest.setIssuer("123");
    -	         attrRequest.setDestination("456");
    -	         attrRequest.setAssertionConsumerServiceURL("789");
    -	         attrRequest.setQaa(2);
    -	         attrRequest.setPersonalAttributeList(pal);
    -
    -	         System.out.println("Original PAL:");
    -	         System.out.println(pal.toString());
    -
    -	         attrRequest = engine.generateSTORKAttrQueryRequest(attrRequest);
    -
    -	         byte[] saml = attrRequest.getTokenSaml();
    -
    -	    	 //STEP 2: RE-Create the STORKAttrQueryRequest from the SAML bytes
    -	         request = engine.validateSTORKAttrQueryRequest(saml);
    -
    -	         System.out.println("STORKAttrQueryRequest Issuer: " + request.getIssuer());
    -	         System.out.println("STORKAttrQueryRequest Destination: " + request.getDestination());
    -	         System.out.println("STORKAttrQueryRequest ServiceURL: " + request.getAssertionConsumerServiceURL());
    -	         System.out.println("STORKAttrQueryRequest Attributes: " + request.getPersonalAttributeList().toString());
    -	         System.out.println("STORKAttrQueryRequest QAA: " + request.getQaa());
    -			 //------------------------------
    -			 list = request.getPersonalAttributeList();
    -
    -			 List values = new ArrayList();
    -			 values.add("test1");
    -			 values.add("test2");
    -			 values.add("test3");
    -			 list.get("newAttribute2").setValue(values);
    -
    -			 System.out.println("Values added in newAttribute2 PAL:");
    -			 System.out.println(list.toString());
    -
    -	         //////////////////////////////////////////////////////////////////////////
    -			 final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    -			 response.setPersonalAttributeList(list);
    -
    -			 final STORKAttrQueryResponse storkResponse =
    -						engine.generateSTORKAttrQueryResponse(request, response, "127.0.0.1",
    -								request.getAssertionConsumerServiceURL(), false);
    -
    -			 byte[] samlBytes = storkResponse.getTokenSaml();
    -
    -	    	 //STEP 3: RE-Create the STORKAttrQueryResponse from the SAML bytes
    -		     STORKAttrQueryResponse attrResponse = null;
    -		     attrResponse =
    -		         engine.validateSTORKAttrQueryResponse(samlBytes, "127.0.0.1");
    -
    -		     System.out.println("Response decoded PAL:");
    -		     System.out.println(attrResponse.getPersonalAttributeList().toString());
    -
    -		     values = attrResponse.getPersonalAttributeList().get("newAttribute2").getValue();
    -		     if ( values.contains("test1") && values.contains("test2") && values.contains("test3") )
    -		    	 outcome = true;
    -	      } catch (final STORKSAMLEngineException e) {
    -	         LOG.error("Errror genereating SAML Token for Authentication Request", e);
    -	      }
    -
    -	      assertTrue(outcome);
    +		STORKAttrQueryRequest attrRequest = new STORKAttrQueryRequest();
    +		STORKAttrQueryRequest request;
    +		IPersonalAttributeList list = null;
    +		boolean outcome = false;
    +
    +		try {
    +			// STEP 1: Create the STORKAttrQueryRequest and get the SAML bytes
    +			attrRequest.setSpSector("NOT AVAILABLE");
    +			attrRequest.setSpInstitution("NOT AVAILABLE");
    +			attrRequest.setSpApplication("NOT AVAILABLE");
    +			attrRequest.setSpCountry("NOT AVAILABLE");
    +
    +			attrRequest.setIssuer("123");
    +			attrRequest.setDestination("456");
    +			attrRequest.setAssertionConsumerServiceURL("789");
    +			attrRequest.setQaa(2);
    +			attrRequest.setPersonalAttributeList(pal);
    +
    +			System.out.println("Original PAL:");
    +			System.out.println(pal.toString());
    +
    +			attrRequest = engine.generateSTORKAttrQueryRequest(attrRequest);
    +
    +			byte[] saml = attrRequest.getTokenSaml();
    +
    +			// STEP 2: RE-Create the STORKAttrQueryRequest from the SAML bytes
    +			request = engine.validateSTORKAttrQueryRequest(saml);
    +
    +			System.out.println("STORKAttrQueryRequest Issuer: " + request.getIssuer());
    +			System.out.println("STORKAttrQueryRequest Destination: " + request.getDestination());
    +			System.out.println("STORKAttrQueryRequest ServiceURL: " + request.getAssertionConsumerServiceURL());
    +			System.out.println("STORKAttrQueryRequest Attributes: " + request.getPersonalAttributeList().toString());
    +			System.out.println("STORKAttrQueryRequest QAA: " + request.getQaa());
    +			// ------------------------------
    +			list = request.getPersonalAttributeList();
    +
    +			List values = new ArrayList();
    +			values.add("test1");
    +			values.add("test2");
    +			values.add("test3");
    +			list.get("newAttribute2").setValue(values);
    +
    +			System.out.println("Values added in newAttribute2 PAL:");
    +			System.out.println(list.toString());
    +
    +			// ////////////////////////////////////////////////////////////////////////
    +			final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
    +			response.setPersonalAttributeList(list);
    +
    +			final STORKAttrQueryResponse storkResponse = engine.generateSTORKAttrQueryResponse(request, response, "127.0.0.1", request.getAssertionConsumerServiceURL(), false);
    +
    +			byte[] samlBytes = storkResponse.getTokenSaml();
    +
    +			// STEP 3: RE-Create the STORKAttrQueryResponse from the SAML bytes
    +			STORKAttrQueryResponse attrResponse = null;
    +			attrResponse = engine.validateSTORKAttrQueryResponse(samlBytes, "127.0.0.1");
    +
    +			System.out.println("Response decoded PAL:");
    +			System.out.println(attrResponse.getPersonalAttributeList().toString());
    +
    +			values = attrResponse.getPersonalAttributeList().get("newAttribute2").getValue();
    +			if (values.contains("test1") && values.contains("test2") && values.contains("test3"))
    +				outcome = true;
    +		} catch (final STORKSAMLEngineException e) {
    +			LOG.error("Errror genereating SAML Token for Authentication Request", e);
    +		}
    +
    +		assertTrue(outcome);
     	}
    -	
    +
     	@Test
    -	public final void testGenerateAttrRequestWithMultipleAssertions()
    -	throws STORKSAMLEngineException {
    +	public final void testGenerateAttrRequestWithMultipleAssertions() throws STORKSAMLEngineException {
     		STORKAttrQueryRequest req = null;
     		STORKAttrQueryResponse res0 = null;
     		STORKAttrQueryResponse res1 = null;
     		STORKAttrQueryResponse res2 = null;
     		STORKAttrQueryResponse res = null;
     		STORKAttrQueryResponse restotal = null;
    -		
    +
     		try {
     			req = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
    -		    	    
    -		    attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
    -		    
    +
    +			attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
    +
     		} catch (STORKSAMLEngineException e) {
    -		    fail("Error validating STORKAuthnRequest");
    +			fail("Error validating STORKAuthnRequest");
     		}
    -		
    +
     		IPersonalAttributeList pList = req.getPersonalAttributeList();
    -		for (int i =0; i < pList.size(); i++)
    -		{
    +		for (int i = 0; i < pList.size(); i++) {
     			PersonalAttribute attr = pList.get("dateOfBirth");
     			attr.setValue(Arrays.asList("19820919"));
     			pList.remove("dateOfBirth");
    @@ -1031,37 +941,30 @@ public class StorkAttrQueryResponseTest {
     			PersonalAttribute attr2 = pList.get("isAgeOver");
     			attr2.setValue(Arrays.asList("true"));
     			pList.remove("isAgeOver");
    -			pList.add(attr2);			
    +			pList.add(attr2);
     		}
    -		
    +
     		res = new STORKAttrQueryResponse();
     		res.setPersonalAttributeList(pList);
    -		
    -		STORKAttrQueryResponse storkResponse = getEngine()
    -		.generateSTORKAttrQueryResponse(req, res, ipAddress,
    -				destinationUrl, isNotHashing);
    -		
    +
    +		STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(req, res, ipAddress, destinationUrl, isNotHashing);
    +
     		res0 = getEngine().validateSTORKAttrQueryResponse(storkResponse.getTokenSaml(), ipAddress);
    -		
    -		storkResponse = getEngine()
    -		.generateSTORKAttrQueryResponse(req, res, ipAddress,
    -				destinationUrl, isNotHashing);
    +
    +		storkResponse = getEngine().generateSTORKAttrQueryResponse(req, res, ipAddress, destinationUrl, isNotHashing);
     		res1 = getEngine().validateSTORKAttrQueryResponse(storkResponse.getTokenSaml(), ipAddress);
    -		
    -		storkResponse = getEngine()
    -		.generateSTORKAttrQueryResponse(req, res, ipAddress,
    -				destinationUrl, isNotHashing);
    +
    +		storkResponse = getEngine().generateSTORKAttrQueryResponse(req, res, ipAddress, destinationUrl, isNotHashing);
     		res2 = getEngine().validateSTORKAttrQueryResponse(storkResponse.getTokenSaml(), ipAddress);
    -		
    +
     		List responses = new ArrayList();
     		responses.add(res0);
     		responses.add(res1);
     		responses.add(res2);
    -		
    +
     		STORKAttrQueryResponse resfinal = new STORKAttrQueryResponse();
    -		storkResponse = getEngine().generateSTORKAttrQueryResponseWithAssertions(req, resfinal, responses, 
    -				ipAddress, destinationUrl, isNotHashing);
    -		
    +		storkResponse = getEngine().generateSTORKAttrQueryResponseWithAssertions(req, resfinal, responses, ipAddress, destinationUrl, isNotHashing);
    +
     		attrQueryResponse = storkResponse.getTokenSaml();
     		FileOutputStream output = null;
     		try {
    @@ -1076,7 +979,7 @@ public class StorkAttrQueryResponseTest {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     		}
    -		
    +
     		res = null;
     		res = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
     		System.out.println(res.getTotalPersonalAttributeList().toString());
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
    index 02a8a6fab..beca213ac 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
    @@ -38,869 +38,850 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
      */
     public class StorkAuthRequestTest {
     
    -    /** The engines. */
    -    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");    
    -    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
    -    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    -            
    -
    -    /**
    -     * Instantiates a new stork authentication request test.
    -     */
    -    public StorkAuthRequestTest() {
    -	pal = new PersonalAttributeList();
    -
    -	final PersonalAttribute isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(true);
    -	final ArrayList ages = new ArrayList();
    -	ages.add("16");
    -	ages.add("18");
    -	isAgeOver.setValue(ages);
    -	pal.add(isAgeOver);
    -	
    -	final PersonalAttribute dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	pal.add(dateOfBirth);
    -	
    +	/** The engines. */
    +	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    +	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
    +	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    +
    +	/**
    +	 * Instantiates a new stork authentication request test.
    +	 */
    +	public StorkAuthRequestTest() {
    +		pal = new PersonalAttributeList();
    +
    +		final PersonalAttribute isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(true);
    +		final ArrayList ages = new ArrayList();
    +		ages.add("16");
    +		ages.add("18");
    +		isAgeOver.setValue(ages);
    +		pal.add(isAgeOver);
    +
    +		final PersonalAttribute dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		pal.add(dateOfBirth);
    +
     		final PersonalAttribute eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -	pal.add(eIDNumber);
    -
    -	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    -	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    -
    -	spName = "University of Oxford";
    -	spSector = "EDU001";
    -	spInstitution = "OXF001";
    -	spApplication = "APP001";
    -	spCountry = "EN";
    -	
    -	spId = "EDU001-OXF001-APP001";
    -	
    -    }
    -
    -    /** The destination. */
    -    private String destination;
    -
    -    /** The service provider name. */
    -    private String spName;
    -
    -    /** The service provider sector. */
    -    private String spSector;
    -
    -    /** The service provider institution. */
    -    private String spInstitution;
    -
    -    /** The service provider application. */
    -    private String spApplication;
    -
    -    /** The service provider country. */
    -    private String spCountry;
    -    
    -    /** The service provider id. */
    -    private String spId;
    -
    -    /** The quality authentication assurance level. */
    -    private static final int QAAL = 3;
    -
    -    /** The List of Personal Attributes. */
    -    private IPersonalAttributeList pal;
    -
    -    /** The assertion consumer URL. */
    -    private String assertConsumerUrl;
    -
    -    /** The authentication request. */
    -    private static byte[] authRequest;
    -
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(StorkAuthRequestTest.class.getName());
    -
    -    /** Parser manager used to parse XML. */
    -    private static BasicParserPool parser;
    -
    -    static {
    -	parser = new BasicParserPool();
    -	parser.setNamespaceAware(true);
    -    }
    -
    -    /**
    -     * Test generate authentication request.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequest() throws STORKSAMLEngineException {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// new parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	//engine.generateSTORKAuthnRequest(request);
    -	
    -	LOG.info("STORKAuthnRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
    -	request.setCitizenCountryCode("ES");
    -	LOG.info("STORKAuthnRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
    -    }
    -    
    -    
    -    /**
    -     * Test generate authentication request error personal attribute name error.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestPALsErr1() {
    -	
    -	final IPersonalAttributeList palWrong = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("attrNotValid");
    -	worngAttr.setIsRequired(true);
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(palWrong);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +		pal.add(eIDNumber);
    +
    +		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    +		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    +
    +		spName = "University of Oxford";
    +		spSector = "EDU001";
    +		spInstitution = "OXF001";
    +		spApplication = "APP001";
    +		spCountry = "EN";
    +
    +		spId = "EDU001-OXF001-APP001";
    +
     	}
    -    }
    -    
    -    
    -    
    -    /**
    -     * Test generate authentication request error personal attribute value error.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestPALsErr2() {
    -	
    -	final IPersonalAttributeList palWrong = new PersonalAttributeList();
    -
    -	final PersonalAttribute attrNotValid = new PersonalAttribute();
    -	attrNotValid.setName("attrNotValid");
    -	attrNotValid.setIsRequired(true);
    -	palWrong.add(attrNotValid);
    -
    -
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(palWrong);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/** The destination. */
    +	private String destination;
    +
    +	/** The service provider name. */
    +	private String spName;
    +
    +	/** The service provider sector. */
    +	private String spSector;
    +
    +	/** The service provider institution. */
    +	private String spInstitution;
    +
    +	/** The service provider application. */
    +	private String spApplication;
    +
    +	/** The service provider country. */
    +	private String spCountry;
    +
    +	/** The service provider id. */
    +	private String spId;
    +
    +	/** The quality authentication assurance level. */
    +	private static final int QAAL = 3;
    +
    +	/** The List of Personal Attributes. */
    +	private IPersonalAttributeList pal;
    +
    +	/** The assertion consumer URL. */
    +	private String assertConsumerUrl;
    +
    +	/** The authentication request. */
    +	private static byte[] authRequest;
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(StorkAuthRequestTest.class.getName());
    +
    +	/** Parser manager used to parse XML. */
    +	private static BasicParserPool parser;
    +
    +	static {
    +		parser = new BasicParserPool();
    +		parser.setNamespaceAware(true);
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request error provider name null.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestSPNAmeErr1() {
    -	
    - 
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(null);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try 
    -	{
    -		engine.generateSTORKAuthnRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +	/**
    +	 * Test generate authentication request.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequest() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// new parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		// engine.generateSTORKAuthnRequest(request);
    +
    +		LOG.info("STORKAuthnRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
    +		request.setCitizenCountryCode("ES");
    +		LOG.info("STORKAuthnRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
     	}
    -	catch (STORKSAMLEngineException e)
    -	{
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request error personal attribute name error.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestPALsErr1() {
    +
    +		final IPersonalAttributeList palWrong = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("attrNotValid");
    +		worngAttr.setIsRequired(true);
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(palWrong);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request authentication assurance level
    -     * negative value.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestQaalErr1() {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(-1);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request error personal attribute value error.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestPALsErr2() {
    +
    +		final IPersonalAttributeList palWrong = new PersonalAttributeList();
    +
    +		final PersonalAttribute attrNotValid = new PersonalAttribute();
    +		attrNotValid.setName("attrNotValid");
    +		attrNotValid.setIsRequired(true);
    +		palWrong.add(attrNotValid);
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(palWrong);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider sector null.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestSectorErr() {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(null);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
     
    +	/**
    +	 * Test generate authentication request error provider name null.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestSPNAmeErr1() {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(null);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider institution null.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestInstitutionrErr() {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(null);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +	/**
    +	 * Test generate authentication request authentication assurance level negative value.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestQaalErr1() {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(-1);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider application null.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestApplicationErr() {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(null);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +	/**
    +	 * Test generate authentication request service provider sector null.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestSectorErr() {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(null);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request service provider country null.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestCountryErr() {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(null);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	    
    -	} catch (STORKSAMLEngineException e) {	 
    -		LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request service provider institution null.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestInstitutionrErr() {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(null);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request error with quality authentication
    -     * assurance level wrong.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestQaalErr2() {
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(0);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request service provider application null.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestApplicationErr() {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(null);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request personal attribute list null value.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestPALErr1() {
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(null);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request service provider country null.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestCountryErr() {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(null);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication request error with assertion consumer URL
    -     * null.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestAssertionConsumerErr1() {
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(null);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    engine.generateSTORKAuthnRequest(request);
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request error with quality authentication assurance level wrong.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestQaalErr2() {
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(0);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication request null parameter.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnRequestNullParam()
    -	    throws STORKSAMLEngineException {
    -	try {
    -	    engine.validateSTORKAuthnRequest(null);
    -	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request personal attribute list null value.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestPALErr1() {
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(null);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test generate authentication request error with assertion consumer URL null.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestAssertionConsumerErr1() {
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(null);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			engine.generateSTORKAuthnRequest(request);
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request null parameter.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnRequestNullParam() throws STORKSAMLEngineException {
    +		try {
    +			engine.validateSTORKAuthnRequest(null);
    +			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request error bytes encode.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnRequestErrorEncode() throws STORKSAMLEngineException {
    +		try {
    +			engine.validateSTORKAuthnRequest("messageError".getBytes());
    +			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnRequest() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		authRequest = engine.generateSTORKAuthnRequest(request).getTokenSaml();
    +
    +		final STORKAuthnRequest validatedRequest = engine.validateSTORKAuthnRequest(authRequest);
    +
    +		assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
    +		assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(), false);
    +		assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
    +
    +	}
    +
    +	/**
    +	 * Test validate data authenticate request. Verified parameters after validation.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateDataAuthnRequest() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnRequest request = engine.validateSTORKAuthnRequest(authRequest);
    +
    +		assertEquals("Sestination incorrect: ", request.getDestination(), destination);
    +
    +		assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
    +		assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
    +		assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);
    +
    +		assertEquals("Service provider incorrect: ", request.getProviderName(), spName);
    +		assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
    +		assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);
    +		assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
    +		assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
    +		assertEquals("Asserition consumer URL incorrect: ", request.getAssertionConsumerServiceURL(), assertConsumerUrl);
    +
    +		assertEquals("SP Country incorrect: ", request.getSpCountry(), spCountry);
    +		assertEquals("SP Id incorrect: ", request.getSPID(), spId);
    +		assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), "ES");
    +
    +	}
    +
    +	/**
    +	 * Test validate file authentication request. Validate from XML file.
    +	 * 
    +	 * @throws Exception
    +	 *             the exception
    +	 */
    +	@Test
    +	public final void testValidateFileAuthnRequest() throws Exception {
    +
    +		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml");
    +
    +		try {
    +			engine.validateSTORKAuthnRequest(bytes);
    +			fail("testValidateFileAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error(e.getMessage());
    +		}
    +	}
    +
    +	/**
    +	 * Test validate file authentication request tag delete.
    +	 * 
    +	 * @throws Exception
    +	 *             the exception
    +	 */
    +	@Test
    +	public final void testValidateFileAuthnRequestTagDelete() throws Exception {
    +
    +		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml");
    +
    +		try {
    +			engine.validateSTORKAuthnRequest(bytes);
    +			fail("validateSTORKAuthnRequest(...) should have thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error(e.getMessage());
    +
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request not trusted token.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnRequestNotTrustedErr1() throws STORKSAMLEngineException {
    +
    +		try {
    +			final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine.getInstance("CONF2");
    +
    +			final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +			request.setDestination(destination);
    +			request.setProviderName(spName);
    +			request.setQaa(QAAL);
    +			request.setPersonalAttributeList(pal);
    +			request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +			// news parameters
    +			request.setSpSector(spSector);
    +			request.setSpInstitution(spInstitution);
    +			request.setSpApplication(spApplication);
    +			request.setSpCountry(spCountry);
    +
    +			final byte[] authReqNotTrust = engineNotTrusted.generateSTORKAuthnRequest(request).getTokenSaml();
    +
    +			engine.validateSTORKAuthnRequest(authReqNotTrust);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("validateSTORKAuthnRequestNotTrusted(...) should not have thrown an STORKSAMLEngineException!");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication request trusted.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnRequestTrusted() throws STORKSAMLEngineException {
    +
    +		final STORKSAMLEngine engineTrusted = STORKSAMLEngine.getInstance("CONF3");
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +
    +		final byte[] authReqNotTrust = engineTrusted.generateSTORKAuthnRequest(request).getTokenSaml();
    +
    +		// engine ("CONF1") no have trust certificate from "CONF2"
    +		engine.validateSTORKAuthnRequest(authReqNotTrust);
    +
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication request error bytes encode.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnRequestErrorEncode()
    -	    throws STORKSAMLEngineException {
    -	try {
    -	    engine.validateSTORKAuthnRequest("messageError".getBytes());
    -	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request service provider application null.
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestNADA() {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(null);
    +		request.setSpInstitution(null);
    +		request.setSpApplication(null);
    +		request.setSpCountry(null);
    +
    +		try {
    +
    +			engine.validateSTORKAuthnRequest(authRequest);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication request.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnRequest() throws STORKSAMLEngineException {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -	
    -	authRequest = engine.generateSTORKAuthnRequest(request).getTokenSaml();
    -	
    -	final STORKAuthnRequest validatedRequest = engine.validateSTORKAuthnRequest(authRequest);	 
    -		
    -	assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
    -	assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(),	false);
    -	assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
    -	
    -    }
    -
    -    /**
    -     * Test validate data authenticate request. Verified parameters after
    -     * validation.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateDataAuthnRequest() throws STORKSAMLEngineException {
    -    	
    -    final STORKAuthnRequest request = engine.validateSTORKAuthnRequest(authRequest);
    -
    -	assertEquals("Sestination incorrect: ", request.getDestination(), destination);
    -	
    -	assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
    -	assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
    -	assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);	
    -
    -	assertEquals("Service provider incorrect: ", request.getProviderName(), spName);
    -	assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
    -	assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);		
    -	assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
    -	assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
    -	assertEquals("Asserition consumer URL incorrect: ", request.getAssertionConsumerServiceURL(), assertConsumerUrl);
    -				
    -	assertEquals("SP Country incorrect: ", request.getSpCountry(), spCountry);
    -	assertEquals("SP Id incorrect: ", request.getSPID(), spId);
    -	assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), "ES");
    -		
    -    }
    -
    -    /**
    -     * Test validate file authentication request. Validate from XML file.
    -     *     
    -     * @throws Exception the exception
    -     */
    -    @Test
    -    public final void testValidateFileAuthnRequest() throws Exception {
    -
    -	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml");
    -
    -	try {
    -	    engine.validateSTORKAuthnRequest(bytes);
    -        fail("testValidateFileAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error(e.getMessage());
    +
    +	/**
    +	 * Test validate authentication request with unknown elements.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnRequestWithUnknownElements() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		IPersonalAttributeList pAttList = new PersonalAttributeList();
    +
    +		final PersonalAttribute unknown = new PersonalAttribute();
    +		unknown.setName("unknown");
    +		unknown.setIsRequired(true);
    +		pAttList.add(unknown);
    +
    +		final PersonalAttribute eIdentifier = new PersonalAttribute();
    +		eIdentifier.setName("eIdentifier");
    +		eIdentifier.setIsRequired(true);
    +		pAttList.add(eIdentifier);
    +
    +		request.setPersonalAttributeList(pAttList);
    +
    +		// new parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		STORKAuthnRequest req = new STORKAuthnRequest();
    +
    +		req = engine3.generateSTORKAuthnRequest(request);
    +
    +		req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
    +
    +		assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
    +		assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
    +
     	}
    -    }
     
    -    /**
    -     * Test validate file authentication request tag delete.
    -     * 
    -     * @throws Exception the exception
    -     */
    -    @Test
    -    public final void testValidateFileAuthnRequestTagDelete() throws Exception {
    +	/**
    +	 * Test generate Request with required elements by default
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAuthnRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		IPersonalAttributeList pAttList = new PersonalAttributeList();
     
    -	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml");
    +		final PersonalAttribute eIdentifier = new PersonalAttribute();
    +		eIdentifier.setName("eIdentifier");
    +		eIdentifier.setIsRequired(true);
    +		pAttList.add(eIdentifier);
     
    -	try {
    -	    engine.validateSTORKAuthnRequest(bytes);
    -        fail("validateSTORKAuthnRequest(...) should have thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error(e.getMessage());
    +		request.setPersonalAttributeList(pAttList);
    +
    +		// new parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		STORKAuthnRequest req = new STORKAuthnRequest();
    +		STORKAuthnRequest reqTrue = new STORKAuthnRequest();
    +		STORKAuthnRequest reqFalse = new STORKAuthnRequest();
    +
    +		reqTrue = engine.generateSTORKAuthnRequest(request);
    +		reqFalse = engine2.generateSTORKAuthnRequest(request);
    +		req = engine3.generateSTORKAuthnRequest(request);
    +
    +		String token = new String(req.getTokenSaml());
    +		String reqTrueToken = new String(reqTrue.getTokenSaml());
    +		String reqFalseToken = new String(reqFalse.getTokenSaml());
    +
    +		assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
    +		assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
    +		assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
     
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication request not trusted token.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnRequestNotTrustedErr1()
    -	    throws STORKSAMLEngineException {
    -	
    -	try {
    -	    final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine
    -		    .getInstance("CONF2");
    -
    -	    final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	    request.setDestination(destination);
    -	    request.setProviderName(spName);
    -	    request.setQaa(QAAL);
    -	    request.setPersonalAttributeList(pal);
    -	    request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	    // news parameters
    -	    request.setSpSector(spSector);
    -	    request.setSpInstitution(spInstitution);
    -	    request.setSpApplication(spApplication);
    -	    request.setSpCountry(spCountry);
    -
    -	    final byte[] authReqNotTrust = engineNotTrusted
    -		    .generateSTORKAuthnRequest(request).getTokenSaml();
    -
    -	    engine.validateSTORKAuthnRequest(authReqNotTrust);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -        fail("validateSTORKAuthnRequestNotTrusted(...) should not have thrown an STORKSAMLEngineException!");
    -    }
    -    }
    -
    -    /**
    -     * Test validate authentication request trusted.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnRequestTrusted()
    -	    throws STORKSAMLEngineException {
    -
    -	final STORKSAMLEngine engineTrusted = STORKSAMLEngine
    -		.getInstance("CONF3");
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -
    -	final byte[] authReqNotTrust = engineTrusted.generateSTORKAuthnRequest(
    -		request).getTokenSaml();
    -
    -	// engine ("CONF1") no have trust certificate from "CONF2"
    -	engine.validateSTORKAuthnRequest(authReqNotTrust);
    -	
    -    }
    -    
    -    
    -    
    -    
    -    /**
    -     * Test generate authentication request service provider application null.
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestNADA() {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(null);
    -	request.setSpInstitution(null);
    -	request.setSpApplication(null);
    -	request.setSpCountry(null);
    -
    -	try {
    -	       	
    -		engine.validateSTORKAuthnRequest(authRequest);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    -	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
    +
    +	/**
    +	 * Test validating request and getting alias used to save the saml trusted certificate into trustore
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnRequestGettingItsAlias() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		IPersonalAttributeList pAttList = new PersonalAttributeList();
    +
    +		final PersonalAttribute eIdentifier = new PersonalAttribute();
    +		eIdentifier.setName("eIdentifier");
    +		eIdentifier.setIsRequired(true);
    +		pAttList.add(eIdentifier);
    +
    +		request.setPersonalAttributeList(pAttList);
    +
    +		// new parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		STORKAuthnRequest req = new STORKAuthnRequest();
    +
    +		req = engine3.generateSTORKAuthnRequest(request);
    +		req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
    +		assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
    +
    +		req = engine2.generateSTORKAuthnRequest(request);
    +		req = engine2.validateSTORKAuthnRequest(req.getTokenSaml());
    +		assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
    +
     	}
    -    }
    -    
    -    /**
    -     * Test validate authentication request with unknown elements.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnRequestWithUnknownElements() throws STORKSAMLEngineException {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	
    -	IPersonalAttributeList pAttList = new PersonalAttributeList();
    -		
    -	final PersonalAttribute unknown = new PersonalAttribute();
    -	unknown.setName("unknown");
    -	unknown.setIsRequired(true);
    -	pAttList.add(unknown);	
    -	
    -	final PersonalAttribute eIdentifier = new PersonalAttribute();
    -	eIdentifier.setName("eIdentifier");
    -	eIdentifier.setIsRequired(true);
    -	pAttList.add(eIdentifier);	
    -	
    -	request.setPersonalAttributeList(pAttList);
    -
    -	// new parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -	
    -	STORKAuthnRequest req = new STORKAuthnRequest();
    -		
    -	req  = engine3.generateSTORKAuthnRequest(request);
    -	
    -	req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
    -	
    -	assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
    -	assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
    -	
    -    }
    -    
    -    /**
    -     * Test generate Request with required elements by default
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAuthnRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	
    -	IPersonalAttributeList pAttList = new PersonalAttributeList();
    -		
    -	final PersonalAttribute eIdentifier = new PersonalAttribute();
    -	eIdentifier.setName("eIdentifier");
    -	eIdentifier.setIsRequired(true);
    -	pAttList.add(eIdentifier);	
    -	
    -	request.setPersonalAttributeList(pAttList);
    -
    -	// new parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -	
    -	STORKAuthnRequest req = new STORKAuthnRequest();
    -	STORKAuthnRequest reqTrue = new STORKAuthnRequest();
    -	STORKAuthnRequest reqFalse = new STORKAuthnRequest();
    -		
    -	reqTrue  = engine.generateSTORKAuthnRequest(request);
    -	reqFalse = engine2.generateSTORKAuthnRequest(request);
    -	req  	 = engine3.generateSTORKAuthnRequest(request);
    -	
    -	
    -	String token = new String(req.getTokenSaml());
    -	String reqTrueToken = new String(reqTrue.getTokenSaml());
    -	String reqFalseToken = new String(reqFalse.getTokenSaml());
    -	
    -	assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
    -	assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
    -	assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
    -		
    -    }
    -    
    -    /**
    -     * Test validating request and getting alias used to save 
    -     * the saml trusted certificate into trustore
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnRequestGettingItsAlias() throws STORKSAMLEngineException {
    -
    -    	final STORKAuthnRequest request = new STORKAuthnRequest();
    -
    -    	request.setDestination(destination);
    -    	request.setProviderName(spName);
    -    	request.setQaa(QAAL);
    -    	request.setPersonalAttributeList(pal);
    -    	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -    	
    -    	IPersonalAttributeList pAttList = new PersonalAttributeList();
    -    		
    -    	final PersonalAttribute eIdentifier = new PersonalAttribute();
    -    	eIdentifier.setName("eIdentifier");
    -    	eIdentifier.setIsRequired(true);
    -    	pAttList.add(eIdentifier);	
    -    	
    -    	request.setPersonalAttributeList(pAttList);
    -
    -    	// new parameters
    -    	request.setSpSector(spSector);
    -    	request.setSpInstitution(spInstitution);
    -    	request.setSpApplication(spApplication);
    -    	request.setSpCountry(spCountry);
    -    	request.setSPID(spId);
    -    	request.setCitizenCountryCode("ES");
    -    	
    -    	STORKAuthnRequest req = new STORKAuthnRequest();
    -    		
    -    	req  = engine3.generateSTORKAuthnRequest(request);
    -    	req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
    -    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
    -    	
    -    	req  = engine2.generateSTORKAuthnRequest(request);
    -    	req = engine2.validateSTORKAuthnRequest(req.getTokenSaml());
    -    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
    -    	
    -
    -		
    -    }
    -    
    +
     	/**
     	 * Test generating/validating request with signedDoc
     	 * 
    @@ -908,8 +889,7 @@ public class StorkAuthRequestTest {
     	 *             the STORKSAML engine exception
     	 */
     	@Test
    -	public final void testGenerateAuthnRequestWithSignedDoc()
    -			throws STORKSAMLEngineException {
    +	public final void testGenerateAuthnRequestWithSignedDoc() throws STORKSAMLEngineException {
     
     		String signedDocRequest = "VGVzdCB0ZXh0";
     
    @@ -958,10 +938,7 @@ public class StorkAuthRequestTest {
     		req = engine.generateSTORKAuthnRequest(request);
     		req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
     
    -		assertTrue("SignedDoc request should be the same: ", req
    -				.getPersonalAttributeList().get("signedDoc").getValue().get(0)
    -				.equals(signedDocRequest));
    -		
    +		assertTrue("SignedDoc request should be the same: ", req.getPersonalAttributeList().get("signedDoc").getValue().get(0).equals(signedDocRequest));
     
     	}
     
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java
    index 46904788f..e05c660ea 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java
    @@ -15,75 +15,74 @@ import eu.stork.peps.auth.commons.STORKLogoutRequest;
     import eu.stork.peps.auth.engine.STORKSAMLEngine;
     import eu.stork.peps.exceptions.STORKSAMLEngineException;
     
    -
     public class StorkLogoutRequestTest {
    -	
    -	/** The engines. */	
    -    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    -    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    -    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
    -    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    -    
    -    public StorkLogoutRequestTest() {           
    -    	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    -    	spUserId = "IS/IS/1234567890";
    -    }
    -
    -    /** The destination. */
    -    private String destination;
    -   
    -    /** The user id. */
    -    private String spUserId;
    -    
    -    /** The logout request. */
    -    private static byte[] logoutRequest;
    -
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(StorkLogoutRequestTest.class.getName());
    -
    -    /** Parser manager used to parse XML. */
    -    private static BasicParserPool parser;
    -
    -    static {
    +
    +	/** The engines. */
    +	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    +	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    +	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
    +	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    +
    +	public StorkLogoutRequestTest() {
    +		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    +		spUserId = "IS/IS/1234567890";
    +	}
    +
    +	/** The destination. */
    +	private String destination;
    +
    +	/** The user id. */
    +	private String spUserId;
    +
    +	/** The logout request. */
    +	private static byte[] logoutRequest;
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(StorkLogoutRequestTest.class.getName());
    +
    +	/** Parser manager used to parse XML. */
    +	private static BasicParserPool parser;
    +
    +	static {
     		parser = new BasicParserPool();
     		parser.setNamespaceAware(true);
    -    }
    -    
    -    /**
    -     * Test generate authentication request.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
    -
    -	final STORKLogoutRequest request = new STORKLogoutRequest();
    -
    -	request.setDestination(destination);	
    -
    -	request.setSpProvidedId(spUserId);
    -
    -	STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
    -	byte[] reqByte = req1.getTokenSaml();
    -	FileOutputStream output = null;
    -	
    -	try {
    -		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutRequest.xml"));
    -	} catch (FileNotFoundException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
     	}
    -	try {
    -		output.write(reqByte);
    -	} catch (IOException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    +
    +	/**
    +	 * Test generate authentication request.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
    +
    +		final STORKLogoutRequest request = new STORKLogoutRequest();
    +
    +		request.setDestination(destination);
    +
    +		request.setSpProvidedId(spUserId);
    +
    +		STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
    +		byte[] reqByte = req1.getTokenSaml();
    +		FileOutputStream output = null;
    +
    +		try {
    +			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutRequest.xml"));
    +		} catch (FileNotFoundException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +		try {
    +			output.write(reqByte);
    +		} catch (IOException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +
    +		LOG.info("STORKAttrQueryRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
    +
    +		LOG.info("STORKAttrQueryRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
     	}
    -	
    -	LOG.info("STORKAttrQueryRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
    -	
    -	LOG.info("STORKAttrQueryRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
    -    }
     
     }
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java
    index 2d05e04aa..b9907002a 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java
    @@ -19,124 +19,123 @@ import eu.stork.peps.auth.commons.STORKLogoutResponse;
     import eu.stork.peps.auth.engine.STORKSAMLEngine;
     import eu.stork.peps.exceptions.STORKSAMLEngineException;
     
    -
     public class StorkLogoutResponseTest {
    -	
    -	/** The engines. */	
    -    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    -    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    -    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
    -    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    -    
    -    public StorkLogoutResponseTest() {           
    -    	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    -    	spUserId = "IS/IS/1234567890";
    -    }
    -
    -    /** The destination. */
    -    private String destination;
    -   
    -    /** The user id. */
    -    private String spUserId;
    -    
    -    /** The logout request. */
    -    private static byte[] logoutRequest;
    -    
    -    /** The logout response. */
    -    private static byte[] logoutResponse;
    -
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(StorkLogoutResponseTest.class.getName());
    -
    -    /** Parser manager used to parse XML. */
    -    private static BasicParserPool parser;
    -
    -    static {
    +
    +	/** The engines. */
    +	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    +	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    +	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
    +	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
    +
    +	public StorkLogoutResponseTest() {
    +		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    +		spUserId = "IS/IS/1234567890";
    +	}
    +
    +	/** The destination. */
    +	private String destination;
    +
    +	/** The user id. */
    +	private String spUserId;
    +
    +	/** The logout request. */
    +	private static byte[] logoutRequest;
    +
    +	/** The logout response. */
    +	private static byte[] logoutResponse;
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(StorkLogoutResponseTest.class.getName());
    +
    +	/** Parser manager used to parse XML. */
    +	private static BasicParserPool parser;
    +
    +	static {
     		parser = new BasicParserPool();
     		parser.setNamespaceAware(true);
    -    }
    -    
    -    /**
    -     * Test generate authentication request.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
    -
    -	final STORKLogoutRequest request = new STORKLogoutRequest();
    -	
    -	final STORKLogoutResponse response = new STORKLogoutResponse();
    -
    -	request.setDestination(destination);
    -	response.setDestination(destination);
    -
    -	request.setSpProvidedId(spUserId);
    -
    -	STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
    -	
    -	STORKLogoutResponse res = engine0.generateSTORKLogoutResponse(req1, response);
    -	
    -	byte[] reqByte = res.getTokenSaml();
    -	FileOutputStream output = null;
    -	
    -	try {
    -		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponse.xml"));
    -	} catch (FileNotFoundException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    -	}
    -	try {
    -		output.write(reqByte);
    -	} catch (IOException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
     	}
    -		
    -	
    +
    +	/**
    +	 * Test generate authentication request.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
    +
    +		final STORKLogoutRequest request = new STORKLogoutRequest();
    +
    +		final STORKLogoutResponse response = new STORKLogoutResponse();
    +
    +		request.setDestination(destination);
    +		response.setDestination(destination);
    +
    +		request.setSpProvidedId(spUserId);
    +
    +		STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
    +
    +		STORKLogoutResponse res = engine0.generateSTORKLogoutResponse(req1, response);
    +
    +		byte[] reqByte = res.getTokenSaml();
    +		FileOutputStream output = null;
    +
    +		try {
    +			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponse.xml"));
    +		} catch (FileNotFoundException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +		try {
    +			output.write(reqByte);
    +		} catch (IOException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +
     		assertNotNull(reqByte);
    -    }
    -    
    -    /**
    -     * Test generate authentication request.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateLogoutRequestFail() throws STORKSAMLEngineException {
    -
    -	final STORKLogoutRequest request = new STORKLogoutRequest();
    -	
    -	final STORKLogoutResponse response = new STORKLogoutResponse();
    -
    -	request.setDestination(destination);
    -	response.setDestination(destination);
    -	response.setStatusMessage("User not found.");
    -	response.setStatusCode("1234");
    -	request.setSpProvidedId(spUserId);
    -
    -	STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
    -	
    -	STORKLogoutResponse res = engine0.generateSTORKLogoutResponseFail(req1, response);
    -	
    -	byte[] reqByte = res.getTokenSaml();
    -	FileOutputStream output = null;
    -	
    -	try {
    -		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponseFail.xml"));
    -	} catch (FileNotFoundException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
    -	}
    -	try {
    -		output.write(reqByte);
    -	} catch (IOException e) {
    -		// TODO Auto-generated catch block
    -		e.printStackTrace();
     	}
    -	
    +
    +	/**
    +	 * Test generate authentication request.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateLogoutRequestFail() throws STORKSAMLEngineException {
    +
    +		final STORKLogoutRequest request = new STORKLogoutRequest();
    +
    +		final STORKLogoutResponse response = new STORKLogoutResponse();
    +
    +		request.setDestination(destination);
    +		response.setDestination(destination);
    +		response.setStatusMessage("User not found.");
    +		response.setStatusCode("1234");
    +		request.setSpProvidedId(spUserId);
    +
    +		STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
    +
    +		STORKLogoutResponse res = engine0.generateSTORKLogoutResponseFail(req1, response);
    +
    +		byte[] reqByte = res.getTokenSaml();
    +		FileOutputStream output = null;
    +
    +		try {
    +			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponseFail.xml"));
    +		} catch (FileNotFoundException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +		try {
    +			output.write(reqByte);
    +		} catch (IOException e) {
    +			// TODO Auto-generated catch block
    +			e.printStackTrace();
    +		}
    +
     		assertNotNull(reqByte);
    -    }
    +	}
     
     }
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java
    index 62e9cfb18..876c2c14d 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java
    @@ -27,382 +27,370 @@ import eu.stork.peps.auth.commons.STORKStatusCode;
     import eu.stork.peps.auth.engine.STORKSAMLEngine;
     import eu.stork.peps.exceptions.STORKSAMLEngineException;
     
    -
     public class StorkNewResponseTest {
     	/** The engine. */
    -    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    -    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    -
    -    /**
    -     * Gets the engine.
    -     * 
    -     * @return the engine
    -     */
    -    public static STORKSAMLEngine getEngine() {
    -        return engine;
    -    }
    -    
    -    public static STORKSAMLEngine getEngine2() {
    -        return engine0;
    -    }
    -
    -    /**
    -     * Sets the engine.
    -     * 
    -     * @param newEngine the new engine
    -     */
    -    public static void setEngine(final STORKSAMLEngine newEngine) {
    -    	StorkNewResponseTest.engine = newEngine;
    -    }
    -
    -    /** The destination. */
    -    private static String destination;
    -
    -    /** The service provider name. */
    -    private static String spName;
    -
    -    /** The service provider sector. */
    -    private static String spSector;
    -
    -    /** The service provider institution. */
    -    private static String spInstitution;
    -
    -    /** The service provider application. */
    -    private static String spApplication;
    -
    -    /** The service provider country. */
    -    private static String spCountry;
    -    
    -    /** The service provider id. */
    -    private static String spId;
    -
    -    /** The quality authentication assurance level. */
    -    private static final int QAAL = 3;
    -
    -    /** The state. */
    -    private static String state = "ES";
    -    
    -    /** The town. */
    -    private static String town = "Madrid";
    -    
    -    /** The municipality code. */
    -    private static String municipalityCode = "MA001";
    -    
    -    /** The postal code. */
    -    private static String postalCode = "28038";
    -    
    -    /** The street name. */
    -    private static String streetName = "Marchamalo";
    -    
    -    /** The street number. */
    -    private static String streetNumber = "3";
    -    
    -    /** The apartament number. */
    -    private static String apartamentNumber = "5º E";
    -
    -    /** The List of Personal Attributes. */
    -    private static IPersonalAttributeList pal;    
    -    
    -    /** The List of Personal Attributes. */
    -    private static IPersonalAttributeList pal2;
    -
    -    /** The assertion consumer URL. */
    -    private static String assertConsumerUrl;
    -
    -    /** The authentication request. */
    -    private static byte[] authRequest;
    -
    -    /** The authentication response. */
    -    private static byte[] authResponse;
    -
    -    /** The authentication request. */
    -    private static STORKAuthnRequest authenRequest;
    -
    -    /** The authentication response. */
    -    private static STORKAuthnResponse authnResponse;
    -
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(StorkResponseTest.class.getName());
    -
    -    /**
    -     * Instantiates a new stork response test.
    -     */
    -    public StorkNewResponseTest() {
    -	super();
    -    }
    -
    -    /** The IP address. */
    -    private static String ipAddress;
    -
    -    /** The is hashing. */
    -    private final boolean isHashing = Boolean.TRUE;
    -
    -    /** The is not hashing. */
    -    private final boolean isNotHashing = Boolean.FALSE;
    -
    -    /** The ERROR text. */
    -    private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
    -
    -
    -    /** Parser manager used to parse XML. */
    -    private static BasicParserPool parser;
    -    
    -    /** The attribute query request. */
    -    private static STORKAttrQueryRequest attrQueryenRequest;
    -
    -    /** The attribute query response. */
    -    private static STORKAttrQueryResponse attrQeuryenResponse;
    -    
    -    /** The attribute query request. */
    -    private static byte[] attrQueryRequest;
    -    
    -    /** The attribute query response. */
    -    private static byte[] attrQueryResponse;
    -    
    -    
    -
    -    static {
    -	parser = new BasicParserPool();
    -	parser.setNamespaceAware(true);
    -
    -	pal = new PersonalAttributeList();
    -	pal2 = new PersonalAttributeList();
    -
    -	PersonalAttribute isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(false);
    -	ArrayList ages = new ArrayList();
    -	ages.add("16");
    -	ages.add("18");
    -	isAgeOver.setValue(ages);
    -	pal.add(isAgeOver);
    -
    -	PersonalAttribute dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	pal.add(dateOfBirth);
    -
    -	PersonalAttribute eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -	pal.add(eIDNumber);
    -
    -	final PersonalAttribute givenName = new PersonalAttribute();
    -	givenName.setName("givenName");
    -	givenName.setIsRequired(true);
    -	pal.add(givenName);
    -
    -	PersonalAttribute canRessAddress = new PersonalAttribute();
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	pal.add(canRessAddress);
    -	
    -	PersonalAttribute newAttribute = new PersonalAttribute();
    -	newAttribute.setName("newAttribute2");
    -	newAttribute.setIsRequired(true);
    -	pal.add(newAttribute);
    -	
    -	PersonalAttribute hasDegree = new PersonalAttribute();
    -	hasDegree.setName("hasDegree");
    -	List vals = new ArrayList();
    -	vals.add("Engineering");
    -	vals.add("Computer Science");
    -	hasDegree.setValue(vals);
    -	pal2.add(hasDegree);
    -	
    -	PersonalAttribute mandate = new PersonalAttribute();
    -	mandate.setName("mandateContent");
    -	List manvalues = new ArrayList();
    -	manvalues.add("Powers");
    -	mandate.setValue(manvalues);
    -	pal2.add(mandate);
    -
    -	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    -	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    -	spName = "University Oxford";
    -	
    -	spName = "University of Oxford";
    -	spSector = "EDU001";
    -	spInstitution = "OXF001";
    -	spApplication = "APP001";
    -	spCountry = "EN";
    -	
    -	spId = "EDU001-APP001-APP001";
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    authRequest = getEngine().generateSTORKAuthnRequest(request)
    -		    .getTokenSaml();
    -	    	    
    -	    authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    fail("Error create STORKAuthnRequest");
    +	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    +	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
    +
    +	/**
    +	 * Gets the engine.
    +	 * 
    +	 * @return the engine
    +	 */
    +	public static STORKSAMLEngine getEngine() {
    +		return engine;
    +	}
    +
    +	public static STORKSAMLEngine getEngine2() {
    +		return engine0;
     	}
     
    -	ipAddress = "111.222.333.444";
    -
    -	pal = new PersonalAttributeList();
    -
    -	isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(true);
    -	ages = new ArrayList();
    -
    -	ages.add("16");
    -	ages.add("18");
    -
    -	isAgeOver.setValue(ages);
    -	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(isAgeOver);
    -
    -	dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	final ArrayList date = new ArrayList();
    -	date.add("16/12/2008");
    -	dateOfBirth.setValue(date);
    -	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(dateOfBirth);
    -
    -	eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -	final ArrayList idNumber = new ArrayList();
    -	idNumber.add("123456789PA");
    -	eIDNumber.setValue(idNumber);
    -	eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(eIDNumber);
    -
    -	canRessAddress = new PersonalAttribute();
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap address = new HashMap();
    -
    -	address.put("state", state);
    -	address.put("municipalityCode", municipalityCode);
    -	address.put("town", town);
    -	address.put("postalCode", postalCode);
    -	address.put("streetName", streetName);
    -	address.put("streetNumber", streetNumber);
    -	address.put("apartamentNumber", apartamentNumber);
    -
    -	canRessAddress.setComplexValue(address);
    -	pal.add(canRessAddress);
    -    
    -	newAttribute = new PersonalAttribute();
    -	newAttribute.setName("newAttribute2");
    -	newAttribute.setIsRequired(true);
    -	newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap values = new HashMap();
    -	
    -	values.put("value1", "value1");
    -	values.put("value2", "value2");
    -	values.put("value3", "value3");
    -	values.put("value4", "value4");
    -	
    -	newAttribute.setComplexValue(values);
    -	pal.add(newAttribute);
    -	
    -	final STORKAttrQueryRequest arequest = new STORKAttrQueryRequest();
    -	arequest.setDestination(destination);
    -	//request.setProviderName(spName);
    -	arequest.setQaa(QAAL);
    -	arequest.setPersonalAttributeList(pal2);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	arequest.setSpSector(spSector);
    -	arequest.setSpInstitution(spInstitution);
    -	arequest.setSpApplication(spApplication);
    -	arequest.setSpCountry(spCountry);
    -	arequest.setSPID(spId);
    -	arequest.setCitizenCountryCode("IS");
    -	arequest.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	try {
    -	    attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(arequest)
    -		    .getTokenSaml();
    -	    	    
    -	    attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    fail("Error create STORKAuthnRequest");
    +	/**
    +	 * Sets the engine.
    +	 * 
    +	 * @param newEngine
    +	 *            the new engine
    +	 */
    +	public static void setEngine(final STORKSAMLEngine newEngine) {
    +		StorkNewResponseTest.engine = newEngine;
     	}
    -	
    -    }
    -
    -    /**
    -     * Test generate authentication request without errors.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAuthnResponseWithSimpleRes() throws STORKSAMLEngineException {
    -
    -    	//Create the response holding pal
    +
    +	/** The destination. */
    +	private static String destination;
    +
    +	/** The service provider name. */
    +	private static String spName;
    +
    +	/** The service provider sector. */
    +	private static String spSector;
    +
    +	/** The service provider institution. */
    +	private static String spInstitution;
    +
    +	/** The service provider application. */
    +	private static String spApplication;
    +
    +	/** The service provider country. */
    +	private static String spCountry;
    +
    +	/** The service provider id. */
    +	private static String spId;
    +
    +	/** The quality authentication assurance level. */
    +	private static final int QAAL = 3;
    +
    +	/** The state. */
    +	private static String state = "ES";
    +
    +	/** The town. */
    +	private static String town = "Madrid";
    +
    +	/** The municipality code. */
    +	private static String municipalityCode = "MA001";
    +
    +	/** The postal code. */
    +	private static String postalCode = "28038";
    +
    +	/** The street name. */
    +	private static String streetName = "Marchamalo";
    +
    +	/** The street number. */
    +	private static String streetNumber = "3";
    +
    +	/** The apartament number. */
    +	private static String apartamentNumber = "5º E";
    +
    +	/** The List of Personal Attributes. */
    +	private static IPersonalAttributeList pal;
    +
    +	/** The List of Personal Attributes. */
    +	private static IPersonalAttributeList pal2;
    +
    +	/** The assertion consumer URL. */
    +	private static String assertConsumerUrl;
    +
    +	/** The authentication request. */
    +	private static byte[] authRequest;
    +
    +	/** The authentication response. */
    +	private static byte[] authResponse;
    +
    +	/** The authentication request. */
    +	private static STORKAuthnRequest authenRequest;
    +
    +	/** The authentication response. */
    +	private static STORKAuthnResponse authnResponse;
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(StorkResponseTest.class.getName());
    +
    +	/**
    +	 * Instantiates a new stork response test.
    +	 */
    +	public StorkNewResponseTest() {
    +		super();
    +	}
    +
    +	/** The IP address. */
    +	private static String ipAddress;
    +
    +	/** The is hashing. */
    +	private final boolean isHashing = Boolean.TRUE;
    +
    +	/** The is not hashing. */
    +	private final boolean isNotHashing = Boolean.FALSE;
    +
    +	/** The ERROR text. */
    +	private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
    +
    +	/** Parser manager used to parse XML. */
    +	private static BasicParserPool parser;
    +
    +	/** The attribute query request. */
    +	private static STORKAttrQueryRequest attrQueryenRequest;
    +
    +	/** The attribute query response. */
    +	private static STORKAttrQueryResponse attrQeuryenResponse;
    +
    +	/** The attribute query request. */
    +	private static byte[] attrQueryRequest;
    +
    +	/** The attribute query response. */
    +	private static byte[] attrQueryResponse;
    +
    +	static {
    +		parser = new BasicParserPool();
    +		parser.setNamespaceAware(true);
    +
    +		pal = new PersonalAttributeList();
    +		pal2 = new PersonalAttributeList();
    +
    +		PersonalAttribute isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(false);
    +		ArrayList ages = new ArrayList();
    +		ages.add("16");
    +		ages.add("18");
    +		isAgeOver.setValue(ages);
    +		pal.add(isAgeOver);
    +
    +		PersonalAttribute dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		pal.add(dateOfBirth);
    +
    +		PersonalAttribute eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +		pal.add(eIDNumber);
    +
    +		final PersonalAttribute givenName = new PersonalAttribute();
    +		givenName.setName("givenName");
    +		givenName.setIsRequired(true);
    +		pal.add(givenName);
    +
    +		PersonalAttribute canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		pal.add(canRessAddress);
    +
    +		PersonalAttribute newAttribute = new PersonalAttribute();
    +		newAttribute.setName("newAttribute2");
    +		newAttribute.setIsRequired(true);
    +		pal.add(newAttribute);
    +
    +		PersonalAttribute hasDegree = new PersonalAttribute();
    +		hasDegree.setName("hasDegree");
    +		List vals = new ArrayList();
    +		vals.add("Engineering");
    +		vals.add("Computer Science");
    +		hasDegree.setValue(vals);
    +		pal2.add(hasDegree);
    +
    +		PersonalAttribute mandate = new PersonalAttribute();
    +		mandate.setName("mandateContent");
    +		List manvalues = new ArrayList();
    +		manvalues.add("Powers");
    +		mandate.setValue(manvalues);
    +		pal2.add(mandate);
    +
    +		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    +		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    +		spName = "University Oxford";
    +
    +		spName = "University of Oxford";
    +		spSector = "EDU001";
    +		spInstitution = "OXF001";
    +		spApplication = "APP001";
    +		spCountry = "EN";
    +
    +		spId = "EDU001-APP001-APP001";
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			authRequest = getEngine().generateSTORKAuthnRequest(request).getTokenSaml();
    +
    +			authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			fail("Error create STORKAuthnRequest");
    +		}
    +
    +		ipAddress = "111.222.333.444";
    +
    +		pal = new PersonalAttributeList();
    +
    +		isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(true);
    +		ages = new ArrayList();
    +
    +		ages.add("16");
    +		ages.add("18");
    +
    +		isAgeOver.setValue(ages);
    +		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(isAgeOver);
    +
    +		dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		final ArrayList date = new ArrayList();
    +		date.add("16/12/2008");
    +		dateOfBirth.setValue(date);
    +		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(dateOfBirth);
    +
    +		eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +		final ArrayList idNumber = new ArrayList();
    +		idNumber.add("123456789PA");
    +		eIDNumber.setValue(idNumber);
    +		eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(eIDNumber);
    +
    +		canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap address = new HashMap();
    +
    +		address.put("state", state);
    +		address.put("municipalityCode", municipalityCode);
    +		address.put("town", town);
    +		address.put("postalCode", postalCode);
    +		address.put("streetName", streetName);
    +		address.put("streetNumber", streetNumber);
    +		address.put("apartamentNumber", apartamentNumber);
    +
    +		canRessAddress.setComplexValue(address);
    +		pal.add(canRessAddress);
    +
    +		newAttribute = new PersonalAttribute();
    +		newAttribute.setName("newAttribute2");
    +		newAttribute.setIsRequired(true);
    +		newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap values = new HashMap();
    +
    +		values.put("value1", "value1");
    +		values.put("value2", "value2");
    +		values.put("value3", "value3");
    +		values.put("value4", "value4");
    +
    +		newAttribute.setComplexValue(values);
    +		pal.add(newAttribute);
    +
    +		final STORKAttrQueryRequest arequest = new STORKAttrQueryRequest();
    +		arequest.setDestination(destination);
    +		// request.setProviderName(spName);
    +		arequest.setQaa(QAAL);
    +		arequest.setPersonalAttributeList(pal2);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		arequest.setSpSector(spSector);
    +		arequest.setSpInstitution(spInstitution);
    +		arequest.setSpApplication(spApplication);
    +		arequest.setSpCountry(spCountry);
    +		arequest.setSPID(spId);
    +		arequest.setCitizenCountryCode("IS");
    +		arequest.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		try {
    +			attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(arequest).getTokenSaml();
    +
    +			attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			fail("Error create STORKAuthnRequest");
    +		}
    +
    +	}
    +
    +	/**
    +	 * Test generate authentication request without errors.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAuthnResponseWithSimpleRes() throws STORKSAMLEngineException {
    +
    +		// Create the response holding pal
     		final STORKAuthnResponse response = new STORKAuthnResponse();
     		response.setPersonalAttributeList(pal);
    -		
    -		//List of query responses
    +
    +		// List of query responses
     		List resList = new ArrayList();
    -		
    +
     		final STORKAttrQueryResponse aResponse1 = new STORKAttrQueryResponse();
     		aResponse1.setPersonalAttributeList(pal2);
    -	
    -		final STORKAttrQueryResponse aStorkResponse1 = getEngine2()
    -			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress,
    -					destination, isNotHashing);
    -	
    +
    +		final STORKAttrQueryResponse aStorkResponse1 = getEngine2().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress, destination, isNotHashing);
    +
     		attrQueryResponse = aStorkResponse1.getTokenSaml();
    -			
    +
     		resList.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
    -		
    +
     		final STORKAttrQueryResponse aResponse2 = new STORKAttrQueryResponse();
     		aResponse2.setPersonalAttributeList(pal2);
    -	
    -		final STORKAttrQueryResponse aStorkResponse2 = getEngine()
    -			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress,
    -					destination, isNotHashing);
    -	
    +
    +		final STORKAttrQueryResponse aStorkResponse2 = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress, destination, isNotHashing);
    +
     		attrQueryResponse = aStorkResponse2.getTokenSaml();
    -			
    +
     		resList.add(getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
    -		
    -		//Create the final response containing query responses
    -		final STORKAuthnResponse storkResponse = getEngine()
    -		.generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress,
    -			isNotHashing, resList);
    +
    +		// Create the final response containing query responses
    +		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress, isNotHashing, resList);
     
     		authResponse = storkResponse.getTokenSaml();
    -		
    -		//Validate, write out and print out the attribute lists a
    +
    +		// Validate, write out and print out the attribute lists a
     		STORKAuthnResponse finalResponse = getEngine().validateSTORKAuthnResponseWithQuery(authResponse, ipAddress);
     		System.out.println("The original pal: " + finalResponse.getPersonalAttributeList().toString());
    -		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++)
    -		{
    -			System.out.println("Pal "+ Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
    +		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++) {
    +			System.out.println("Pal " + Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
     		}
     		System.out.println("The total pal: " + finalResponse.getTotalPersonalAttributeList().toString());
    -		
    +
     		FileOutputStream output = null;
    -		
    +
     		try {
     			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthAttrQResponse.xml"));
     		} catch (FileNotFoundException e) {
    @@ -415,107 +403,96 @@ public class StorkNewResponseTest {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
     		}
    -    }
    -    
    -    /**
    -     * Test generate authentication request without errors.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAuthnResponseWithComplexRes() throws STORKSAMLEngineException {
    -    	
    -    	//Create the response holding pal
    +	}
    +
    +	/**
    +	 * Test generate authentication request without errors.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAuthnResponseWithComplexRes() throws STORKSAMLEngineException {
    +
    +		// Create the response holding pal
     		final STORKAuthnResponse response = new STORKAuthnResponse();
     		response.setPersonalAttributeList(pal);
    -		
    -		//Create a list for the attribute query responses we have
    +
    +		// Create a list for the attribute query responses we have
     		List resList = new ArrayList();
    -		
    -		//Create the first attribute query response
    +
    +		// Create the first attribute query response
     		final STORKAttrQueryResponse aResponse1 = new STORKAttrQueryResponse();
     		aResponse1.setPersonalAttributeList(pal2);
    -	
    -		//Generate the first response
    -		final STORKAttrQueryResponse aStorkResponse1 = getEngine2()
    -			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress,
    -					destination, isNotHashing);
    -	
    +
    +		// Generate the first response
    +		final STORKAttrQueryResponse aStorkResponse1 = getEngine2().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress, destination, isNotHashing);
    +
     		attrQueryResponse = aStorkResponse1.getTokenSaml();
    -			
    -		//Validate it and add to the response list
    +
    +		// Validate it and add to the response list
     		resList.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
    -		
    -		//Create a second response like the first
    +
    +		// Create a second response like the first
     		final STORKAttrQueryResponse aResponse2 = new STORKAttrQueryResponse();
     		aResponse2.setPersonalAttributeList(pal2);
    -	
    -		final STORKAttrQueryResponse aStorkResponse2 = getEngine()
    -			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress,
    -					destination, isNotHashing);
    -	
    +
    +		final STORKAttrQueryResponse aStorkResponse2 = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress, destination, isNotHashing);
    +
     		attrQueryResponse = aStorkResponse2.getTokenSaml();
    -			
    +
     		resList.add(getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
    -		
    -		//Create a attribute query response which contains multiple assertions from an AP
    +
    +		// Create a attribute query response which contains multiple assertions from an AP
     		final STORKAttrQueryResponse aResponseMulti = new STORKAttrQueryResponse();
     		aResponseMulti.setPersonalAttributeList(pal2);
    -	
    -		//Create a list for the responses which the multiple assertion response will hold 
    +
    +		// Create a list for the responses which the multiple assertion response will hold
     		List multiResponses = new ArrayList();
    -			
    -		//Create two more simple responses which the multi assertion response will hold
    +
    +		// Create two more simple responses which the multi assertion response will hold
     		final STORKAttrQueryResponse aResponse3 = new STORKAttrQueryResponse();
     		aResponse3.setPersonalAttributeList(pal2);
    -	
    -		final STORKAttrQueryResponse aStorkResponse3 = getEngine2()
    -			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse3, ipAddress,
    -					destination, isNotHashing);
    -	
    +
    +		final STORKAttrQueryResponse aStorkResponse3 = getEngine2().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse3, ipAddress, destination, isNotHashing);
    +
     		attrQueryResponse = aStorkResponse3.getTokenSaml();
    -		//Validate and add to the multi response 	
    +		// Validate and add to the multi response
     		multiResponses.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
    -		
    +
     		final STORKAttrQueryResponse aResponse4 = new STORKAttrQueryResponse();
     		aResponse4.setPersonalAttributeList(pal2);
    -	
    -		final STORKAttrQueryResponse aStorkResponse4 = getEngine()
    -			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse4, ipAddress,
    -					destination, isNotHashing);
    -	
    +
    +		final STORKAttrQueryResponse aStorkResponse4 = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse4, ipAddress, destination, isNotHashing);
    +
     		attrQueryResponse = aStorkResponse4.getTokenSaml();
    -		
    +
     		multiResponses.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
    -		
    -		//Generate the multi assertion query response
    -		final STORKAttrQueryResponse aStorkResponseMulti = getEngine()
    -		.generateSTORKAttrQueryResponseWithAssertions(attrQueryenRequest, aResponseMulti, multiResponses, 
    -				ipAddress, destination, isNotHashing);
    -	
    +
    +		// Generate the multi assertion query response
    +		final STORKAttrQueryResponse aStorkResponseMulti = getEngine().generateSTORKAttrQueryResponseWithAssertions(attrQueryenRequest, aResponseMulti, multiResponses, ipAddress, destination,
    +				isNotHashing);
    +
     		attrQueryResponse = aStorkResponseMulti.getTokenSaml();
    -		
    -		//Add to the list of query responses
    +
    +		// Add to the list of query responses
     		resList.add(getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
    -		
    -		//Generate the stork response with all the query responses
    -		final STORKAuthnResponse storkResponse = getEngine()
    -		.generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress,
    -			isNotHashing, resList);
    +
    +		// Generate the stork response with all the query responses
    +		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress, isNotHashing, resList);
     
     		authResponse = storkResponse.getTokenSaml();
    -		
    -		//Validate it, write out and print out the personal attribute lists
    +
    +		// Validate it, write out and print out the personal attribute lists
     		STORKAuthnResponse finalResponse = getEngine().validateSTORKAuthnResponseWithQuery(authResponse, ipAddress);
     		System.out.println("The original pal: " + finalResponse.getPersonalAttributeList().toString());
    -		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++)
    -		{
    -			System.out.println("Pal "+ Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
    +		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++) {
    +			System.out.println("Pal " + Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
     		}
     		System.out.println("The total pal: " + finalResponse.getTotalPersonalAttributeList().toString());
    -		
    +
     		FileOutputStream output = null;
    -		
    +
     		try {
     			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthAttrQMultiAssertResponse.xml"));
     		} catch (FileNotFoundException e) {
    @@ -529,5 +506,5 @@ public class StorkNewResponseTest {
     			e.printStackTrace();
     		}
     		assertNotNull(finalResponse);
    -    }
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java
    index fe6fcd4f6..d09ed7648 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java
    @@ -49,839 +49,783 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
      * The Class AuthRequestTest.
      */
     public class StorkResponseTest {
    -    
    -    /** The engine. */
    -    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    -
    -    /**
    -     * Gets the engine.
    -     * 
    -     * @return the engine
    -     */
    -    public static STORKSAMLEngine getEngine() {
    -        return engine;
    -    }
    -
    -    /**
    -     * Sets the engine.
    -     * 
    -     * @param newEngine the new engine
    -     */
    -    public static void setEngine(final STORKSAMLEngine newEngine) {
    -        StorkResponseTest.engine = newEngine;
    -    }
    -
    -    /** The destination. */
    -    private static String destination;
    -
    -    /** The service provider name. */
    -    private static String spName;
    -
    -    /** The service provider sector. */
    -    private static String spSector;
    -
    -    /** The service provider institution. */
    -    private static String spInstitution;
    -
    -    /** The service provider application. */
    -    private static String spApplication;
    -
    -    /** The service provider country. */
    -    private static String spCountry;
    -    
    -    /** The service provider id. */
    -    private static String spId;
    -
    -    /** The quality authentication assurance level. */
    -    private static final int QAAL = 3;
    -
    -    /** The state. */
    -    private static String state = "ES";
    -    
    -    /** The town. */
    -    private static String town = "Madrid";
    -    
    -    /** The municipality code. */
    -    private static String municipalityCode = "MA001";
    -    
    -    /** The postal code. */
    -    private static String postalCode = "28038";
    -    
    -    /** The street name. */
    -    private static String streetName = "Marchamalo";
    -    
    -    /** The street number. */
    -    private static String streetNumber = "3";
    -    
    -    /** The apartament number. */
    -    private static String apartamentNumber = "5º E";
    -
    -    /** The List of Personal Attributes. */
    -    private static IPersonalAttributeList pal;
    -
    -    /** The assertion consumer URL. */
    -    private static String assertConsumerUrl;
    -
    -    /** The authentication request. */
    -    private static byte[] authRequest;
    -
    -    /** The authentication response. */
    -    private static byte[] authResponse;
    -
    -    /** The authentication request. */
    -    private static STORKAuthnRequest authenRequest;
    -
    -    /** The authentication response. */
    -    private static STORKAuthnResponse authnResponse;
    -
    -    /** The Constant LOG. */
    -    private static final Logger LOG = LoggerFactory
    -	    .getLogger(StorkResponseTest.class.getName());
    -
    -    /**
    -     * Instantiates a new stork response test.
    -     */
    -    public StorkResponseTest() {
    -	super();
    -    }
    -
    -    /** The IP address. */
    -    private static String ipAddress;
    -
    -    /** The is hashing. */
    -    private final boolean isHashing = Boolean.TRUE;
    -
    -    /** The is not hashing. */
    -    private final boolean isNotHashing = Boolean.FALSE;
    -
    -    /** The ERROR text. */
    -    private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
    -
    -
    -    /** Parser manager used to parse XML. */
    -    private static BasicParserPool parser;
    -
    -    static {
    -	parser = new BasicParserPool();
    -	parser.setNamespaceAware(true);
    -
    -	pal = new PersonalAttributeList();
    -
    -	PersonalAttribute isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(false);
    -	ArrayList ages = new ArrayList();
    -	ages.add("16");
    -	ages.add("18");
    -	isAgeOver.setValue(ages);
    -	pal.add(isAgeOver);
    -
    -	PersonalAttribute dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	pal.add(dateOfBirth);
    -
    -	PersonalAttribute eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -	pal.add(eIDNumber);
    -
    -	final PersonalAttribute givenName = new PersonalAttribute();
    -	givenName.setName("givenName");
    -	givenName.setIsRequired(true);
    -	pal.add(givenName);
    -
    -	PersonalAttribute canRessAddress = new PersonalAttribute();
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	pal.add(canRessAddress);
    -	
    -	PersonalAttribute newAttribute = new PersonalAttribute();
    -	newAttribute.setName("newAttribute2");
    -	newAttribute.setIsRequired(true);
    -	pal.add(newAttribute);
    -
    -	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    -	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    -	spName = "University Oxford";
    -	
    -	spName = "University of Oxford";
    -	spSector = "EDU001";
    -	spInstitution = "OXF001";
    -	spApplication = "APP001";
    -	spCountry = "EN";
    -	
    -	spId = "EDU001-APP001-APP001";	
    -
    -	final STORKAuthnRequest request = new STORKAuthnRequest();
    -	request.setDestination(destination);
    -	request.setProviderName(spName);
    -	request.setQaa(QAAL);
    -	request.setPersonalAttributeList(pal);
    -	request.setAssertionConsumerServiceURL(assertConsumerUrl);
    -
    -	// news parameters
    -	request.setSpSector(spSector);
    -	request.setSpInstitution(spInstitution);
    -	request.setSpApplication(spApplication);
    -	request.setSpCountry(spCountry);
    -	request.setSPID(spId);
    -	request.setCitizenCountryCode("ES");
    -
    -	try {
    -	    authRequest = getEngine().generateSTORKAuthnRequest(request)
    -		    .getTokenSaml();
    -	    	    
    -	    authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
    -	    
    -	} catch (STORKSAMLEngineException e) {
    -	    fail("Error create STORKAuthnRequest");
    +
    +	/** The engine. */
    +	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
    +
    +	/**
    +	 * Gets the engine.
    +	 * 
    +	 * @return the engine
    +	 */
    +	public static STORKSAMLEngine getEngine() {
    +		return engine;
    +	}
    +
    +	/**
    +	 * Sets the engine.
    +	 * 
    +	 * @param newEngine
    +	 *            the new engine
    +	 */
    +	public static void setEngine(final STORKSAMLEngine newEngine) {
    +		StorkResponseTest.engine = newEngine;
    +	}
    +
    +	/** The destination. */
    +	private static String destination;
    +
    +	/** The service provider name. */
    +	private static String spName;
    +
    +	/** The service provider sector. */
    +	private static String spSector;
    +
    +	/** The service provider institution. */
    +	private static String spInstitution;
    +
    +	/** The service provider application. */
    +	private static String spApplication;
    +
    +	/** The service provider country. */
    +	private static String spCountry;
    +
    +	/** The service provider id. */
    +	private static String spId;
    +
    +	/** The quality authentication assurance level. */
    +	private static final int QAAL = 3;
    +
    +	/** The state. */
    +	private static String state = "ES";
    +
    +	/** The town. */
    +	private static String town = "Madrid";
    +
    +	/** The municipality code. */
    +	private static String municipalityCode = "MA001";
    +
    +	/** The postal code. */
    +	private static String postalCode = "28038";
    +
    +	/** The street name. */
    +	private static String streetName = "Marchamalo";
    +
    +	/** The street number. */
    +	private static String streetNumber = "3";
    +
    +	/** The apartament number. */
    +	private static String apartamentNumber = "5º E";
    +
    +	/** The List of Personal Attributes. */
    +	private static IPersonalAttributeList pal;
    +
    +	/** The assertion consumer URL. */
    +	private static String assertConsumerUrl;
    +
    +	/** The authentication request. */
    +	private static byte[] authRequest;
    +
    +	/** The authentication response. */
    +	private static byte[] authResponse;
    +
    +	/** The authentication request. */
    +	private static STORKAuthnRequest authenRequest;
    +
    +	/** The authentication response. */
    +	private static STORKAuthnResponse authnResponse;
    +
    +	/** The Constant LOG. */
    +	private static final Logger LOG = LoggerFactory.getLogger(StorkResponseTest.class.getName());
    +
    +	/**
    +	 * Instantiates a new stork response test.
    +	 */
    +	public StorkResponseTest() {
    +		super();
    +	}
    +
    +	/** The IP address. */
    +	private static String ipAddress;
    +
    +	/** The is hashing. */
    +	private final boolean isHashing = Boolean.TRUE;
    +
    +	/** The is not hashing. */
    +	private final boolean isNotHashing = Boolean.FALSE;
    +
    +	/** The ERROR text. */
    +	private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
    +
    +	/** Parser manager used to parse XML. */
    +	private static BasicParserPool parser;
    +
    +	static {
    +		parser = new BasicParserPool();
    +		parser.setNamespaceAware(true);
    +
    +		pal = new PersonalAttributeList();
    +
    +		PersonalAttribute isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(false);
    +		ArrayList ages = new ArrayList();
    +		ages.add("16");
    +		ages.add("18");
    +		isAgeOver.setValue(ages);
    +		pal.add(isAgeOver);
    +
    +		PersonalAttribute dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		pal.add(dateOfBirth);
    +
    +		PersonalAttribute eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +		pal.add(eIDNumber);
    +
    +		final PersonalAttribute givenName = new PersonalAttribute();
    +		givenName.setName("givenName");
    +		givenName.setIsRequired(true);
    +		pal.add(givenName);
    +
    +		PersonalAttribute canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		pal.add(canRessAddress);
    +
    +		PersonalAttribute newAttribute = new PersonalAttribute();
    +		newAttribute.setName("newAttribute2");
    +		newAttribute.setIsRequired(true);
    +		pal.add(newAttribute);
    +
    +		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
    +		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
    +		spName = "University Oxford";
    +
    +		spName = "University of Oxford";
    +		spSector = "EDU001";
    +		spInstitution = "OXF001";
    +		spApplication = "APP001";
    +		spCountry = "EN";
    +
    +		spId = "EDU001-APP001-APP001";
    +
    +		final STORKAuthnRequest request = new STORKAuthnRequest();
    +		request.setDestination(destination);
    +		request.setProviderName(spName);
    +		request.setQaa(QAAL);
    +		request.setPersonalAttributeList(pal);
    +		request.setAssertionConsumerServiceURL(assertConsumerUrl);
    +
    +		// news parameters
    +		request.setSpSector(spSector);
    +		request.setSpInstitution(spInstitution);
    +		request.setSpApplication(spApplication);
    +		request.setSpCountry(spCountry);
    +		request.setSPID(spId);
    +		request.setCitizenCountryCode("ES");
    +
    +		try {
    +			authRequest = getEngine().generateSTORKAuthnRequest(request).getTokenSaml();
    +
    +			authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
    +
    +		} catch (STORKSAMLEngineException e) {
    +			fail("Error create STORKAuthnRequest");
    +		}
    +
    +		ipAddress = "111.222.333.444";
    +
    +		pal = new PersonalAttributeList();
    +
    +		isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(true);
    +		ages = new ArrayList();
    +
    +		ages.add("16");
    +		ages.add("18");
    +
    +		isAgeOver.setValue(ages);
    +		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(isAgeOver);
    +
    +		dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		final ArrayList date = new ArrayList();
    +		date.add("16/12/2008");
    +		dateOfBirth.setValue(date);
    +		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(dateOfBirth);
    +
    +		eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +		final ArrayList idNumber = new ArrayList();
    +		idNumber.add("123456789PÑ");
    +		eIDNumber.setValue(idNumber);
    +		eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		pal.add(eIDNumber);
    +
    +		canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap address = new HashMap();
    +
    +		address.put("state", state);
    +		address.put("municipalityCode", municipalityCode);
    +		address.put("town", town);
    +		address.put("postalCode", postalCode);
    +		address.put("streetName", streetName);
    +		address.put("streetNumber", streetNumber);
    +		address.put("apartamentNumber", apartamentNumber);
    +
    +		canRessAddress.setComplexValue(address);
    +		pal.add(canRessAddress);
    +
    +		newAttribute = new PersonalAttribute();
    +		newAttribute.setName("newAttribute2");
    +		newAttribute.setIsRequired(true);
    +		newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap values = new HashMap();
    +
    +		values.put("value1", "value1");
    +		values.put("value2", "value2");
    +		values.put("value3", "value3");
    +		values.put("value4", "value4");
    +
    +		newAttribute.setComplexValue(values);
    +		pal.add(newAttribute);
    +
    +	}
    +
    +	/**
    +	 * Test generate authentication request without errors.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAuthnResponse() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing);
    +
    +		authResponse = storkResponse.getTokenSaml();
    +
    +		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
    +
     	}
     
    -	ipAddress = "111.222.333.444";
    -
    -	pal = new PersonalAttributeList();
    -
    -	isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(true);
    -	ages = new ArrayList();
    -
    -	ages.add("16");
    -	ages.add("18");
    -
    -	isAgeOver.setValue(ages);
    -	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(isAgeOver);
    -
    -	dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	final ArrayList date = new ArrayList();
    -	date.add("16/12/2008");
    -	dateOfBirth.setValue(date);
    -	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(dateOfBirth);
    -
    -	eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -	final ArrayList idNumber = new ArrayList();
    -	idNumber.add("123456789PÑ");
    -	eIDNumber.setValue(idNumber);
    -	eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	pal.add(eIDNumber);
    -
    -	canRessAddress = new PersonalAttribute();
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap address = new HashMap();
    -
    -	address.put("state", state);
    -	address.put("municipalityCode", municipalityCode);
    -	address.put("town", town);
    -	address.put("postalCode", postalCode);
    -	address.put("streetName", streetName);
    -	address.put("streetNumber", streetNumber);
    -	address.put("apartamentNumber", apartamentNumber);
    -
    -	canRessAddress.setComplexValue(address);
    -	pal.add(canRessAddress);
    -    
    -	newAttribute = new PersonalAttribute();
    -	newAttribute.setName("newAttribute2");
    -	newAttribute.setIsRequired(true);
    -	newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap values = new HashMap();
    -	
    -	values.put("value1", "value1");
    -	values.put("value2", "value2");
    -	values.put("value3", "value3");
    -	values.put("value4", "value4");
    -	
    -	newAttribute.setComplexValue(values);
    -	pal.add(newAttribute);
    -	
    -    }
    -
    -    /**
    -     * Test generate authentication request without errors.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAuthnResponse() throws STORKSAMLEngineException {
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	final STORKAuthnResponse storkResponse = getEngine()
    -		.generateSTORKAuthnResponse(authenRequest, response, ipAddress,
    -			isNotHashing);
    -
    -	authResponse = storkResponse.getTokenSaml();
    -	
    -	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
    -	
    -	
    -    }
    -
    -    /**
    -     * Test validation id parameter mandatory.
    -     */
    -    @Test
    -    public final void testResponseMandatoryId() {
    -	final String identifier = authenRequest.getSamlId();
    -	authenRequest.setSamlId(null);
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	try {
    -	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
    -		    ipAddress, isHashing);
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    authenRequest.setSamlId(identifier);
    -	    LOG.error("Error");
    +	/**
    +	 * Test validation id parameter mandatory.
    +	 */
    +	@Test
    +	public final void testResponseMandatoryId() {
    +		final String identifier = authenRequest.getSamlId();
    +		authenRequest.setSamlId(null);
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		try {
    +			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			authenRequest.setSamlId(identifier);
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication response in response to err1.
    -     */
    -    @Test
    -    public final void testResponseMandatoryIssuer() {
    -
    -	final String issuer = authenRequest.getIssuer();
    -	authenRequest.setIssuer(null);
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	try {
    -	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
    -		    ipAddress, isHashing);
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    authenRequest.setIssuer(issuer);
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication response in response to err1.
    +	 */
    +	@Test
    +	public final void testResponseMandatoryIssuer() {
    +
    +		final String issuer = authenRequest.getIssuer();
    +		authenRequest.setIssuer(null);
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		try {
    +			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			authenRequest.setIssuer(issuer);
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication response assertion consumer null.
    -     */
    -    @Test
    -    public final void testResponseMandatoryAssertionConsumerServiceURL() {
    -	final String asserConsumerUrl = authenRequest
    -		.getAssertionConsumerServiceURL();
    -	authenRequest.setAssertionConsumerServiceURL(null);
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(pal);
    -	try {
    -	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
    -		    ipAddress, isHashing);
    -	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    authenRequest.setAssertionConsumerServiceURL(asserConsumerUrl);
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication response assertion consumer null.
    +	 */
    +	@Test
    +	public final void testResponseMandatoryAssertionConsumerServiceURL() {
    +		final String asserConsumerUrl = authenRequest.getAssertionConsumerServiceURL();
    +		authenRequest.setAssertionConsumerServiceURL(null);
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setPersonalAttributeList(pal);
    +		try {
    +			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
    +			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			authenRequest.setAssertionConsumerServiceURL(asserConsumerUrl);
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication response IP address null.
    -     */
    -    @Test
    -    public final void testResponseValidationIP() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(pal);
    -
    -	try {
    -	    getEngine().generateSTORKAuthnResponse(authenRequest, response, null,
    -		    isHashing);
    -	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication response IP address null.
    +	 */
    +	@Test
    +	public final void testResponseValidationIP() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setPersonalAttributeList(pal);
    +
    +		try {
    +			getEngine().generateSTORKAuthnResponse(authenRequest, response, null, isHashing);
    +			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test generate authentication response with personal attribute list null.
    +	 */
    +	@Test
    +	public final void testResponseMandatoryPersonalAttributeList() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setPersonalAttributeList(null);
    +
    +		try {
    +			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
    +			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication response token null.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersToken() {
    +		try {
    +			getEngine().validateSTORKAuthnResponse(null, ipAddress);
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication response IP null.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersIP() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setPersonalAttributeList(pal);
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAuthnResponse(authResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication response with personal attribute list null.
    -     */
    -    @Test
    -    public final void testResponseMandatoryPersonalAttributeList() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(null);
    -	
    -	
    -	try {
    -	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
    -		    ipAddress, isHashing);
    -	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response parameter name wrong.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttr() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("AttrWrong");
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAuthnResponse(authResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
    +	}
    +
    +	/**
    +	 * Test validate authentication response set null value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrSimpleValue() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("isAgeOver");
    +		worngAttr.setValue(null);
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAuthnResponse(authResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    /**
    -     * Test validate authentication response token null.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersToken() {
    -	try {
    -	    getEngine().validateSTORKAuthnResponse(null, ipAddress);
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response set null value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrNoValue() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("isAgeOver");
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAuthnResponse(authResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication response IP null.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersIP() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setPersonalAttributeList(pal);
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAuthnResponse(authResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response set null value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrNoName() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAuthnResponse(authResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate authentication response parameter name wrong.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttr() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("AttrWrong");
    -	wrongList.add(worngAttr);
    -	
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAuthnResponse(authResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response set null complex value into attribute.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersAttrComplexValue() {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		final IPersonalAttributeList wrongList = new PersonalAttributeList();
    +
    +		final PersonalAttribute worngAttr = new PersonalAttribute();
    +		worngAttr.setName("isAgeOver");
    +		worngAttr.setComplexValue(null);
    +		wrongList.add(worngAttr);
    +
    +		response.setPersonalAttributeList(wrongList);
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			// In Conf1 ipValidate is false
    +			getEngine().validateSTORKAuthnResponse(authResponse, null);
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate authentication response set null value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrSimpleValue() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("isAgeOver");
    -	worngAttr.setValue(null);
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAuthnResponse(authResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response IP distinct and disabled validation IP.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersIPDistinct() {
    +		try {
    +			// ipAddress origin "111.222.333.444"
    +			// ipAddrValidation = false
    +			// Subject Confirmation Bearer.
    +
    +			getEngine().validateSTORKAuthnResponse(authResponse, "127.0.0.1");
    +			fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate authentication response set null value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrNoValue() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("isAgeOver");
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAuthnResponse(authResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test response invalid parameters invalid token.
    +	 */
    +	@Test
    +	public final void testResponseInvalidParametersTokenMsg() {
    +		try {
    +			// ipAddress origin "111.222.333.444"
    +			// Subject Confirmation Bearer.
    +			getEngine().validateSTORKAuthnResponse("errorMessage".getBytes(), ipAddress);
    +			fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate authentication response set null value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrNoName() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();	
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAuthnResponse(authResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response is fail.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthenticationResponseIsFail() throws STORKSAMLEngineException {
    +		if (authResponse == null)
    +			testGenerateAuthnResponse();
    +
    +		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
    +
    +		assertFalse("Generate incorrect response: ", authnResponse.isFail());
     	}
    -    }
    -    
    -    
    -    /**
    -     * Test validate authentication response set null complex value into attribute.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersAttrComplexValue() {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	final IPersonalAttributeList wrongList = new PersonalAttributeList();
    -
    -	final PersonalAttribute worngAttr = new PersonalAttribute();
    -	worngAttr.setName("isAgeOver");
    -	worngAttr.setComplexValue(null);
    -	wrongList.add(worngAttr);
    -	
    -	response.setPersonalAttributeList(wrongList);
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    // In Conf1 ipValidate is false
    -	    getEngine().validateSTORKAuthnResponse(authResponse, null);
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response destination.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthenticationResponseDestination() throws STORKSAMLEngineException {
    +		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
    +
    +		assertEquals("Destination incorrect: ", authnResponse.getInResponseTo(), authenRequest.getSamlId());
     	}
    -    }
    -	
    -    
    -    
    -
    -    /**
    -     * Test validate authentication response IP distinct and disabled validation
    -     * IP.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersIPDistinct() {
    -	try {
    -	    // ipAddress origin "111.222.333.444"
    -	    // ipAddrValidation = false
    -	    // Subject Confirmation Bearer.
    -
    -	    getEngine().validateSTORKAuthnResponse(authResponse, "127.0.0.1");
    -	    fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");	    
    +
    +	/**
    +	 * Test validate authentication response values.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	public final void testValidateAuthenticationResponseValuesComplex() throws STORKSAMLEngineException {
    +		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
    +
    +		assertEquals("Country incorrect:", authnResponse.getCountry(), "EN");
    +
    +		final Iterator iterator = authnResponse.getPersonalAttributeList().iterator();
    +
    +		while (iterator.hasNext()) {
    +			final PersonalAttribute attribute = iterator.next();
    +			if (attribute.getName().equalsIgnoreCase("canonicalResidenceAddress")) {
    +				assertEquals("State incorrect: ", state, attribute.getComplexValue().get("state"));
    +				assertEquals("Municipality Code incorrect: ", municipalityCode, attribute.getComplexValue().get("municipalityCode"));
    +				assertEquals("Town incorrect: ", town, attribute.getComplexValue().get("town"));
    +				assertEquals("Postal code incorrect: ", postalCode, attribute.getComplexValue().get("postalCode"));
    +				assertEquals("Street name incorrect: ", streetName, attribute.getComplexValue().get("streetName"));
    +				assertEquals("Street number incorrect: ", streetNumber, attribute.getComplexValue().get("streetNumber"));
    +				assertEquals("Apartament number incorrect: ", apartamentNumber, attribute.getComplexValue().get("apartamentNumber"));
    +			}
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test response invalid parameters invalid token.
    -     */
    -    @Test
    -    public final void testResponseInvalidParametersTokenMsg() {
    -	try {
    -	    // ipAddress origin "111.222.333.444"
    -	    // Subject Confirmation Bearer.
    -	    getEngine().validateSTORKAuthnResponse("errorMessage".getBytes(),
    -		    ipAddress);
    -	    fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authenticate response fail in response to it's null.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	// ( expected=STORKSAMLEngineException.class)
    +	public final void testGenerateAuthnResponseFailInResponseToNull() throws STORKSAMLEngineException {
    +		final String identifier = authenRequest.getSamlId();
    +		authenRequest.setSamlId(null);
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    +		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    +		response.setMessage("");
    +
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			fail(ERROR_TXT);
    +		} catch (STORKSAMLEngineException e) {
    +			authenRequest.setSamlId(identifier);
    +			LOG.error("Error");
    +			// throw new STORKSAMLEngineException(e);
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test validate authentication response is fail.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthenticationResponseIsFail()
    -	    throws STORKSAMLEngineException {
    -    	if (authResponse == null)
    -    		testGenerateAuthnResponse();
    -    	
    -	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
    -		ipAddress);
    -
    -	assertFalse("Generate incorrect response: ", authnResponse.isFail());
    -    }
    -
    -    /**
    -     * Test validate authentication response destination.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthenticationResponseDestination()
    -	    throws STORKSAMLEngineException {
    -	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
    -		ipAddress);
    -
    -	assertEquals("Destination incorrect: ",
    -		authnResponse.getInResponseTo(), authenRequest.getSamlId());
    -    }
    -
    -    /**
    -     * Test validate authentication response values.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    public final void testValidateAuthenticationResponseValuesComplex()
    -	    throws STORKSAMLEngineException {
    -	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
    -		ipAddress);
    -	
    -	assertEquals("Country incorrect:", authnResponse.getCountry(), "EN");
    -	
    -	final Iterator iterator = authnResponse
    -		.getPersonalAttributeList().iterator();
    -
    -	while (iterator.hasNext()) {
    -	    final PersonalAttribute attribute = iterator.next();
    -	    if (attribute.getName().equalsIgnoreCase(
    -		    "canonicalResidenceAddress")) {
    -		assertEquals("State incorrect: ", state, attribute
    -			.getComplexValue().get("state"));
    -		assertEquals("Municipality Code incorrect: ", municipalityCode,
    -			attribute.getComplexValue().get("municipalityCode"));
    -		assertEquals("Town incorrect: ", town, attribute
    -			.getComplexValue().get("town"));
    -		assertEquals("Postal code incorrect: ", postalCode, attribute
    -			.getComplexValue().get("postalCode"));
    -		assertEquals("Street name incorrect: ", streetName, attribute
    -			.getComplexValue().get("streetName"));
    -		assertEquals("Street number incorrect: ", streetNumber,
    -			attribute.getComplexValue().get("streetNumber"));
    -		assertEquals("Apartament number incorrect: ", apartamentNumber,
    -			attribute.getComplexValue().get("apartamentNumber"));
    -	    }
    +
    +	/**
    +	 * Test generate authenticate response fail assertion consumer URL err1.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull() throws STORKSAMLEngineException {
    +
    +		final String assertConsumerUrl = authenRequest.getAssertionConsumerServiceURL();
    +		authenRequest.setAssertionConsumerServiceURL(null);
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    +		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    +		response.setMessage("");
    +
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			authenRequest.setAssertionConsumerServiceURL(assertConsumerUrl);
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authenticate response fail in response to it's null.
    -     * @throws STORKSAMLEngineException 
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test //( expected=STORKSAMLEngineException.class)
    -    public final void testGenerateAuthnResponseFailInResponseToNull() throws STORKSAMLEngineException {
    -	final String identifier = authenRequest.getSamlId();
    -	authenRequest.setSamlId(null);
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("");
    -
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    fail(ERROR_TXT);
    -	} catch (STORKSAMLEngineException e) {
    -	    authenRequest.setSamlId(identifier);
    -	    LOG.error("Error");
    -	    //throw new STORKSAMLEngineException(e);
    +
    +	/**
    +	 * Test generate authentication response fail code error err1.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testGenerateAuthnResponseFailCodeErrorNull() throws STORKSAMLEngineException {
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setStatusCode(null);
    +		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    +		response.setMessage("");
    +
    +		try {
    +			authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +			fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
    +		} catch (STORKSAMLEngineException e) {
    +			LOG.error("Error");
    +		}
     	}
    -    }
    -
    -    /**
    -     * Test generate authenticate response fail assertion consumer URL err1.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull()
    -	    throws STORKSAMLEngineException {
    -
    -	final String assertConsumerUrl = authenRequest
    -		.getAssertionConsumerServiceURL();
    -	authenRequest.setAssertionConsumerServiceURL(null);
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("");
    -
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    authenRequest.setAssertionConsumerServiceURL(assertConsumerUrl);
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test generate authentication request without errors.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthnResponse() throws STORKSAMLEngineException {
    +
    +		IPersonalAttributeList palist = new PersonalAttributeList();
    +
    +		PersonalAttribute isAgeOver = new PersonalAttribute();
    +		isAgeOver.setName("isAgeOver");
    +		isAgeOver.setIsRequired(true);
    +		ArrayList ages = new ArrayList();
    +		ages.add("16");
    +		ages.add("18");
    +		isAgeOver.setValue(ages);
    +		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		palist.add(isAgeOver);
    +
    +		PersonalAttribute dateOfBirth = new PersonalAttribute();
    +		dateOfBirth.setName("dateOfBirth");
    +		dateOfBirth.setIsRequired(false);
    +		final ArrayList date = new ArrayList();
    +		date.add("16/12/2008");
    +		dateOfBirth.setValue(date);
    +		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		palist.add(dateOfBirth);
    +
    +		PersonalAttribute eIDNumber = new PersonalAttribute();
    +		eIDNumber.setName("eIdentifier");
    +		eIDNumber.setIsRequired(true);
    +
    +		final ArrayList idNumber = new ArrayList();
    +		idNumber.add("123456789PÑ");
    +
    +		final HashMap complex = new HashMap();
    +		complex.put("one", "two");
    +
    +		// eIDNumber.setValue(null);
    +		// eIDNumber.setValue(idNumber);
    +		// eIDNumber.setComplexValue(complex);
    +
    +		eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
    +		palist.add(eIDNumber);
    +
    +		PersonalAttribute canRessAddress = new PersonalAttribute();
    +		canRessAddress.setName("canonicalResidenceAddress");
    +		canRessAddress.setIsRequired(true);
    +		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    +		final HashMap address = new HashMap();
    +
    +		address.put("state", state);
    +		address.put("municipalityCode", municipalityCode);
    +		address.put("town", town);
    +		address.put("postalCode", postalCode);
    +		address.put("streetName", streetName);
    +		address.put("streetNumber", streetNumber);
    +		address.put("apartamentNumber", apartamentNumber);
    +
    +		canRessAddress.setComplexValue(address);
    +		palist.add(canRessAddress);
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +
    +		response.setPersonalAttributeList(palist);
    +
    +		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing);
    +
    +		authResponse = storkResponse.getTokenSaml();
    +		LOG.info("Request id: " + authenRequest.getSamlId());
    +
    +		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
    +
    +		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
    +
    +		LOG.info("RESPONSE ID: " + authnResponse.getSamlId());
    +		LOG.info("RESPONSE IN_RESPONSE_TO: " + authnResponse.getInResponseTo());
    +		LOG.info("RESPONSE COUNTRY: " + authnResponse.getCountry());
    +
     	}
    -    }
    -
    -    /**
    -     * Test generate authentication response fail code error err1.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testGenerateAuthnResponseFailCodeErrorNull()
    -	    throws STORKSAMLEngineException {
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setStatusCode(null);
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("");
    -
    -	try {
    -	    authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
    -		    response, ipAddress, isNotHashing).getTokenSaml();
    -	    fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
    -	} catch (STORKSAMLEngineException e) {
    -	    LOG.error("Error");
    +
    +	/**
    +	 * Test validate authentication response fail is fail.
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	@Test
    +	public final void testValidateAuthenticationResponseFailIsFail() throws STORKSAMLEngineException {
    +
    +		final STORKAuthnResponse response = new STORKAuthnResponse();
    +		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    +		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    +		response.setMessage("message");
    +
    +		authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
    +
    +		LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(authResponse));
    +
    +		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
    +
    +		LOG.info("COUNTRY: " + authnResponse.getCountry());
    +		assertTrue("Generate incorrect response: ", authnResponse.isFail());
     	}
    -    }
    -    
    -    
    -    
    -    
    -    /**
    -     * Test generate authentication request without errors.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthnResponse() throws STORKSAMLEngineException {
    -	
    -	IPersonalAttributeList palist = new PersonalAttributeList();
    -
    -	PersonalAttribute isAgeOver = new PersonalAttribute();
    -	isAgeOver.setName("isAgeOver");
    -	isAgeOver.setIsRequired(true);
    -	ArrayList ages = new ArrayList();
    -	ages.add("16");
    -	ages.add("18");
    -	isAgeOver.setValue(ages);
    -	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	palist.add(isAgeOver);
    -
    -	PersonalAttribute dateOfBirth = new PersonalAttribute();
    -	dateOfBirth.setName("dateOfBirth");
    -	dateOfBirth.setIsRequired(false);
    -	final ArrayList date = new ArrayList();
    -	date.add("16/12/2008");
    -	dateOfBirth.setValue(date);
    -	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	palist.add(dateOfBirth);
    -
    -	
    -	PersonalAttribute eIDNumber = new PersonalAttribute();
    -	eIDNumber.setName("eIdentifier");
    -	eIDNumber.setIsRequired(true);
    -
    -	final ArrayList idNumber = new ArrayList();
    -	idNumber.add("123456789PÑ");
    -	
    -	final HashMap complex = new HashMap();
    -	complex.put("one", "two");
    -
    -	//eIDNumber.setValue(null);
    -	//eIDNumber.setValue(idNumber);
    -	//eIDNumber.setComplexValue(complex);
    -	
    -	eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
    -	palist.add(eIDNumber);
    -
    -	PersonalAttribute canRessAddress = new PersonalAttribute();	
    -	canRessAddress.setName("canonicalResidenceAddress");
    -	canRessAddress.setIsRequired(true);
    -	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -	final HashMap address = new HashMap();
    -
    -	address.put("state", state);
    -	address.put("municipalityCode", municipalityCode);
    -	address.put("town", town);
    -	address.put("postalCode", postalCode);
    -	address.put("streetName", streetName);
    -	address.put("streetNumber", streetNumber);
    -	address.put("apartamentNumber", apartamentNumber);
    -
    -	canRessAddress.setComplexValue(address);
    -	palist.add(canRessAddress);
    -
    -	
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -
    -	response.setPersonalAttributeList(palist);
    -
    -	final STORKAuthnResponse storkResponse = getEngine()
    -		.generateSTORKAuthnResponse(authenRequest, response, ipAddress,
    -			isNotHashing);
    -
    -	authResponse = storkResponse.getTokenSaml();
    -	LOG.info("Request id: " + authenRequest.getSamlId());
    -	
    -	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
    -	
    -	
    -	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
    -		ipAddress);
    -	
    -	LOG.info("RESPONSE ID: " + authnResponse.getSamlId());
    -	LOG.info("RESPONSE IN_RESPONSE_TO: " + authnResponse.getInResponseTo());
    -	LOG.info("RESPONSE COUNTRY: " + authnResponse.getCountry());
    -	
    -    }
    -    
    -    
    -   
    -
    -	
    -    /**
    -     * Test validate authentication response fail is fail.
    -     * 
    -     * @throws STORKSAMLEngineException the STORKSAML engine exception
    -     */
    -    @Test
    -    public final void testValidateAuthenticationResponseFailIsFail()
    -	    throws STORKSAMLEngineException {
    -
    -	final STORKAuthnResponse response = new STORKAuthnResponse();
    -	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
    -	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
    -	response.setMessage("message");
    -
    -	authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
    -		response, ipAddress, isNotHashing).getTokenSaml();
    -	
    -	LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(authResponse));
    -
    -	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
    -		ipAddress);
    -
    -	LOG.info("COUNTRY: " + authnResponse.getCountry());
    -	assertTrue("Generate incorrect response: ", authnResponse.isFail());
    -    }  
    -    
    +
     	/**
     	 * Test generate/validate response with signedDoc
     	 * 
    @@ -889,8 +833,7 @@ public class StorkResponseTest {
     	 *             the STORKSAML engine exception
     	 */
     	@Test
    -	public final void testGenerateAuthenResponseWithSignedDoc()
    -			throws STORKSAMLEngineException {
    +	public final void testGenerateAuthenResponseWithSignedDoc() throws STORKSAMLEngineException {
     
     		String signedDocResponse = "  urn:oasis:names:tc:dss:1.0:resultmajor:Success   <?xml version="1.0" encoding="UTF-8"?><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference Id="Reference-baba4d1a-a17e-42c6-97d2-beee13509503" Type="http://www.w3.org/2000/09/xmldsig#Object" URI="#Object-98733cde-8bcc-48a0-9b77-0e9997bdd058"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>Ck1VqNd45QIvq3AZd8XYQLvEhtA=</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>A5Y91n4qpLgytTW7fxjXCUeRv54=</ds:DigestValue></ds:Reference><ds:Reference URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>VPX4nKFyS6rF+F6cRR0PrNZdw6g=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignatureValue">LbKN//C7XkyxTtYTiCURr8nZzxAmstcMd0CgEACrK1dygRHqGcK4xts+WCU8PyEqWrRITYzIuw/7
V4Zz9TT60p4KTMewuQL64skESx2Yg2EdikSO+tKxWkhraUsmVbGbPmmcmDv97tHDw88747eFq5F5
v+aVSyAz03iUKmuSeH8=</ds:SignatureValue><ds:KeyInfo Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:KeyValue><ds:RSAKeyValue><ds:Modulus>wucmj9tIWrvwbSTUDfwKl+JtDMMER0cLd6DkBSr790t+rGNjESqYjRwEIeBnKoQHPx5HoReF88/t
qY9+ChEXpLHLs9p5aX7SDJubpQMfp1tDFX34ywgxSQvceeJQWBXjieuImfC21s4bOcgJbV1hbigS
zOKTQKr1TzdGR+uRy00=</ds:Modulus><ds:Exponent>AQAB</ds:Exponent></ds:RSAKeyValue></ds:KeyValue><ds:X509Data><ds:X509Certificate>MIIImTCCB4GgAwIBAgIDAXUUMA0GCSqGSIb3DQEBBQUAMIIBOzELMAkGA1UEBhMCRVMxOzA5BgNV
BAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQw
MgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMS4wLAYD
VQQLEyVTZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvIEVDVi0yMTUwMwYDVQQLEyxWZWdl
dSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzE1MDMGA1UECxMsRW50aXRh
dCBwdWJsaWNhIGRlIGNlcnRpZmljYWNpbyBkZSBjaXV0YWRhbnMxGzAZBgNVBAMTElBSRVBST0RV
Q0NJTyBJRENhdDAeFw0xMDAyMTExODIyMDRaFw0xNDAyMTAxODIyMDRaMIGwMQswCQYDVQQGEwJF
UzE1MDMGA1UECxMsVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVySURDYXQgKGMpMDMx
FjAUBgNVBAQTDUJFUkxBTkdBIFNPVE8xFzAVBgNVBCoTDk1BUklBIEVOR1JBQ0lBMRIwEAYDVQQF
EwkxMDAwMDk0NFMxJTAjBgNVBAMTHE1BUklBIEVOR1JBQ0lBIEJFUkxBTkdBIFNPVE8wgZ8wDQYJ
KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnJo/bSFq78G0k1A38CpfibQzDBEdHC3eg5AUq+/dLfqxj
YxEqmI0cBCHgZyqEBz8eR6EXhfPP7amPfgoRF6Sxy7PaeWl+0gybm6UDH6dbQxV9+MsIMUkL3Hni
UFgV44nriJnwttbOGznICW1dYW4oEszik0Cq9U83RkfrkctNAgMBAAGjggSwMIIErDAMBgNVHRMB
Af8EAjAAMA4GA1UdDwEB/wQEAwIFoDCBzAYDVR0RBIHEMIHBgQ9ic290b0BnbWFpbC5jb22kgYUw
gYIxCzAJBgNVBAYTAkVTMSswKQYDVQQKFCJBZ8OobmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2Fj
acOzMQ4wDAYDVQQLEwVJRENBVDEPMA0GA1UEBRMGMDE3NTE0MSUwIwYDVQQDExxNQVJJQSBFTkdS
QUNJQSBCRVJMQU5HQSBTT1RPoBAGCisGAQQB9XgBAQGgAgwAoBQGDlYEAAEDBgEEAfV4AQECoAIM
ADAfBgNVHRIEGDAWgRRlY19pZGNhdEBjYXRjZXJ0Lm5ldDAdBgNVHQ4EFgQUAFXjuNskB2MlyvUB
h7p8TJ0uJ0wwggFIBgNVHSMEggE/MIIBO4AURKvckUhN14h4Cn/gdODn6723KVyhggEPpIIBCzCC
AQcxCzAJBgNVBAYTAkVTMTswOQYDVQQKEzJBZ2VuY2lhIENhdGFsYW5hIGRlIENlcnRpZmljYWNp
byAoTklGIFEtMDgwMTE3Ni1JKTEoMCYGA1UECxMfU2VydmVpcyBQdWJsaWNzIGRlIENlcnRpZmlj
YWNpbzE8MDoGA1UECxMzVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVycHJlcHJvZHVj
Y2lvIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENh
dGFsYW5lczEcMBoGA1UEAxMTUFJFUFJPRFVDQ0lPIEVDLUFDQ4IQdwKTtM1EEU9FEPXUYHgghDAd
BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwEQYJYIZIAYb4QgEBBAQDAgWgMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cHM6Ly9vY3NwLmNhdGNlcnQubmV0MBgGCCsGAQUFBwED
BAwwCjAIBgYEAI5GAQEwgYYGA1UdHwR/MH0wPKA6oDiGNmh0dHA6Ly9lcHNjZC5jYXRjZXJ0Lm5l
dC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDA9oDugOYY3aHR0cDovL2Vwc2NkMi5jYXRj
ZXJ0Lm5ldC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDCB9gYDVR0gBIHuMIHrMIHoBgwr
BgEEAfV4AQMBVgEwgdcwLAYIKwYBBQUHAgEWIGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcklE
Q2F0MIGmBggrBgEFBQcCAjCBmRqBlkFxdWVzdCDvv71zIHVuIGNlcnRpZmljYXQgcGVyc29uYWwg
SURDQVQsIHJlY29uZWd1dCBkJ2lkZW50aWZpY2Fj77+9LCBzaWduYXR1cmEgaSB4aWZyYXQgZGUg
Y2xhc3NlIDIgaW5kaXZpZHVhbC4gVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVyRENh
dDAtBgNVHQkEJjAkMBAGCCsGAQUFBwkEMQQTAkVTMBAGCCsGAQUFBwkFMQQTAkVTMA0GCSqGSIb3
DQEBBQUAA4IBAQCq7780RGQMLB1gkdNMfLXngqMoRHGKZbvzkrqIAmT8WAd1E8rAphR9/xLJUtp5
lbg2fRr5bl2j8OVDBK2YmG41h8ADn4STI/ApeNINSfjZs6NRsnWzFyfXXmPCHYFB/XWzyimCExgv
vtuH+3QAwcwhn50PLEuhw5C5vlX7Ly5K6rLLMFNUUMbWVy1hZelK/CBTcAjIO38NY+vYRAMKSf4M
/gZQz4qBeFVJa52R7NcAqCfrfLfaXpbDSg98xoBeNs2inGzx8USgErLZjKJsdn/KjTD9gS/sTdQ6
Q7idqld2LFVlO2/b94ZNZBcS/78EODXgdWfkyPC7Rw8re9nI3/jT</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object Encoding="base64" Id="Object-98733cde-8bcc-48a0-9b77-0e9997bdd058" MimeType="application/octet-stream">SGVsbG8gV29ybGQ=</ds:Object><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-QualifyingProperties" Target="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><xades:SignedProperties Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><xades:SignedSignatureProperties><xades:SigningTime>2011-03-21T11:44:42+01:00</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>3m6w99ToySd9JpBl1gBk8Dz/bbU=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=PREPRODUCCIO IDCat, OU=Entitat publica de certificacio de ciutadans, OU=Vegeu https://www.catcert.net/verCIC-2 (c)03, OU=Serveis Publics de Certificacio ECV-2, L=Passatge de la Concepcio 11 08008 Barcelona, O=Agencia Catalana de Certificacio (NIF Q-0801176-I), C=ES</ds:X509IssuerName><ds:X509SerialNumber>95508</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#Reference-baba4d1a-a17e-42c6-97d2-beee13509503"><xades:MimeType>application/octet-stream</xades:MimeType><xades:Encoding>base64</xades:Encoding></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature>  ";
     
    @@ -919,17 +862,12 @@ public class StorkResponseTest {
     
     		response.setPersonalAttributeList(palist);
     
    -		final STORKAuthnResponse storkResponse = getEngine()
    -				.generateSTORKAuthnResponse(authenRequest, response, ipAddress,
    -						isNotHashing);
    +		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing);
     
     		authResponse = storkResponse.getTokenSaml();
    -		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
    -				ipAddress);
    +		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
     
    -		assertTrue("SignedDoc response should be the same: ", authnResponse
    -				.getPersonalAttributeList().get("signedDoc").getValue().get(0)
    -				.equals(signedDocResponse));
    +		assertTrue("SignedDoc response should be the same: ", authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0).equals(signedDocResponse));
     
    -	}	
    +	}
     }
    diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
    index a9f2038b8..abb071044 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
    @@ -1,15 +1,11 @@
     
     
     
    -
    +
     
     	SWModule sign with JKS.
     	C:\opt\keystores\storkDemoKeysTest.jks
    diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
    index 8c3a94601..2b20da600 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
    @@ -83,5 +83,5 @@
     	http://www.stork.gov.eu/1.0/mandateContent
     
     	http://www.stork.gov.eu/1.0/docRequest
    -	
    +
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
    index d64572829..7dffe0312 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
    @@ -1,15 +1,68 @@
    -http://S-PEPS.gov.xxX1nUVB6qXdoKbJzNekiSo9ExLdw=ExCPHHC/9OhdhOl1Ou+43Qw1nvskpbMYMu9vqa7m16doxM2PIUmK7LUw7hZiKtjIdBxuhpca3OrjO8O6MuTDN1FksWoj+7B1KTLFtmspucT5O7Cu2OqhK5WIVuCaLuA7CD0N2UfFouRwR5NlLHyzn9Trd7IM5OjA41dGb5jqYl7Ir+62+MgjhZRlLooDzb5fDAczbxv9LHGiKRBpgnk40w3gDAvoSPNdEuKhZi8LPQWWNBvVi3N5ZmJmAIacZWBqePywXTjygmChWAc8p7ptAX6tw0hpBxyxoW3aaZZzWQNcwobTRYbn89fcM11gqIz/YK7VXtiQ7WEQt1enQD/GAA==MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
    -CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
    -LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
    -A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
    -Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
    -NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
    -ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
    -NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
    -rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
    -fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
    -9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
    -yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
    -USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
    -nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
    -y66jvDrin5I=3ISfalsefalsefalseIS/IS/fbea6e68-0393-401b-b616-f767fff9418c
    \ No newline at end of file
    +
    +
    +	http://S-PEPS.gov.xx
    +	
    +		
    +			
    +			
    +			
    +				
    +					
    +					
    +						
    +					
    +				
    +				
    +				X1nUVB6qXdoKbJzNekiSo9ExLdw=
    +			
    +		
    +		ExCPHHC/9OhdhOl1Ou+43Qw1nvskpbMYMu9vqa7m16doxM2PIUmK7LUw7hZiKtjIdBxuhpca3OrjO8O6MuTDN1FksWoj+7B1KTLFtmspucT5O7Cu2OqhK5WIVuCaLuA7CD0N2UfFouRwR5NlLHyzn9Trd7IM5OjA41dGb5jqYl7Ir+62+MgjhZRlLooDzb5fDAczbxv9LHGiKRBpgnk40w3gDAvoSPNdEuKhZi8LPQWWNBvVi3N5ZmJmAIacZWBqePywXTjygmChWAc8p7ptAX6tw0hpBxyxoW3aaZZzWQNcwobTRYbn89fcM11gqIz/YK7VXtiQ7WEQt1enQD/GAA==
    +		
    +			
    +				MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
    +					CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
    +					LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
    +					A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
    +					Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
    +					NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
    +					ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
    +					NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
    +					rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
    +					fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
    +					9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
    +					yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
    +					USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
    +					nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
    +					y66jvDrin5I=
    +			
    +		
    +	
    +	
    +		3
    +		IS
    +		false
    +		false
    +		false
    +		
    +			
    +				IS/IS/fbea6e68-0393-401b-b616-f767fff9418c
    +			
    +		
    +	
    +	
    +		
    +	
    +
    \ No newline at end of file
    -- 
    cgit v1.2.3
    
    
    From 496ba9bb6e150ad67c5c628c1c97f30d6da81dfb Mon Sep 17 00:00:00 2001
    From: Florian Reimair 
    Date: Mon, 10 Aug 2015 16:35:14 +0200
    Subject: approved changes
    
    ---
     .../auth/engine/core/impl/EIDSectorShareImpl.java  |   6 -
     .../eu/stork/peps/auth/commons/AttributeName.java  |  11 +-
     .../peps/auth/commons/AttributeProvidersMap.java   |  18 +++
     .../stork/peps/auth/commons/AttributeSource.java   |  14 ++-
     .../eu/stork/peps/auth/commons/AttributeUtil.java  |   4 +-
     .../peps/auth/commons/IAttributeListProcessor.java |  49 +++++++-
     .../peps/auth/commons/IAttributeProvidersMap.java  |   7 ++
     .../peps/auth/commons/IPersonalAttributeList.java  |  23 +++-
     .../java/eu/stork/peps/auth/commons/Linker.java    |  31 ++++--
     .../eu/stork/peps/auth/commons/PEPSErrors.java     |  12 +-
     .../eu/stork/peps/auth/commons/PEPSParameters.java |  25 ++++-
     .../eu/stork/peps/auth/commons/PEPSValues.java     |   6 +-
     .../stork/peps/auth/commons/PersonalAttribute.java |  57 +++++++++-
     .../peps/auth/commons/PersonalAttributeList.java   |  88 +++++++++++++--
     .../stork/peps/auth/commons/STORKAuthnRequest.java |   8 +-
     .../peps/auth/commons/STORKAuthnResponse.java      |  35 +++---
     .../tc/stork/_1_0/assertion/ObjectFactory.java     |  16 +--
     .../java/eu/stork/peps/auth/engine/SAMLEngine.java |   9 +-
     .../eu/stork/peps/auth/engine/STORKSAMLEngine.java |  99 +++++++++-------
     .../stork/peps/auth/engine/X509PrincipalUtil.java  |   2 +-
     .../eu/stork/peps/auth/engine/core/SAMLCore.java   |   3 +
     .../stork/peps/auth/engine/core/STORKSAMLCore.java |  26 ++++-
     .../core/impl/AuthenticationAttributesImpl.java    |   5 -
     .../engine/core/impl/CitizenCountryCodeImpl.java   |   5 -
     .../engine/core/impl/EIDCrossBorderShareImpl.java  |   7 +-
     .../engine/core/impl/EIDCrossSectorShareImpl.java  |   7 +-
     .../auth/engine/core/impl/QAAAttributeImpl.java    |   5 -
     .../engine/core/impl/RequestedAttributeImpl.java   |   5 -
     .../auth/engine/core/impl/SPApplicationImpl.java   |   5 -
     .../peps/auth/engine/core/impl/SPCountryImpl.java  |   5 -
     .../stork/peps/auth/engine/core/impl/SPIDImpl.java |   5 -
     .../auth/engine/core/impl/SPInformationImpl.java   |   5 -
     .../auth/engine/core/impl/SPInstitutionImpl.java   |   5 -
     .../stork/peps/auth/engine/core/impl/SignHW.java   |  78 +++++--------
     .../stork/peps/auth/engine/core/impl/SignP12.java  |  45 ++++----
     .../stork/peps/auth/engine/core/impl/SignSW.java   |  96 ++++++++--------
     .../impl/VIDPAuthenticationAttributesImpl.java     |   6 -
     .../validator/QAAAttributeSchemaValidator.java     |   8 +-
     .../peps/configuration/ConfigurationCreator.java   |  18 +--
     .../test/simple/StorkAttrQueryRequestTest.java     |  12 ++
     .../peps/test/simple/StorkAuthRequestTest.java     |  12 +-
     .../src/test/resources/SamlEngine.xml              | 124 ++++++++++++---------
     .../src/test/resources/SignModule_Conf0.xml        |  28 +++--
     .../src/test/resources/SignModule_Conf1.xml        |  14 +--
     .../src/test/resources/SignModule_Conf2.xml        |  14 +--
     .../src/test/resources/SignModule_Conf3.xml        |  14 +--
     .../src/test/resources/SignModule_P11.xml          |  13 ++-
     47 files changed, 685 insertions(+), 405 deletions(-)
    
    diff --git a/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java b/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
    index 9ed726a32..49ef68cb9 100644
    --- a/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
    +++ b/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
    @@ -76,10 +76,4 @@ public class EIDSectorShareImpl extends AbstractSAMLObject implements
         public final List getOrderedChildren() {
     	return null;
         }
    -
    -    @Override
    -    public int hashCode() {
    -        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -        return super.hashCode();
    -    }
     }
    \ No newline at end of file
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
    index f47cca6be..28115ae62 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
    @@ -1,13 +1,20 @@
     package eu.stork.peps.auth.commons;
     
    +import java.io.Serializable;
    +
     /**
      * This class is a bean used to store information relative to Attribute Names.
    - * 
    + *
      * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)
      *
      * @version $Revision: 1.00 $, $Date: 2013-11-26 $
      */
    -public final class AttributeName {
    +public final class AttributeName implements Serializable {
    +
    +	/**
    +     *
    +     */
    +	private static final long serialVersionUID = -3537736618869722308L;
     
     	/**
     	 * Attribute Id.
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
    index 24d93f9bb..c59109092 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
    @@ -91,4 +91,22 @@ public class AttributeProvidersMap extends LinkedHashMap maKeys = aPMap.keyIterator();
    +		while (maKeys.hasNext()) {
    +			AttributeSource key = maKeys.next();
    +			IPersonalAttributeList l2 = aPMap.get(key);
    +			if (containsKey(key)) {
    +				IPersonalAttributeList l1 = get(key);
    +				for (PersonalAttribute pa : l2) {
    +					if (!l1.containsKey(pa.getName())) {
    +						l1.add(pa);
    +					}
    +				}
    +			} else {
    +				put(key, l2);
    +			}
    +		}
    +	}
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java
    index 8064131a7..eb5e3ded4 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java
    @@ -148,10 +148,11 @@ public final class AttributeSource implements Serializable {
     		LOG.debug("Calling equals with Object.");
     		if (obj instanceof AttributeSource) {
     			LOG.debug("Calling equals with AttributeSource.");
    -			outcome = this.equals((AttributeSource) obj);
    +			outcome = this.innerEquals((AttributeSource) obj);
    +		}
    +		if (LOG.isDebugEnabled()) {
    +			LOG.debug("Object equals outcome: " + outcome);
     		}
    -
    -		LOG.debug("Object equals outcome: " + outcome);
     		return outcome;
     	}
     
    @@ -163,7 +164,7 @@ public final class AttributeSource implements Serializable {
     	 * 
     	 * @return true if the two objects are equal
     	 */
    -	public boolean equals(AttributeSource obj) {
    +	public boolean innerEquals(AttributeSource obj) {
     		boolean outcome = false;
     
     		if (this.sourceType == obj.getSourceType()) {
    @@ -175,8 +176,9 @@ public final class AttributeSource implements Serializable {
     					outcome = true;
     			}
     		}
    -
    -		LOG.debug("AttributeSource equals outcome: " + outcome);
    +		if (LOG.isDebugEnabled()) {
    +			LOG.debug("AttributeSource equals outcome: " + outcome);
    +		}
     		return outcome;
     	}
     
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java
    index 18218dce4..f49986aaf 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java
    @@ -108,7 +108,7 @@ public final class AttributeUtil {
     				strBuilder.append(AttributeUtil.escape(s) + separator);
     			}
     		}
    -		return strBuilder.toString();
    +		return strBuilder.substring(0, strBuilder.length() - 1).toString();
     	}
     
     	/**
    @@ -132,7 +132,7 @@ public final class AttributeUtil {
     			strBuilder.append(AttributeUtil.escape(entry.getValue()));
     			strBuilder.append(separator);
     		}
    -		return strBuilder.toString();
    +		return strBuilder.substring(0, strBuilder.length() - 1).toString();
     	}
     
     	/**
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java
    index ffae4ae67..bdcf58fec 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java
    @@ -108,6 +108,18 @@ public interface IAttributeListProcessor {
     	 */
     	IPersonalAttributeList removeAPMandatoryAttributes(IPersonalAttributeList attrList, Map attributes);
     
    +	/**
    +	 * Removes from attribute list the Stork list of attributes.
    +	 *
    +	 * @param attrList
    +	 *            the requested attribute list
    +	 *
    +	 * @return the attribute list without rejected attributes.
    +	 *
    +	 * @see IPersonalAttributeList
    +	 */
    +	IPersonalAttributeList removeAPRejectedAttributes(IPersonalAttributeList attrList);
    +
     	/**
     	 * Checks if mandate attribute exist in the requested Attribute List. Power attribute name to lookup is loaded by implementation.
     	 * 
    @@ -153,4 +165,39 @@ public interface IAttributeListProcessor {
     	 */
     	Map getNormalAttributesAdded();
     
    -}
    \ No newline at end of file
    +	/**
    +	 * Adds normal attributes to personal attribute list if exist in original list (allAttrList).
    +	 *
    +	 * @param attrList
    +	 *            the list which will be updated
    +	 * @param allAttrList
    +	 *            the list to check if attributes are to be included.
    +	 *
    +	 *
    +	 * @return the attributes list updated.
    +	 */
    +	IPersonalAttributeList addNormalAttributes(IPersonalAttributeList attrList, IPersonalAttributeList allAttrList);
    +
    +	/**
    +	 * Updates list by filtering any attribute that must be requested instead of using a value obtained from cache (business and legal attrs)
    +	 *
    +	 * @param attrList
    +	 *            the list which will be updated
    +	 * @return the filtered list
    +	 */
    +	IPersonalAttributeList filterAttrList(IPersonalAttributeList attrList);
    +
    +	/**
    +	 * Updates the list of cached attrs by inserting the business and/or legal attrs requested by the user
    +	 *
    +	 * @param cachedAttrList
    +	 * @param requestedAttrsList
    +	 */
    +	void updateAttrList(IPersonalAttributeList cachedAttrList, IPersonalAttributeList requestedAttrsList);
    +
    +	/**
    +	 * Verifies if normal attribute list contains any attribute that we must always request (usually business attributes)
    +	 */
    +	boolean hasAlwaysRequestAttributes(IPersonalAttributeList attributeList);
    +
    +}
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java
    index aa0ddf85b..cc5fe977f 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java
    @@ -78,4 +78,11 @@ public interface IAttributeProvidersMap {
     	 * @return an iterator of the keys contained in this map
     	 */
     	Iterator keyIterator();
    +
    +	/**
    +	 * Merges this Attribute Providers Map with another providers map changes the contents of this map so it returns null
    +	 *
    +	 * @param aPMap
    +	 */
    +	void mergeWith(IAttributeProvidersMap aPMap);
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java
    index 71b3400b4..7eb788461 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java
    @@ -42,6 +42,20 @@ public interface IPersonalAttributeList extends Iterable, Clo
     	 */
     	PersonalAttribute put(String key, PersonalAttribute value);
     
    +	/**
    +	 * Replaces the specified value with the specified key in this Personal Attribute List.
    +	 *
    +	 * @param key
    +	 *            with which the specified value is to be replaced.
    +	 * @param value
    +	 *            to be associated with the specified key.
    +	 *
    +	 * @return the previous value associated with key, or null if there was no mapping for key.
    +	 *
    +	 * @see PersonalAttribute
    +	 */
    +	PersonalAttribute replace(String key, PersonalAttribute value);
    +
     	/**
     	 * Returns the value to which the specified key is mapped, or null if this map contains no mapping for the key.
     	 * 
    @@ -146,6 +160,13 @@ public interface IPersonalAttributeList extends Iterable, Clo
     	 */
     	IPersonalAttributeList getMandatoryAttributes();
     
    +	/**
    +	 * Returns a IPersonalAttributeList merged with provided one.
    +	 *
    +	 * @return an IPersonalAttributeList the attribute list to merge with.
    +	 */
    +	IPersonalAttributeList merge(IPersonalAttributeList attrList);
    +
     	/**
     	 * Returns a IPersonalAttributeList of the optional attributes in this map.
     	 * 
    @@ -172,6 +193,6 @@ public interface IPersonalAttributeList extends Iterable, Clo
     	 *
     	 * @return The copy of this IPersonalAttributeList.
     	 */
    -	Object clone() throws CloneNotSupportedException;
    +	Object clone();
     
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
    index f82f6fbcc..87ab4275f 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
    @@ -5,6 +5,7 @@ import java.util.ArrayList;
     import java.util.Iterator;
     import java.util.LinkedHashMap;
     import java.util.List;
    +import java.util.Map;
     
     import org.apache.log4j.Logger;
     
    @@ -36,7 +37,7 @@ public final class Linker implements Serializable {
     	/**
     	 * Assertion map.
     	 */
    -	private LinkedHashMap assertions;
    +	private Map> assertions;
     
     	/**
     	 * The current index of local (domestic) Attribute Providers.
    @@ -55,7 +56,7 @@ public final class Linker implements Serializable {
     		localIndex = 0;
     		remoteIndex = 0;
     
    -		assertions = new LinkedHashMap();
    +		assertions = new LinkedHashMap>();
     	}
     
     	/**
    @@ -143,13 +144,19 @@ public final class Linker implements Serializable {
     			localIndex++;
     
     		// Assertion storage
    -		this.assertions.put(source, attrResponse);
    -		// previously: getTotalPersonalAttributeList() in both cases
    -		if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY)
    +		if (this.assertions.containsKey(source)) {
    +			this.assertions.get(source).add(attrResponse);
    +		} else {
    +			List temp = new ArrayList();
    +			temp.add(attrResponse);
    +			this.assertions.put(source, temp);
    +		}
    +
    +		if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY) {
     			this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());
    -		else
    +		} else {
     			this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList());
    -		// this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());
    +		}
     	}
     
     	/**
    @@ -312,5 +319,13 @@ public final class Linker implements Serializable {
     			LOG.debug("The attributeProvidersMap after the merge.");
     			((AttributeProvidersMap) this.attributeProvidersMap).trace();
     		}
    +
    +		for (AttributeSource as : previous.assertions.keySet()) {
    +			if (!assertions.containsKey(as)) {
    +				assertions.put(as, previous.assertions.get(as));
    +			} else {
    +				assertions.get(as).addAll(previous.assertions.get(as));
    +			}
    +		}
     	}
    -}
    \ No newline at end of file
    +}
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
    index ac83d5ddf..7d758d754 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
    @@ -314,7 +314,17 @@ public enum PEPSErrors {
     	/**
     	 * Represents the 'invalid.attr.country.code' constant error identifier.
     	 */
    -	INVALID_COUNTRY_CODE("invalid.attr.country.code");
    +	INVALID_COUNTRY_CODE("invalid.attr.country.code"),
    +	/**
    +	 * DTL error codes.
    +	 */
    +	DTL_ERROR_ADD("dtl.error.adding.doc"), DTL_ERROR_GET("dtl.error.getting.doc"), DTL_ERROR_REQUEST("dtl.error.request.attribute"), DTL_INVALID_XML("dtl.invalid.xml"), DTL_EMPTY_REQUEST(
    +			"dtl.empty.request"), DTL_ERROR_DOCUMENT_URL("dtl.error.no.document.url"), DTL_ERROR_NO_DOCUMENT("dtl.error.no.document"), DTL_ERROR_MARSHALL_SIGNREQUEST("dtl.error.marshall.signrequest"), DTL_ERROR_MARSHALL_SIGNRESPONSE(
    +			"dtl.error.marshall.signresponse"),
    +	/**
    +	 * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier.
    +	 */
    +	COLLEAGUE_LOGOUT_INVALID_SAML("colleagueLogoutRequest.invalidSAML");
     
     	/**
     	 * Represents the constant's value.
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
    index ec967a2ee..6b876b680 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
    @@ -68,6 +68,10 @@ public enum PEPSParameters {
     	 * Represents the 'attrList' parameter constant.
     	 */
     	ATTRIBUTE_LIST("attrList"),
    +	/**
    +	 * Represents the 'allAttrList' parameter constant.
    +	 */
    +	ALL_ATTRIBUTE_LIST("allAttrList"),
     	/**
     	 * Represents the 'apMandAttrList' parameter constant.
     	 */
    @@ -106,7 +110,7 @@ public enum PEPSParameters {
     	/**
     	 * Represents the complex attributes parameter constant.
     	 */
    -	COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"), COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"), COMPLEX_HASDEGREE_VALUE("hasDegree"), COMPLEX_MANDATECONTENT_VALUE("mandateContent"),
    +	COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"), COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"), COMPLEX_HASDEGREE_VALUE("hasDegree"), COMPLEX_MANDATECONTENT_VALUE("mandate"),
     	/**
     	 * Represents the 'consent-type' parameter constant.
     	 */
    @@ -603,8 +607,23 @@ public enum PEPSParameters {
     	/**
     	 * Represents the 'idPDerivedAttrList' parameter constant.
     	 */
    -
    -	IDP_DERIVED_ATTR_LIST("idPDerivedAttrList");
    +	IDP_DERIVED_ATTR_LIST("idPDerivedAttrList"),
    +	/**
    +	 * Represents the 'apRejectedAttrsList' parameter constant.
    +	 */
    +	AP_REJECTED_ATTRS_LIST("apRejectedAttrsList"),
    +	/**
    +	 * Represents the 'logoutRequest' parameter constant.
    +	 */
    +	LOGOUT_REQUEST("logoutRequest"),
    +	/**
    +	 * Represents the 'logoutRequest' parameter constant.
    +	 */
    +	LOGOUT_RESPONSE("logoutResponse"),
    +	/**
    +	 * Represents the 'logoutRequest' parameter constant.
    +	 */
    +	LOGOUT_DEST_URL("speps.logout.destination.url");
     
     	/**
     	 * Represents the constant's value.
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java
    index 9cc587d7f..a63db12e1 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java
    @@ -246,7 +246,11 @@ public enum PEPSValues {
     	/**
     	 * Represents the 'attr-filter' constant value.
     	 */
    -	AP_ATTRFILTER_PREFIX("attr-filter");
    +	AP_ATTRFILTER_PREFIX("attr-filter"),
    +	/**
    +	 * Represents the 'save-session' constant value.
    +	 */
    +	SAVED_SESSION("saved-session");
     
     	/**
     	 * Represents the constant's value.
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java
    index 49ea3e695..8d1482f05 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java
    @@ -18,7 +18,7 @@ import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
    -import java.util.concurrent.ConcurrentHashMap;
    +import java.util.Vector;
     
     import org.apache.log4j.Logger;
     
    @@ -60,7 +60,7 @@ public final class PersonalAttribute implements Serializable, Cloneable {
     	/**
     	 * Complex values of the personal attribute.
     	 */
    -	private Map complexValue = new ConcurrentHashMap();
    +	private List> complexValue = new Vector>();
     
     	/**
     	 * Is the personal attribute mandatory?
    @@ -138,8 +138,7 @@ public final class PersonalAttribute implements Serializable, Cloneable {
     				personalAttr.setValue(val);
     			}
     			if (!isEmptyComplexValue()) {
    -				final Map complexVal = (Map) ((HashMap) this.getComplexValue()).clone();
    -				personalAttr.setComplexValue(complexVal);
    +				personalAttr.addComplexValues(this.getComplexValues());
     			}
     			return personalAttr;
     		} catch (final CloneNotSupportedException e) {
    @@ -208,6 +207,18 @@ public final class PersonalAttribute implements Serializable, Cloneable {
     		}
     	}
     
    +	/**
    +	 * Add new value to list of values.
    +	 *
    +	 * @param attrValue
    +	 *            The personal attribute value.
    +	 */
    +	public void addValue(final String attrValue) {
    +		if (attrValue != null) {
    +			this.value.add(attrValue);
    +		}
    +	}
    +
     	/**
     	 * Getter for the type value.
     	 * 
    @@ -252,6 +263,19 @@ public final class PersonalAttribute implements Serializable, Cloneable {
     	 * @return The complex value.
     	 */
     	public Map getComplexValue() {
    +		if (complexValue.size() > 0) {
    +			return complexValue.get(0);
    +		} else {
    +			return new HashMap();
    +		}
    +	}
    +
    +	/**
    +	 * Getter for the complex values.
    +	 *
    +	 * @return The complex value.
    +	 */
    +	public List> getComplexValues() {
     		return complexValue;
     	}
     
    @@ -263,10 +287,20 @@ public final class PersonalAttribute implements Serializable, Cloneable {
     	 */
     	public void setComplexValue(final Map complexVal) {
     		if (complexVal != null) {
    -			this.complexValue = complexVal;
    +			this.complexValue.add(complexVal);
     		}
     	}
     
    +	/**
    +	 * Setter for the complex values.
    +	 *
    +	 * @param complexVal
    +	 *            The personal attribute Complex values.
    +	 */
    +	public void addComplexValues(final List> complexVals) {
    +		this.complexValue.addAll(complexVals);
    +	}
    +
     	/**
     	 * Getter for the personal's friendly name.
     	 * 
    @@ -301,7 +335,7 @@ public final class PersonalAttribute implements Serializable, Cloneable {
     	 * @return True if the Complex Value is empty;
     	 */
     	public boolean isEmptyComplexValue() {
    -		return complexValue.isEmpty();
    +		return complexValue.isEmpty() || complexValue.get(0).isEmpty();
     	}
     
     	/**
    @@ -343,4 +377,15 @@ public final class PersonalAttribute implements Serializable, Cloneable {
     		return strBuild.toString();
     	}
     
    +	/**
    +	 * Empties the Value or ComplexValue field of a PersonalAttribute
    +	 */
    +	public void setEmptyValue() {
    +		if (this.isEmptyValue()) {
    +			this.complexValue = new Vector>();
    +		} else {
    +			this.value = new ArrayList();
    +		}
    +	}
    +
     }
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
    index 8f60bdc0d..233cdebd0 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
    @@ -13,7 +13,6 @@
      */
     package eu.stork.peps.auth.commons;
     
    -import java.io.Serializable;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.Iterator;
    @@ -34,7 +33,7 @@ import org.apache.log4j.Logger;
      * @see PersonalAttribute
      */
     @SuppressWarnings("PMD")
    -public final class PersonalAttributeList extends ConcurrentHashMap implements IPersonalAttributeList, Serializable {
    +public final class PersonalAttributeList extends ConcurrentHashMap implements IPersonalAttributeList {
     
     	/**
     	 * Logger object.
    @@ -88,10 +87,17 @@ public final class PersonalAttributeList extends ConcurrentHashMap this.attrAliasNumber.get(key).size()) {
    +				index = 0;
    +			}
    +
    +			attrName = this.attrAliasNumber.get(key).get(index);
    +			this.latestAttrAlias.put((String) key, Integer.valueOf(++index));
     		} else {
     			if (this.attrAliasNumber.containsKey(key)) {
    -				this.latestAttrAlias.put(attrName, this.attrAliasNumber.get(key));
    +				this.latestAttrAlias.put((String) key, Integer.valueOf(0));
    +				attrName = this.attrAliasNumber.get(key).get(0);
     			}
     		}
     		return super.get(attrName);
    @@ -106,6 +112,13 @@ public final class PersonalAttributeList extends ConcurrentHashMap 4) {
    +				LOG.info("Found attributes with special characters, escaping special characters");
    +
    +				if (s.split(reqRegex) == null) {
    +					boolAttr = PEPSValues.FALSE.toString();
    +				}
    +
    +				tempBuilder.setLength(0);
    +				tempBuilder.append(AttributeUtil.escape(s.split(reqRegexSeparator)[0]));
    +				tempBuilder.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
    +				tempBuilder.append(boolAttr);
    +				tempBuilder.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
    +				tempBuilder.append(s.split(reqRegexSeparator)[1]);
    +
    +			}
    +
    +			finalAttr.append(tempBuilder.toString());
    +			finalAttr.append(PEPSValues.ATTRIBUTE_SEP.toString());
    +		}
    +		return finalAttr.toString();
    +	}
    +
    +	/**
    +	 * Unescape a string
    +	 *
    +	 * @see PersonalAttributeList#attrListEncoder
    +	 *
     	 */
    +	private String attrListDecoder(String string) {
    +		return AttributeUtil.unescape(string);
    +	}
    +
     	public void populate(final String attrList) {
    -		final StringTokenizer strToken = new StringTokenizer(attrList, PEPSValues.ATTRIBUTE_SEP.toString());
    +
    +		final StringTokenizer strToken = new StringTokenizer(attrListEncoder(attrList), PEPSValues.ATTRIBUTE_SEP.toString());
     
     		while (strToken.hasMoreTokens()) {
     			final PersonalAttribute persAttr = new PersonalAttribute();
    @@ -163,6 +222,9 @@ public final class PersonalAttributeList extends ConcurrentHashMap getNormalizedPersonalAttributeList() {
    +		List returnAttrList = new ArrayList();
    +
    +		if (this.totalAttributeList.isEmpty()) {
    +			this.totalAttributeList = this.attributeList;
    +		}
    +
    +		for (PersonalAttribute pa : this.totalAttributeList) {
    +			// Get the shortname of the attribute by removing
    +			// the attached assertionId, if there is one and
    +			// put the shortname as the attribute name
    +			pa.setName(pa.getName().split("_")[0]);
    +			// We add it to the return list.
    +			returnAttrList.add(pa);
     		}
    -		return personnalAttributeList;
    +		return returnAttrList;
     	}
     
     	/**
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    index 6eaa63c5a..82ec6d3b4 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    @@ -71,19 +71,19 @@ public class ObjectFactory {
     	}
     
     	/**
    -	 * Create an instance of {@link MandateType }
    -	 * 
    +	 * Create an instance of {@link RequestedAttributeType }
    +	 *
     	 */
    -	public MandateType createMandateType() {
    -		return new MandateType();
    +	public RequestedAttributeType createRequestedAttributeType() {
    +		return new RequestedAttributeType();
     	}
     
     	/**
    -	 * Create an instance of {@link RequestedAttributeType }
    -	 * 
    +	 * Create an instance of {@link MandateType }
    +	 *
     	 */
    -	public RequestedAttributeType createRequestedAttributeType() {
    -		return new RequestedAttributeType();
    +	public MandateType createMandateType() {
    +		return new MandateType();
     	}
     
     	/**
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
    index f4d084a79..1dcaf4c95 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
    @@ -97,7 +97,14 @@ public class SAMLEngine {
     	/** The Constant SAML_ENGINE_FILE_CONF. */
     	private static final String SAML_ENGINE_FILE_CONF = "fileConfiguration";
     
    -	/** The codification of characters. */
    +	/**
    +	 * Additional trust store for HW signing
    +	 */
    +	private static final String HW_TRUST_STORE_CONF = "softTrustStoreConfig";
    +
    +	/**
    +	 * The codification of characters.
    +	 */
     	private static final String CHARACTER_ENCODING = "UTF-8";
     
     	/** The SAML core. */
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
    index 6a7e1f7c0..7bf5d5ca8 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
    @@ -202,8 +202,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		try {
     			engine = new STORKSAMLEngine(nameInstance.trim());
     		} catch (Exception e) {
    -			LOG.error("Error getting instance: " + nameInstance);
    -			e.printStackTrace();
    +			LOG.error("Error get instance: " + nameInstance);
     		}
     		return engine;
     	}
    @@ -389,15 +388,9 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		final Subject subject = SAMLEngineUtils.generateSubject();
     
    -		// Mandatory STORK verified
    -		// String format = NameID.UNSPECIFIED
    -		// specification: 'SAML:2.0' exist
    -		// opensaml: "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
    -		// opensaml "urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified"
    -		final String format = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
    +		final String format = super.getSamlCoreProperties().getFormat();
     
     		final String nameQualifier = "";
    -
     		LOG.debug("Generate NameID");
     		final NameID nameId = SAMLEngineUtils.generateNameID(super.getSamlCoreProperties().getResponder(), format, nameQualifier);
     		nameId.setValue(format);
    @@ -1102,7 +1095,6 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		// Validate Parameters mandatories
     		validateParamAttrQueryReq(request);
     
    -		// final AttributeQuery attrQueryRequestAux = SAMLEngineUtils
     		final CustomAttributeQuery attrQueryRequestAux = SAMLEngineUtils.generateSAMLAttrQueryRequest(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime());
     
     		// Set name spaces.
    @@ -1930,6 +1922,8 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
     
     			citizenCountryCode.setCitizenCountryCode(request.getCitizenCountryCode().toUpperCase());
    +
    +			extensions.getUnknownXMLObjects().add(citizenCountryCode);
     		}
     
     		SPID spid = null;
    @@ -1938,6 +1932,8 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			spid = (SPID) SAMLEngineUtils.createSamlObject(SPID.DEF_ELEMENT_NAME);
     
     			spid.setSPID(request.getSPID().toUpperCase());
    +
    +			extensions.getUnknownXMLObjects().add(spid);
     		}
     
     		return extensions;
    @@ -2493,11 +2489,6 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			throw new STORKSAMLEngineException("StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
     		}
     
    -		// Destination of the request - not mandatory
    -		/*
    -		 * if (StringUtils.isBlank(request.getDestination())) { throw new STORKSAMLEngineException( "StorkSamlEngine: Destination is mandatory."); }
    -		 */
    -
     		// SP country is empty
     		if (StringUtils.isBlank(request.getSpCountry())) {
     			throw new STORKSAMLEngineException("StorkSamlEngine: SP country is mandatory.");
    @@ -2525,12 +2516,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
     	 */
     	private void validateParamLogoutReq(final STORKLogoutRequest request) throws STORKSAMLEngineException {
     		LOG.info("Validate parameters from logout request.");
    -
     		// URL to which AP Response must be sent.
    -		/*
    -		 * if (StringUtils.isBlank(request.get())) { throw new STORKSAMLEngineException( "StorkSamlEngine: Assertion Consumer Service URL it's mandatory."); }
    -		 */
    -
     		// Destination of the request
     		if (StringUtils.isBlank(request.getDestination())) {
     			throw new STORKSAMLEngineException("StorkSamlEngine: Destination is mandatory.");
    @@ -2591,9 +2577,9 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
     		}
     
    -		if (responseAuthReq.getPersonalAttributeList() == null || responseAuthReq.getPersonalAttributeList().isEmpty()) {
    -			LOG.error("PersonalAttributeList is null or empty.");
    -			throw new STORKSAMLEngineException("PersonalAttributeList is null or empty.");
    +		if (responseAuthReq.getPersonalAttributeList() == null) {
    +			LOG.error("PersonalAttributeList is null.");
    +			throw new STORKSAMLEngineException("PersonalAttributeList is null.");
     		}
     
     		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
    @@ -2627,10 +2613,6 @@ public final class STORKSAMLEngine extends SAMLEngine {
     			throw new STORKSAMLEngineException("PersonalAttributeList is null or empty.");
     		}
     
    -		/*
    -		 * if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) { throw new STORKSAMLEngineException( "assertionConsumerServiceURL is null or empty."); }
    -		 */
    -
     		if (StringUtils.isBlank(request.getSamlId())) {
     			throw new STORKSAMLEngineException("request ID is null or empty.");
     		}
    @@ -2840,7 +2822,6 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		attrRequest.setDestination(samlRequest.getDestination());
     		attrRequest.setAssertionConsumerServiceURL(samlRequest.getAssertionConsumerServiceURL());
     
    -		/* authnRequest.setProviderName(samlRequest.getProviderName()); */
     		attrRequest.setIssuer(samlRequest.getIssuer().getValue());
     
     		// Delete unknown elements from requested ones
    @@ -2881,13 +2862,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     		final LogoutRequest samlRequest = (LogoutRequest) validateStorkSaml(tokenSaml);
     
    -		LOG.debug("Validate Extensions.");
    -		final Validator validatorExt = new ExtensionsSchemaValidator();
    -		try {
    -			validatorExt.validate(samlRequest.getExtensions());
    -		} catch (ValidationException e) {
    -			LOG.error("ValidationException: validate Extensions.", e);
    -			throw new STORKSAMLEngineException(e);
    +		if (samlRequest.getExtensions() != null) {
    +			LOG.debug("Validate Extensions.");
    +			final Validator validatorExt = new ExtensionsSchemaValidator();
    +			try {
    +				validatorExt.validate(samlRequest.getExtensions());
    +			} catch (ValidationException e) {
    +				LOG.error("ValidationException: validate Extensions.", e);
    +				throw new STORKSAMLEngineException(e);
    +			}
     		}
     
     		LOG.debug("Generate STORKLogoutRequest.");
    @@ -2908,6 +2891,43 @@ public final class STORKSAMLEngine extends SAMLEngine {
     
     	}
     
    +	/**
    +	 * Validate stork logout response.
    +	 * 
    +	 * @param tokenSaml
    +	 *            The SAML token
    +	 * 
    +	 * @return the STORK logout response
    +	 * 
    +	 * @throws STORKSAMLEngineException
    +	 *             the STORKSAML engine exception
    +	 */
    +	public STORKLogoutResponse validateSTORKLogoutResponse(final byte[] tokenSaml) throws STORKSAMLEngineException {
    +
    +		LOG.info("validate STORK Logout Response");
    +
    +		final LogoutResponse samlRes = (LogoutResponse) validateStorkSaml(tokenSaml);
    +
    +		LOG.debug("Generate STORKLogoutResponse.");
    +		final STORKLogoutResponse logoutRes = new STORKLogoutResponse();
    +
    +		try {
    +			logoutRes.setTokenSaml(super.signAndMarshall(samlRes));
    +		} catch (SAMLEngineException e) {
    +			LOG.error("Sign and Marshall.", e);
    +			throw new STORKSAMLEngineException(e);
    +		}
    +
    +		logoutRes.setAlias(this.getAlias(samlRes.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
    +		logoutRes.setSamlId(samlRes.getID());
    +		logoutRes.setDestination(samlRes.getDestination());
    +		logoutRes.setIssuer(samlRes.getIssuer().getValue());
    +		logoutRes.setStatusCode(samlRes.getStatus().getStatusCode().getValue().toString());
    +		logoutRes.setStatusMessage(samlRes.getStatus().getStatusMessage().getMessage().toString());
    +		logoutRes.setInResponseTo(samlRes.getInResponseTo());
    +		return logoutRes;
    +	}
    +
     	/**
     	 * Validate stork authentication response.
     	 * 
    @@ -3060,16 +3080,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
     		authnResponse.setAssertions(samlResponse.getAssertions());
     		if (samlResponse.getAssertions().size() > 1) {
     			PersonalAttributeList total = new PersonalAttributeList();
    -			List attrList = new ArrayList();
    +			List attrList = new ArrayList();
     			for (int i = 0; i < samlResponse.getAssertions().size(); i++) {
     				Assertion tempAssertion = (Assertion) samlResponse.getAssertions().get(i);
     				IPersonalAttributeList temp = generatePersonalAttributeList(tempAssertion);
     				if (temp != null) {
     					attrList.add(temp);
    -					for (PersonalAttribute attribute : temp) {
    -						PersonalAttribute attr = (PersonalAttribute) attribute.clone();
    -						attr.setName(attr.getName() + tempAssertion.getID());
    -						total.add(attr);
    +					for (PersonalAttribute attribute : (IPersonalAttributeList) temp.clone()) {
    +						attribute.setName(attribute.getName() + tempAssertion.getID());
    +						total.add(attribute);
     					}
     				}
     			}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
    index 175084048..73d7e4f62 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
    @@ -25,7 +25,7 @@ public final class X509PrincipalUtil {
     	 * @param principal2
     	 * @return true if arguments are not null and equals
     	 */
    -	public static boolean equals(X509Principal principal1, X509Principal principal2) {
    +	public static boolean X509equals(X509Principal principal1, X509Principal principal2) {
     		boolean continueProcess = true;
     		if (principal1 == null || principal2 == null) {
     			return false;
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
    index 922e7e61e..16b9afd18 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
    @@ -55,6 +55,9 @@ public enum SAMLCore {
     
     	/** The RESPONDE r_ tag. */
     	RESPONDER_TAG("responder"),
    +	
    +	/** The format r_tag. */
    +	FORMAT_TAG("format"),
     
     	/** The STOR k10_ ns. */
     	STORK10_NS("urn:eu:stork:names:tc:STORK:1.0:assertion"),
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
    index 13d2f0af4..2a548ca6f 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
    @@ -73,7 +73,11 @@ public final class STORKSAMLCore {
     	/** The responder. */
     	private String responder = null;
     
    -	/** The SAML core properties. */
    +	private String format = null;
    +
    +	/**
    +	 * The SAML core properties.
    +	 */
     	private Properties samlCoreProp = null;
     
     	/** The time not on or after. */
    @@ -188,6 +192,15 @@ public final class STORKSAMLCore {
     		return responder;
     	}
     
    +	/**
    +	 * return the format string.
    +	 * 
    +	 * @return
    +	 */
    +	public String getFormat() {
    +		return this.format;
    +	}
    +
     	/**
     	 * Gets the time not on or after.
     	 * 
    @@ -330,6 +343,8 @@ public final class STORKSAMLCore {
     			requester = samlCoreProp.getProperty(SAMLCore.REQUESTER_TAG.getValue());
     			responder = samlCoreProp.getProperty(SAMLCore.RESPONDER_TAG.getValue());
     
    +			format = samlCoreProp.getProperty(SAMLCore.FORMAT_TAG.getValue(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
    +
     		} catch (SAMLEngineException e) {
     			LOGGER.error("SAMLCore: error loadConfiguration. ", e);
     			throw new STORKSAMLEngineRuntimeException(e);
    @@ -491,6 +506,15 @@ public final class STORKSAMLCore {
     		this.responder = newResponder;
     	}
     
    +	/**
    +	 * Sets the format string
    +	 * 
    +	 * @param newFormat
    +	 */
    +	public void setFormat(final String newFormat) {
    +		this.format = newFormat;
    +	}
    +
     	/**
     	 * Sets the time not on or after.
     	 * 
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
    index 907b9bf68..9f602aba1 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
    @@ -102,9 +102,4 @@ public final class AuthenticationAttributesImpl extends AbstractSignableSAMLObje
     		vIDPAuthenAttr = prepareForAssignment(this.vIDPAuthenAttr, newVIDPAuthenAttr);
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
    index 003d56b46..aa4c725f1 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
    @@ -77,9 +77,4 @@ public class CitizenCountryCodeImpl extends AbstractSAMLObject implements Citize
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java
    index b5d194c7f..13cc3d287 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java
    @@ -77,9 +77,4 @@ public class EIDCrossBorderShareImpl extends AbstractSAMLObject implements EIDCr
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
    -}
    \ No newline at end of file
    +}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
    index f2762e327..2e3f6ab7e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
    @@ -78,9 +78,4 @@ public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements EIDCr
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
    -}
    \ No newline at end of file
    +}
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
    index 423cf8b25..e74ce1fec 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
    @@ -77,9 +77,4 @@ public class QAAAttributeImpl extends AbstractSAMLObject implements QAAAttribute
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
    index e7ac7213b..2537d3794 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
    @@ -213,9 +213,4 @@ public class RequestedAttributeImpl extends AbstractSAMLObject implements Reques
     		this.unknownAttributes = newUnknownAttr;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
    index 276697d6a..7f09d611f 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
    @@ -77,9 +77,4 @@ public class SPApplicationImpl extends AbstractSAMLObject implements SPApplicati
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
    index 404a90079..ea9085867 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
    @@ -77,9 +77,4 @@ public class SPCountryImpl extends AbstractSAMLObject implements SPCountry {
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
    index cea51a5a8..03dea20ed 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
    @@ -77,9 +77,4 @@ public class SPIDImpl extends AbstractSAMLObject implements SPID {
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
    index 4089f0862..41b3d8998 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
    @@ -101,9 +101,4 @@ public final class SPInformationImpl extends AbstractSignableSAMLObject implemen
     		this.spId = prepareForAssignment(this.spId, newSPId);
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
    index 054481744..ed0a75f35 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
    @@ -77,9 +77,4 @@ public class SPInstitutionImpl extends AbstractSAMLObject implements SPInstituti
     		return null;
     	}
     
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
    index 6e23d7f24..1cd5fb761 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
    @@ -72,6 +72,7 @@ import eu.stork.peps.exceptions.SAMLEngineException;
      * The Class HWSign. Module of sign.
      * 
      * @author fjquevedo
    + * @author advania
      */
     public final class SignHW implements SAMLEngineSignI {
     
    @@ -79,14 +80,19 @@ public final class SignHW implements SAMLEngineSignI {
     	private static final String CONF_FILE = "configurationFile";
     
     	/**
    -	 * The Constant KEYSTORE_TYPE. private static final String KEYSTORE_TYPE = "keystoreType"
    +	 * The Constant KEYSTORE_TYPE.
     	 */
    +	private static final String KEYSTORE_TYPE = "keystoreType";
     
     	/** The logger. */
     	private static final Logger LOG = LoggerFactory.getLogger(SignHW.class.getName());
     
     	/** The stork own key store. */
     	private KeyStore storkOwnKeyStore = null;
    +	/**
    +	 * The soft trust key store.
    +	 */
    +	private SignSW swTrustStore = null;
     
     	/**
     	 * Gets the stork own key store.
    @@ -160,6 +166,12 @@ public final class SignHW implements SAMLEngineSignI {
     			throw new SAMLEngineException(e);
     		} finally {
     			IOUtils.closeQuietly(inputStr);
    +			/**
    +			 * Init the soft keystore to validate with. trustStoreConfig is read from the SignModule config file and should refer to the keystore containing trusted certificates.
    +			 */
    +			swTrustStore = new SignSW();
    +			swTrustStore.init(properties.getProperty("trustStoreConfig"));
    +			swTrustStore.loadCryptServiceProvider();
     		}
     	}
     
    @@ -204,7 +216,7 @@ public final class SignHW implements SAMLEngineSignI {
     				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
     				X509Principal issuerDNConf = new X509Principal(issuer);
     
    -				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
    +				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.X509equals(issuerDN, issuerDNConf)) {
     					alias = aliasCert;
     					find = true;
     				}
    @@ -339,56 +351,14 @@ public final class SignHW implements SAMLEngineSignI {
     	 *             exception in validate signature
     	 */
     	public SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
    -		LOG.info("Start signature validation.");
    +		LOG.info("Start signature validation HW.");
    +		/*
    +		 * we are using the soft signature class to validate the signatures. This way we use the same key store code and validation that is used there.
    +		 */
     		try {
    -
    -			// Validate structure signature
    -			final SAMLSignatureProfileValidator signProfValidator = new SAMLSignatureProfileValidator();
    -
    -			// Indicates signature id conform to SAML Signature profile
    -			signProfValidator.validate(tokenSaml.getSignature());
    -
    -			String aliasCert;
    -			X509Certificate certificate;
    -
    -			final List trustedCred = new ArrayList();
    -
    -			for (final Enumeration e = storkOwnKeyStore.aliases(); e.hasMoreElements();) {
    -				aliasCert = e.nextElement();
    -				final BasicX509Credential credential = new BasicX509Credential();
    -				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
    -				credential.setEntityCertificate(certificate);
    -				trustedCred.add(credential);
    -			}
    -
    -			final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
    -			final List listCertificates = KeyInfoHelper.getCertificates(keyInfo);
    -
    -			if (listCertificates.size() != 1) {
    -				throw new SAMLEngineException("Only must be one certificate");
    -			}
    -
    -			// Exist only one certificate
    -			final BasicX509Credential entityX509Cred = new BasicX509Credential();
    -			entityX509Cred.setEntityCertificate(listCertificates.get(0));
    -
    -			final ExplicitKeyTrustEvaluator keyTrustEvaluator = new ExplicitKeyTrustEvaluator();
    -			if (!keyTrustEvaluator.validate(entityX509Cred, trustedCred)) {
    -				throw new SAMLEngineException("Certificate it is not trusted.");
    -			}
    -
    -			final SignatureValidator sigValidator = new SignatureValidator(entityX509Cred);
    -
    -			sigValidator.validate(tokenSaml.getSignature());
    -
    -		} catch (final ValidationException e) {
    -			LOG.error("ValidationException.", e);
    -			throw new SAMLEngineException(e);
    -		} catch (final KeyStoreException e) {
    -			LOG.error("ValidationException.", e);
    -			throw new SAMLEngineException(e);
    -		} catch (final CertificateException e) {
    -			LOG.error("CertificateException.", e);
    +			swTrustStore.validateSignature(tokenSaml);
    +		} catch (Exception e) {
    +			LOG.error("SW ValidationException.", e);
     			throw new SAMLEngineException(e);
     		}
     		return tokenSaml;
    @@ -408,6 +378,12 @@ public final class SignHW implements SAMLEngineSignI {
     
     		try {
     			inputStream = SignHW.class.getResourceAsStream("/" + properties.getProperty(CONF_FILE));
    +			final Provider pkcs11Provider = new sun.security.pkcs11.SunPKCS11(inputStream);
    +			if (Security.getProperty(pkcs11Provider.getName()) == null) {
    +				Security.insertProviderAt(pkcs11Provider, Security.getProviders().length);
    +			}
    +
    +			storkOwnKeyStore = KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE), pkcs11Provider);
     
     		} catch (final Exception e) {
     			throw new SAMLEngineException("Error loading CryptographicServiceProvider", e);
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
    index c91f11444..d5f01a4cc 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
    @@ -41,6 +41,7 @@ import eu.stork.peps.auth.engine.X509PrincipalUtil;
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang.NotImplementedException;
     import org.bouncycastle.jce.X509Principal;
    +import org.bouncycastle.jce.provider.BouncyCastleProvider;
     import org.opensaml.Configuration;
     import org.opensaml.common.SAMLObject;
     import org.opensaml.common.SignableSAMLObject;
    @@ -166,25 +167,25 @@ public final class SignP12 implements SAMLEngineSignI {
     		properties = new Properties();
     		try {
     			try {
    -				LOG.debug("Fichero a cargar " + fileConf);
    +				LOG.debug("Loading " + fileConf);
     				fileProperties = new FileInputStream(fileConf);
     				properties.loadFromXML(fileProperties);
     			} catch (Exception e) {
    -				LOG.error("Fallo al cargar el recurso externo. Se reintenta como fichero interno.");
    +				LOG.error("Failed to load external resource. Retrieving internal file.");
     				fileProperties = SignP12.class.getResourceAsStream("/" + fileConf);
     				if (fileProperties == null) {
     					fileProperties = Thread.currentThread().getContextClassLoader().getResourceAsStream(fileConf);
     					if (fileProperties == null) {
     						Enumeration files = ClassLoader.getSystemClassLoader().getResources(fileConf);
     						if (files != null && files.hasMoreElements()) {
    -							LOG.info("Se han encontrado recurso/s. Se toma el primero.");
    +							LOG.info("Found /s.");
     							fileProperties = ClassLoader.getSystemClassLoader().getResourceAsStream(files.nextElement().getFile());
     						} else {
    -							throw new IOException("No se pudo recuperar el fichero: " + fileConf, e);
    +							throw new IOException("Could not load file: " + fileConf, e);
     						}
     					}
     				}
    -				LOG.debug("Recuperados " + fileProperties.available() + " bytes");
    +				LOG.debug("Recovered " + fileProperties.available() + " bytes");
     				properties.loadFromXML(fileProperties);
     			}
     		} catch (InvalidPropertiesFormatException e) {
    @@ -243,7 +244,7 @@ public final class SignP12 implements SAMLEngineSignI {
     				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
     				X509Principal issuerDNConf = new X509Principal(issuer);
     
    -				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
    +				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.X509equals(issuerDN, issuerDNConf)) {
     					alias = aliasCert;
     					find = true;
     				}
    @@ -455,23 +456,21 @@ public final class SignP12 implements SAMLEngineSignI {
     		FileInputStream fisTrustStore = null;
     
     		try {
    -			// // Dynamically register Bouncy Castle provider.
    -			// boolean found = false;
    -			// // Check if BouncyCastle is already registered as a provider
    -			// final Provider[] providers = Security.getProviders();
    -			// for (int i = 0; i < providers.length; i++) {
    -			// if (providers[i].getName().equals(
    -			// BouncyCastleProvider.PROVIDER_NAME)) {
    -			// found = true;
    -			// }
    -			// }
    -			//
    -			// // Register only if the provider has not been previously registered
    -			// if (!found) {
    -			// LOG.debug("SAMLCore: Register Bouncy Castle provider.");
    -			// Security.insertProviderAt(new BouncyCastleProvider(), Security
    -			// .getProviders().length);
    -			// }
    +			// Dynamically register Bouncy Castle provider.
    +			boolean found = false;
    +			// Check if BouncyCastle is already registered as a provider
    +			final Provider[] providers = Security.getProviders();
    +			for (int i = 0; i < providers.length; i++) {
    +				if (providers[i].getName().equals(BouncyCastleProvider.PROVIDER_NAME)) {
    +					found = true;
    +				}
    +			}
    +
    +			// Register only if the provider has not been previously registered
    +			if (!found) {
    +				LOG.debug("SAMLCore: Register Bouncy Castle provider.");
    +				Security.insertProviderAt(new BouncyCastleProvider(), Security.getProviders().length);
    +			}
     
     			p12Store = KeyStore.getInstance(properties.getProperty("keystoreType"));
     
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
    index e1ae2b8e2..1ca857e9e 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
    @@ -12,17 +12,34 @@
      * Licence for the specific language governing permissions and limitations under
      * the Licence.
      */
    -
     package eu.stork.peps.auth.engine.core.impl;
     
    -import eu.stork.peps.auth.engine.X509PrincipalUtil;
    -import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
    -import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
    -import eu.stork.peps.exceptions.SAMLEngineException;
    +import java.io.ByteArrayInputStream;
    +import java.io.FileInputStream;
    +import java.io.IOException;
    +import java.io.InputStream;
    +import java.security.GeneralSecurityException;
    +import java.security.KeyStore;
    +import java.security.KeyStoreException;
    +import java.security.NoSuchAlgorithmException;
    +import java.security.PrivateKey;
    +import java.security.Provider;
    +import java.security.Security;
    +import java.security.UnrecoverableKeyException;
    +import java.security.cert.CertificateExpiredException;
    +import java.security.cert.CertificateFactory;
    +import java.security.cert.CertificateNotYetValidException;
    +import java.security.cert.X509Certificate;
    +import java.util.ArrayList;
    +import java.util.Enumeration;
    +import java.util.InvalidPropertiesFormatException;
    +import java.util.List;
    +import java.util.Properties;
    +
     import org.apache.commons.io.IOUtils;
     import org.apache.commons.lang.NotImplementedException;
     import org.bouncycastle.jce.X509Principal;
    -//import org.bouncycastle.jce.provider.BouncyCastleProvider;
    +import org.bouncycastle.jce.provider.BouncyCastleProvider;
     import org.opensaml.Configuration;
     import org.opensaml.common.SAMLObject;
     import org.opensaml.common.SignableSAMLObject;
    @@ -41,25 +58,22 @@ import org.opensaml.xml.security.keyinfo.NamedKeyInfoGeneratorManager;
     import org.opensaml.xml.security.trust.ExplicitKeyTrustEvaluator;
     import org.opensaml.xml.security.trust.ExplicitX509CertificateTrustEvaluator;
     import org.opensaml.xml.security.x509.BasicX509Credential;
    -import org.opensaml.xml.signature.*;
    +import org.opensaml.xml.signature.KeyInfo;
     import org.opensaml.xml.signature.Signature;
    +import org.opensaml.xml.signature.SignatureConstants;
     import org.opensaml.xml.signature.SignatureException;
    +import org.opensaml.xml.signature.SignatureValidator;
     import org.opensaml.xml.signature.Signer;
     import org.opensaml.xml.util.Base64;
     import org.opensaml.xml.validation.ValidationException;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     
    -import java.io.ByteArrayInputStream;
    -import java.io.FileInputStream;
    -import java.io.IOException;
    -import java.io.InputStream;
    -import java.security.*;
    -import java.security.cert.CertificateExpiredException;
    -import java.security.cert.CertificateFactory;
    -import java.security.cert.CertificateNotYetValidException;
    -import java.security.cert.X509Certificate;
    -import java.util.*;
    +import eu.stork.peps.auth.engine.X509PrincipalUtil;
    +import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
    +import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
    +import eu.stork.peps.exceptions.SAMLEngineException;
    +
     
     /**
      * The Class SWSign. Class responsible for signing and validating of messages SAML with a certificate store software.
    @@ -215,16 +229,12 @@ public class SignSW implements SAMLEngineSignI {
     
     				final String serialNum = certificate.getSerialNumber().toString(16);
     
    -				try {
    -					X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
    -					X509Principal issuerDNConf = new X509Principal(issuer);
    +				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
    +				X509Principal issuerDNConf = new X509Principal(issuer);
     
    -					if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
    -						alias = aliasCert;
    -						find = true;
    -					}
    -				} catch (Exception ex) {
    -					LOG.error("Exception during signing: " + ex.getMessage()); // Added as a workaround for Bouncycastle email error
    +				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.X509equals(issuerDN, issuerDNConf)) {
    +					alias = aliasCert;
    +					find = true;
     				}
     			}
     			if (!find) {
    @@ -344,7 +354,7 @@ public class SignSW implements SAMLEngineSignI {
     	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(org.opensaml.common.SignableSAMLObject)
     	 */
     	public final SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
    -		LOG.info("Start signature validation.");
    +		LOG.info("Start signature validation SW.");
     		try {
     
     			// Validate structure signature
    @@ -440,23 +450,21 @@ public class SignSW implements SAMLEngineSignI {
     		LOG.info("Load Cryptographic Service Provider");
     		FileInputStream fis = null;
     		try {
    -			// // Dynamically register Bouncy Castle provider.
    -			// boolean found = false;
    -			// // Check if BouncyCastle is already registered as a provider
    -			// final Provider[] providers = Security.getProviders();
    -			// for (int i = 0; i < providers.length; i++) {
    -			// if (providers[i].getName().equals(
    -			// BouncyCastleProvider.PROVIDER_NAME)) {
    -			// found = true;
    -			// }
    -			// }
    -			//
    -			// // Register only if the provider has not been previously registered
    -			// if (!found) {
    -			// LOG.info("SAMLCore: Register Bouncy Castle provider.");
    -			// Security.insertProviderAt(new BouncyCastleProvider(), Security
    -			// .getProviders().length);
    -			// }
    +			// Dynamically register Bouncy Castle provider.
    +			boolean found = false;
    +			// Check if BouncyCastle is already registered as a provider
    +			final Provider[] providers = Security.getProviders();
    +			for (int i = 0; i < providers.length; i++) {
    +				if (providers[i].getName().equals(BouncyCastleProvider.PROVIDER_NAME)) {
    +					found = true;
    +				}
    +			}
    +
    +			// Register only if the provider has not been previously registered
    +			if (!found) {
    +				LOG.info("SAMLCore: Register Bouncy Castle provider.");
    +				Security.insertProviderAt(new BouncyCastleProvider(), Security.getProviders().length);
    +			}
     
     			storkOwnKeyStore = KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE));
     
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
    index d7d92ea74..bfb85e357 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
    @@ -125,10 +125,4 @@ public final class VIDPAuthenticationAttributesImpl extends AbstractSignableSAML
     	public void setSPInformation(SPInformation newSPInformation) {
     		this.spInformation = prepareForAssignment(this.spInformation, newSPInformation);
     	}
    -
    -	@Override
    -	public int hashCode() {
    -		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
    -		return super.hashCode();
    -	}
     }
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
    index bf7626dc5..04ff153d3 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
    @@ -54,8 +54,12 @@ public class QAAAttributeSchemaValidator implements Validator {
     		if (DatatypeHelper.isEmpty(qaaAttribute.getQaaLevel())) {
     			throw new ValidationException("QAALevel label must be specified.");
     		}
    -
    -		final int qaa = Integer.valueOf(qaaAttribute.getQaaLevel());
    +		int qaa = 0;
    +		try {
    +			qaa = Integer.valueOf(qaaAttribute.getQaaLevel());
    +		} catch (Exception e) {
    +			throw new ValidationException("QAALevel is not a valid number!");
    +		}
     
     		if (qaa < QAAAttribute.MIN_VALUE || qaa > QAAAttribute.MAX_VALUE) {
     			throw new ValidationException("QAALevel label must be greater than 0.");
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    index 6e76c52a6..c0197b9db 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    @@ -12,15 +12,8 @@
      * Licence for the specific language governing permissions and limitations under
      * the Licence.
      */
    -
     package eu.stork.peps.configuration;
     
    -import eu.stork.peps.exceptions.STORKSAMLEngineException;
    -import org.apache.commons.io.IOUtils;
    -import org.slf4j.Logger;
    -import org.slf4j.LoggerFactory;
    -
    -import java.io.FileInputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.util.HashMap;
    @@ -28,6 +21,12 @@ import java.util.InvalidPropertiesFormatException;
     import java.util.Map;
     import java.util.Properties;
     
    +import org.apache.commons.io.IOUtils;
    +import org.slf4j.Logger;
    +import org.slf4j.LoggerFactory;
    +
    +import eu.stork.peps.exceptions.STORKSAMLEngineException;
    +
     /**
      * The Class InstanceCreator.
      *
    @@ -90,6 +89,7 @@ public final class ConfigurationCreator {
     	 *             the STORKSAML engine runtime exception
     	 */
     	private static Properties getNewInstance(final String fileName) throws STORKSAMLEngineException {
    +		LOGGER.info("Create file configuration properties to Stork Saml Engine: " + fileName);
     		InputStream fileEngineProp = null;
     
     		// fetch base from system properties, give a default if there is nothing configured
    @@ -115,10 +115,10 @@ public final class ConfigurationCreator {
     			configuration.loadFromXML(fileEngineProp);
     			return configuration;
     		} catch (InvalidPropertiesFormatException e) {
    -			LOGGER.error("Invalid properties format.");
    +			LOGGER.error("Invalid properties format: " + fileName);
     			throw new STORKSAMLEngineException(e);
     		} catch (IOException e) {
    -			LOGGER.error("Error read file: " + base + fileName);
    +			LOGGER.error("Error read file: " + fileName);
     			throw new STORKSAMLEngineException(e);
     		} finally {
     			IOUtils.closeQuietly(fileEngineProp);
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
    index 502e0e461..4f22df7fb 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
    @@ -59,6 +59,18 @@ public class StorkAttrQueryRequestTest {
     		givenName.setValue(Arrays.asList("Sveinbjorn"));
     		pal.add(givenName);
     
    +		final PersonalAttribute fiscalNumber = new PersonalAttribute();
    +		fiscalNumber.setName("fiscalNumber");
    +		fiscalNumber.setIsRequired(true);
    +		fiscalNumber.setValue(Arrays.asList("fiscalNumber"));
    +		pal.add(fiscalNumber);
    +
    +		final PersonalAttribute LPFiscalNumber = new PersonalAttribute();
    +		LPFiscalNumber.setName("LPFiscalNumber");
    +		LPFiscalNumber.setIsRequired(true);
    +		LPFiscalNumber.setValue(Arrays.asList("LPFiscalNumber"));
    +		pal.add(LPFiscalNumber);
    +
     		destination = "http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest";
     		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
     		// spName = "University of Oxford";
    diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
    index beca213ac..d476ad26e 100644
    --- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
    +++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
    @@ -21,15 +21,12 @@ import java.util.ArrayList;
     
     import org.junit.Ignore;
     import org.junit.Test;
    -
     import org.opensaml.xml.parse.BasicParserPool;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     
    -import eu.stork.peps.auth.commons.IPersonalAttributeList;
    -import eu.stork.peps.auth.commons.PersonalAttribute;
    -import eu.stork.peps.auth.commons.PersonalAttributeList;
    -import eu.stork.peps.auth.commons.STORKAuthnRequest;
    +import eu.stork.peps.*;
    +import eu.stork.peps.auth.commons.*;
     import eu.stork.peps.auth.engine.STORKSAMLEngine;
     import eu.stork.peps.exceptions.STORKSAMLEngineException;
     
    @@ -68,6 +65,11 @@ public class StorkAuthRequestTest {
     		eIDNumber.setIsRequired(true);
     		pal.add(eIDNumber);
     
    +		final PersonalAttribute LPFiscalNumber = new PersonalAttribute();
    +		LPFiscalNumber.setName("LPFiscalNumber");
    +		LPFiscalNumber.setIsRequired(true);
    +		pal.add(LPFiscalNumber);
    +
     		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
     		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
     
    diff --git a/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml b/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
    index 171e05f12..fadef82b2 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
    @@ -1,67 +1,85 @@
     
     
     
    -	
    -	
    -		
    -		
    -			
    -		
    +    
    +    
    +        
    +        
    +            
    +        
     
    -		
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    +        
    +        
    +            
    +            
    +            
    +            
    +            
    +        
    +    
     
    -	
    -	
    -	
    -		
    -		
    -			
    -		
    +    
    +    
    +    
    +        
    +        
    +            
    +        
     
    -		
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    +        
    +        
    +            
    +            
    +            
    +            
    +        
    +    
     
    -	
    +    
     
    -	
    -		
    -			
    -		
    +    
    +        
    +            
    +        
     
    -		
    -			
    -			
    -		
    -	
    +        
    +            
    +            
    +        
    +    
     
    -	
    +    
     
    -	
    -		
    -			
    -		
    +    
    +        
    +            
    +        
     
    -		
    -			
    -			
    -		
    -	
    +        
    +            
    +            
    +        
    +    
    +	
    +    
    +    
    +        
    +        
    +            
    +        
    +
    +        
    +        
    +            
    +            
    +            
    +            
    +            
    +        
    +    
     
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
    index abb071044..295258bb2 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
    @@ -1,17 +1,21 @@
     
     
     
    -
    +
     
    -	SWModule sign with JKS.
    -	C:\opt\keystores\storkDemoKeysTest.jks
    -	local-demo
    -	local-demo
    -	CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    -	4BA89DB2
    -	JKS
    +    SWModule sign with JKS.
    +    C:\opt\keystores\storkDemoKeysTest.jks
    +    local-demo
    +    local-demo
    +    CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    +    4BA89DB2
    +    JKS
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml
    index e556a7331..ffd41cb61 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml
    @@ -2,11 +2,11 @@
     
     
     
    -	SWModule sign with JKS.
    -	C:\opt\keystores\storkDemoKeysTest.jks
    -	local-demo
    -	local-demo
    -	CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    -	4BA89DB2
    -	JKS
    +    SWModule sign with JKS.
    +    C:\opt\keystores\storkDemoKeysTest.jks
    +    local-demo
    +    local-demo
    +    CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    +    4BA89DB2
    +    JKS
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml
    index 3da1e33df..21b73d49d 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml
    @@ -2,11 +2,11 @@
     
     
     
    -	SWModule sign with JKS.
    -	C:\opt\keystores\keyStoreCountry2.jks
    -	local-demo
    -	local-demo
    -	CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    -	4BA89DB2
    -	JKS
    +    SWModule sign with JKS.
    +    C:\opt\keystores\keyStoreCountry2.jks
    +    local-demo
    +    local-demo
    +    CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    +    4BA89DB2
    +    JKS
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
    index 4c14a1711..f9ebc85cc 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
    @@ -2,11 +2,11 @@
     
     
     
    -	SWModule sign with JKS.
    -	C:\opt\keystores\keyStoreCountry3.jks
    -	local-demo
    -	local-demo
    -	CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    -	4BA89DB2
    -	JKS
    +    SWModule sign with JKS.
    +    C:\opt\keystores\keyStoreCountry3.jks
    +    local-demo
    +    local-demo
    +    CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES
    +    4BA89DB2
    +    JKS
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml
    index c683d97c3..0e95da1f2 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml
    @@ -2,10 +2,11 @@
     
     
     
    -	HWModule sign with interface PKCS11.
    -	p11Config.cfg
    -	*******
    -	CN=XXXXXXXXX
    -	xxxxxxxxxxxxxx
    -	PKCS11
    +    HWModule sign with interface PKCS11.
    +    p11Conf.cfg
    +    12345
    +    CN=Test Certificate
    +    147d4b07db8
    +    PKCS11
    +    SignModule_Conf0.xml
     
    \ No newline at end of file
    -- 
    cgit v1.2.3
    
    
    From 2b8c631a8ef6d6970a482914e41c59f37e3a6d08 Mon Sep 17 00:00:00 2001
    From: Florian Reimair 
    Date: Mon, 10 Aug 2015 16:52:00 +0200
    Subject: approved tests
    
    ---
     .../peps/tests/AttributeProvidersMapTestCase.java  |  225 ++--
     .../stork/peps/tests/AttributeSourceTestCase.java  |  144 +-
     .../eu/stork/peps/tests/AttributeUtilTestCase.java |  937 ++++++-------
     .../peps/tests/ComplexAttributesMarshalling.java   |  445 +++----
     .../java/eu/stork/peps/tests/DateUtilTestCase.java |  480 +++----
     .../java/eu/stork/peps/tests/PEPSUtilTestCase.java |  936 +++++++------
     .../peps/tests/PersonalAttributeListTestCase.java  | 1387 +++++++++++---------
     .../peps/tests/PersonalAttributeTestCase.java      |  291 ++--
     .../java/eu/stork/peps/tests/package-info.java     |    1 -
     .../src/test/resources/StorkSamlEngine_Conf0.xml   |  189 +--
     .../src/test/resources/StorkSamlEngine_Conf1.xml   |  184 +--
     .../src/test/resources/StorkSamlEngine_Conf2.xml   |  151 ++-
     .../src/test/resources/StorkSamlEngine_Conf3.xml   |  144 +-
     .../eu/stork/STORKSAMLEngine/AttrQueryRequest.xml  |  148 +--
     .../stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml |  120 +-
     .../STORKSAMLEngine/AttrQueryRequestTagDelete.xml  |  126 +-
     .../eu/stork/STORKSAMLEngine/AttrQueryResponse.xml |  242 ++--
     .../data/eu/stork/STORKSAMLEngine/AuthnRequest.xml |  138 +-
     .../STORKSAMLEngine/AuthnRequestTagDelete.xml      |   88 +-
     .../AuthnRequestTagDeleteEncoded.xml               |   88 +-
     .../src/test/resources/logback-test.xml            |   26 +-
     .../src/test/resources/p11Conf.cfg                 |   30 +-
     22 files changed, 3443 insertions(+), 3077 deletions(-)
    
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
    index 65f1f2247..3d0aa4d45 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
    @@ -15,120 +15,121 @@ import eu.stork.peps.auth.commons.PersonalAttributeList;
     
     /**
      * The AttributeSource's Test Case.
    - * 
    - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)
    - * 
    + *
    + * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos
    + * (ilias@aegean.gr)
    + *
      * @version $Revision: $, $Date: $
      */
     public class AttributeProvidersMapTestCase {
     
    -	@Test
    -	public void testObjectOK1() {
    -		final IAttributeProvidersMap map = new AttributeProvidersMap();
    -		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final IPersonalAttributeList pal = new PersonalAttributeList();
    -		boolean outcome = false;
    -
    -		// Add a single item
    -		map.put(source, pal);
    -
    -		if (map.containsKey(source)) {
    -			outcome = true;
    -		}
    -
    -		assertTrue(outcome);
    -	}
    -
    -	@Test
    -	public void testObjectOK2() {
    -		final IAttributeProvidersMap map = new AttributeProvidersMap();
    -		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final IPersonalAttributeList pal = new PersonalAttributeList();
    -		boolean outcome = false;
    -
    -		// Add a single item
    -		map.put(source, pal);
    -
    -		if (map.containsKey(source)) {
    -			if (map.get(source) != null) {
    -				outcome = true;
    -			}
    -		}
    -
    -		assertTrue(outcome);
    -	}
    -
    -	@Test
    -	public void testObjectOK3() {
    -		final IAttributeProvidersMap map = new AttributeProvidersMap();
    -		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final IPersonalAttributeList pal = new PersonalAttributeList();
    -		boolean outcome = false;
    -
    -		// Add a single item
    -		map.put(source, pal);
    -
    -		if (map.containsKey(target)) {
    -			outcome = true;
    -		}
    -
    -		assertTrue(outcome);
    -	}
    -
    -	@Test
    -	public void testObjectOK4() {
    -		final IAttributeProvidersMap map = new AttributeProvidersMap();
    -		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final IPersonalAttributeList pal = new PersonalAttributeList();
    -		boolean outcome = false;
    -
    -		// Add a single item
    -		map.put(source, pal);
    -
    -		if (map.containsKey(target)) {
    -			if (map.get(target) != null) {
    -				outcome = true;
    -			}
    -		}
    -
    -		assertTrue(outcome);
    -	}
    -
    -	@Test
    -	public void testObjectNOK1() {
    -		final IAttributeProvidersMap map = new AttributeProvidersMap();
    -		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final AttributeSource target = new AttributeSource(new Country("ID1", "Name 1"), "URL");
    -		final IPersonalAttributeList pal = new PersonalAttributeList();
    -		boolean outcome = false;
    -
    -		// Add a single item
    -		map.put(source, pal);
    -
    -		if (map.containsKey(target)) {
    -			outcome = true;
    -		}
    -
    -		assertFalse(outcome);
    -	}
    -
    -	@Test
    -	public void testObjectNOK2() {
    -		final IAttributeProvidersMap map = new AttributeProvidersMap();
    -		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    -		final AttributeSource target = new AttributeSource(new AttributeProvider("ID2", "Name 1", null), "URL");
    -		final IPersonalAttributeList pal = new PersonalAttributeList();
    -		boolean outcome = false;
    -
    -		// Add a single item
    -		map.put(source, pal);
    -
    -		if (map.containsKey(target)) {
    -			outcome = true;
    -		}
    -
    -		assertFalse(outcome);
    -	}
    +    @Test
    +    public void testObjectOK1() {
    +        final IAttributeProvidersMap map = new AttributeProvidersMap();
    +        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        boolean outcome = false;
    +
    +        //Add a single item
    +        map.put(source, pal);
    +
    +        if (map.containsKey(source)) {
    +            outcome = true;
    +        }
    +
    +        assertTrue(outcome);
    +    }
    +
    +    @Test
    +    public void testObjectOK2() {
    +        final IAttributeProvidersMap map = new AttributeProvidersMap();
    +        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        boolean outcome = false;
    +
    +        //Add a single item
    +        map.put(source, pal);
    +
    +        if (map.containsKey(source)) {
    +            if (map.get(source) != null) {
    +                outcome = true;
    +            }
    +        }
    +
    +        assertTrue(outcome);
    +    }
    +
    +    @Test
    +    public void testObjectOK3() {
    +        final IAttributeProvidersMap map = new AttributeProvidersMap();
    +        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        boolean outcome = false;
    +
    +        //Add a single item
    +        map.put(source, pal);
    +
    +        if (map.containsKey(target)) {
    +            outcome = true;
    +        }
    +
    +        assertTrue(outcome);
    +    }
    +
    +    @Test
    +    public void testObjectOK4() {
    +        final IAttributeProvidersMap map = new AttributeProvidersMap();
    +        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        boolean outcome = false;
    +
    +        //Add a single item
    +        map.put(source, pal);
    +
    +        if (map.containsKey(target)) {
    +            if (map.get(target) != null) {
    +                outcome = true;
    +            }
    +        }
    +
    +        assertTrue(outcome);
    +    }
    +
    +    @Test
    +    public void testObjectNOK1() {
    +        final IAttributeProvidersMap map = new AttributeProvidersMap();
    +        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final AttributeSource target = new AttributeSource(new Country("ID1", "Name 1"), "URL");
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        boolean outcome = false;
    +
    +        //Add a single item
    +        map.put(source, pal);
    +
    +        if (map.containsKey(target)) {
    +            outcome = true;
    +        }
    +
    +        assertFalse(outcome);
    +    }
    +
    +    @Test
    +    public void testObjectNOK2() {
    +        final IAttributeProvidersMap map = new AttributeProvidersMap();
    +        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");
    +        final AttributeSource target = new AttributeSource(new AttributeProvider("ID2", "Name 1", null), "URL");
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        boolean outcome = false;
    +
    +        //Add a single item
    +        map.put(source, pal);
    +
    +        if (map.containsKey(target)) {
    +            outcome = true;
    +        }
    +
    +        assertFalse(outcome);
    +    }
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java
    index e0f685ade..a3fb6468f 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java
    @@ -11,78 +11,80 @@ import eu.stork.peps.auth.commons.Country;
     
     /**
      * The AttributeSource's Test Case.
    - * 
    - * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)
    - * 
    + *
    + * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos
    + * (ilias@aegean.gr)
    + *
      * @version $Revision: $, $Date: $
      */
     public final class AttributeSourceTestCase {
    -	private final AttributeSource ap1 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");
    -	private final AttributeSource ap2 = new AttributeSource(new AttributeProvider("ID2", "Name 2", null), "URL2");
    -	private final AttributeSource ap3 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL2");
    -	private final AttributeSource ap4 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL1");
    -	private final AttributeSource ap5 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");
    -
    -	private final AttributeSource c1 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");
    -	private final AttributeSource c2 = new AttributeSource(new Country("ID2", "Name 2"), "URL2");
    -	private final AttributeSource c3 = new AttributeSource(new Country("ID1", "Name 2"), "URL2");
    -	private final AttributeSource c4 = new AttributeSource(new Country("ID1", "Name 2"), "URL1");
    -	private final AttributeSource c5 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");
    -
    -	@Test
    -	public void testNotEquals1() {
    -		assertFalse(ap1.equals(ap2));
    -	}
    -
    -	@Test
    -	public void testNotEquals2() {
    -		assertFalse(ap1.equals(c1));
    -	}
    -
    -	@Test
    -	public void testNotEquals3() {
    -		assertFalse(c1.equals(c2));
    -	}
    -
    -	@Test
    -	public void testEquals1() {
    -		assertTrue(ap1.equals(ap3));
    -	}
    -
    -	@Test
    -	public void testEquals2() {
    -		assertTrue(ap1.equals(ap4));
    -	}
    -
    -	@Test
    -	public void testEquals3() {
    -		assertTrue(ap1.equals(ap5));
    -	}
    -
    -	@Test
    -	public void testEquals4() {
    -		assertTrue(c1.equals(c3));
    -	}
    -
    -	@Test
    -	public void testEquals5() {
    -		assertTrue(c1.equals(c4));
    -	}
    -
    -	@Test
    -	public void testEquals6() {
    -		assertTrue(c1.equals(c5));
    -	}
    -
    -	@Test
    -	public void testEquals7() {
    -		final Object obj = ap5;
    -		assertTrue(ap1.equals(obj));
    -	}
    -
    -	@Test
    -	public void testEquals8() {
    -		final Object obj = c5;
    -		assertTrue(c1.equals(obj));
    -	}
    +
    +    private final AttributeSource ap1 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");
    +    private final AttributeSource ap2 = new AttributeSource(new AttributeProvider("ID2", "Name 2", null), "URL2");
    +    private final AttributeSource ap3 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL2");
    +    private final AttributeSource ap4 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL1");
    +    private final AttributeSource ap5 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");
    +
    +    private final AttributeSource c1 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");
    +    private final AttributeSource c2 = new AttributeSource(new Country("ID2", "Name 2"), "URL2");
    +    private final AttributeSource c3 = new AttributeSource(new Country("ID1", "Name 2"), "URL2");
    +    private final AttributeSource c4 = new AttributeSource(new Country("ID1", "Name 2"), "URL1");
    +    private final AttributeSource c5 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");
    +
    +    @Test
    +    public void testNotEquals1() {
    +        assertFalse(ap1.innerEquals(ap2));
    +    }
    +
    +    @Test
    +    public void testNotEquals2() {
    +        assertFalse(ap1.innerEquals(c1));
    +    }
    +
    +    @Test
    +    public void testNotEquals3() {
    +        assertFalse(c1.innerEquals(c2));
    +    }
    +
    +    @Test
    +    public void testEquals1() {
    +        assertTrue(ap1.innerEquals(ap3));
    +    }
    +
    +    @Test
    +    public void testEquals2() {
    +        assertTrue(ap1.innerEquals(ap4));
    +    }
    +
    +    @Test
    +    public void testEquals3() {
    +        assertTrue(ap1.innerEquals(ap5));
    +    }
    +
    +    @Test
    +    public void testEquals4() {
    +        assertTrue(c1.innerEquals(c3));
    +    }
    +
    +    @Test
    +    public void testEquals5() {
    +        assertTrue(c1.innerEquals(c4));
    +    }
    +
    +    @Test
    +    public void testEquals6() {
    +        assertTrue(c1.innerEquals(c5));
    +    }
    +
    +    @Test
    +    public void testEquals7() {
    +        final Object obj = ap5;
    +        assertTrue(ap1.equals(obj));
    +    }
    +
    +    @Test
    +    public void testEquals8() {
    +        final Object obj = c5;
    +        assertTrue(c1.equals(obj));
    +    }
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
    index 6f3e5273a..524a7446c 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
    @@ -31,448 +31,507 @@ import eu.stork.peps.auth.commons.PersonalAttributeList;
     
     /**
      * The AttributeUtil's Test Case.
    - * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com
    - * 
    + *
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    + * luis.felix@multicert.com
    + *
      * @version $Revision: $, $Date: $
      */
     public final class AttributeUtilTestCase {
     
    -	/**
    -	 * Empty String to be used on the tests.
    -	 */
    -	private static final String EMPTY_STRING = "";
    -
    -	/**
    -	 * Tuple value sample to be used on the tests.
    -	 */
    -	private static final String[] TUPLE_STRING = new String[] { "age", "true", "[18]", "Available" };
    -
    -	/**
    -	 * Complex value to be used on escape/unescape tests.
    -	 */
    -	private static final String COMPLEX_VAL = "postalCode=4100," + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379," + "streetName=Avenida Sidonio Pais,town=Porto,";
    -
    -	/**
    -	 * Escaped Complex value to be used on escape/unescape tests.
    -	 */
    -	private static final String ESC_COMPLEX_VAL = "postalCode=4100%44" + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44"
    -			+ "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44";
    -
    -	/**
    -	 * Simple value to be used on escape/unescape tests.
    -	 */
    -	private static final String SIMPLE_VAL = "Avenida da Boavista, Porto";
    -
    -	/**
    -	 * Escaped simple value to be used on escape/unescape tests.
    -	 */
    -	private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto";
    -
    -	/**
    -	 * Simple text to be used on escape/unescape tests. Must match the escaped text.
    -	 */
    -	private static final String SIMPLE_TEXT = "John Doe";
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#escape(String)} method for the given complex attribute value (canonical address' example attribute value).
    -	 */
    -	@Test
    -	public void testEscapeSpecialCharsComplexVal() {
    -		assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#escape(String)} method for the given attribute value.
    -	 */
    -	@Test
    -	public void testEscapeSpecialCharsVal() {
    -		assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#escape(String)} method for the given simple text: no special characters to escape.
    -	 */
    -	@Test
    -	public void testEscapeNormalChars() {
    -		assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#unescape(String)} method for the given escape complex attribute value (canonical address' example attribute value).
    -	 */
    -	@Test
    -	public void testUnescapeSpecialCharsComplexVal() {
    -		assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#escape(String)} method for the given escape attribute value.
    -	 */
    -	@Test
    -	public void testUnescapeSpecialCharsVal() {
    -		assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#escape(String)} method for the given simple text: no special characters to unescape.
    -	 */
    -	@Test
    -	public void testUnescapeNormalChars() {
    -		assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} method for the given empty string.
    -	 */
    -	@Test
    -	public void testAppendIfNotNullEmptyStr() {
    -		final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT);
    -		AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING);
    -		assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} method for the given string.
    -	 */
    -	@Test
    -	public void testAppendIfNotNullStr() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT);
    -		assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)} method for the given null value.
    -	 */
    -	@Test
    -	public void testAppendIfNotNull() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		AttributeUtil.appendIfNotNull(strBuilder, null);
    -		assertEquals(strBuilder.toString(), EMPTY_STRING);
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#listToString(List, String)} method for the given List with two values.
    -	 */
    -	@Test
    -	public void testListToStringTwoVals() {
    -		final List vals = new ArrayList();
    -		vals.add(SIMPLE_VAL);
    -		vals.add(SIMPLE_TEXT);
    -
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append(ESC_SIMPLE_VAL);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -		strBuilder.append(SIMPLE_TEXT);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -
    -		assertEquals(AttributeUtil.listToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#listToString(List, String)} method for the given List with one values.
    -	 */
    -	@Test
    -	public void testListToStringOneVal() {
    -		final List vals = new ArrayList();
    -		vals.add(SIMPLE_VAL);
    -
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append(ESC_SIMPLE_VAL);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -
    -		assertEquals(AttributeUtil.listToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#listToString(List, String)} method for the given List with one value.
    -	 */
    -	@Test
    -	public void testListToStringEmptyVal() {
    -		final List vals = new ArrayList();
    -
    -		final StringBuilder strBuilder = new StringBuilder();
    -
    -		assertEquals(AttributeUtil.listToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method for the given Map with one value.
    -	 */
    -	@Test
    -	public void testMapToStringOneVal() {
    -		final Map vals = new HashMap();
    -		vals.put("CanonicalAddress", COMPLEX_VAL);
    -
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append("CanonicalAddress=");
    -		strBuilder.append(ESC_COMPLEX_VAL);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -
    -		assertEquals(AttributeUtil.mapToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method for the given empty Map.
    -	 */
    -	@Test
    -	public void testMapToStringEmptyVal() {
    -		final Map vals = new HashMap();
    -
    -		final StringBuilder strBuilder = new StringBuilder();
    -
    -		assertEquals(AttributeUtil.mapToString(vals, PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given invalid List.
    -	 */
    -	@Test
    -	public void testIsValidValueInvalidList() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append(ESC_SIMPLE_VAL);
    -		strBuilder.append("]");
    -		assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given null value.
    -	 */
    -	@Test
    -	public void testIsValidValueNullList() {
    -		assertFalse(AttributeUtil.isValidValue(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given empty List.
    -	 */
    -	@Test
    -	public void testIsValidValueEmptyList() {
    -		assertTrue(AttributeUtil.isValidValue("[]"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given empty List.
    -	 */
    -	@Test
    -	public void testIsValidValueEmptyCommaList() {
    -		assertTrue(AttributeUtil.isValidValue("[,]"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one simple value List.
    -	 */
    -	@Test
    -	public void testIsValidValueOneValueList() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append("[");
    -		strBuilder.append(ESC_SIMPLE_VAL);
    -		strBuilder.append("]");
    -		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one simple value List.
    -	 */
    -	@Test
    -	public void testIsValidValueOneValueCommaList() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append("[");
    -		strBuilder.append(ESC_SIMPLE_VAL);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -		strBuilder.append("]");
    -		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one complex value List.
    -	 */
    -	@Test
    -	public void testIsValidValueOneComplexValueList() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append("[");
    -		strBuilder.append(ESC_COMPLEX_VAL);
    -		strBuilder.append("]");
    -		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given one complex value List.
    -	 */
    -	@Test
    -	public void testIsValidValueOneComplexValueCommaList() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append("[");
    -		strBuilder.append(ESC_COMPLEX_VAL);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -		strBuilder.append("]");
    -		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given multi value List.
    -	 */
    -	@Test
    -	public void testIsValidValueMultiValueList() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append("[");
    -		strBuilder.append(ESC_SIMPLE_VAL);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -		strBuilder.append(SIMPLE_TEXT);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -		strBuilder.append("]");
    -		assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidValue(String)} method for the given invalid multi value List.
    -	 */
    -	@Test
    -	public void testIsValidValueInvalidMultiValueList() {
    -		final StringBuilder strBuilder = new StringBuilder();
    -		strBuilder.append(ESC_SIMPLE_VAL);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -		strBuilder.append(SIMPLE_TEXT);
    -		strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    -		strBuilder.append("]");
    -		assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given true type.
    -	 */
    -	@Test
    -	public void testIsValidTypetrue() {
    -		assertTrue(AttributeUtil.isValidType("true"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given True type.
    -	 */
    -	@Test
    -	public void testIsValidTypeTrue() {
    -		assertTrue(AttributeUtil.isValidType("True"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given TRUE type.
    -	 */
    -	@Test
    -	public void testIsValidTypeTRUE() {
    -		assertTrue(AttributeUtil.isValidType("TRUE"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given invalid type.
    -	 */
    -	@Test
    -	public void testIsValidTypeInvalidType() {
    -		assertFalse(AttributeUtil.isValidType("str"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given false type.
    -	 */
    -	@Test
    -	public void testIsValidTypefalse() {
    -		assertTrue(AttributeUtil.isValidType("false"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given False type.
    -	 */
    -	@Test
    -	public void testIsValidTypeFalse() {
    -		assertTrue(AttributeUtil.isValidType("False"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given FALSE type.
    -	 */
    -	@Test
    -	public void testIsValidTypeFALSEVal() {
    -		assertTrue(AttributeUtil.isValidType("False"));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#isValidType(String)} method for the given null.
    -	 */
    -	@Test
    -	public void testIsValidTypeNullVal() {
    -		assertFalse(AttributeUtil.isValidType(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given valid tuple.
    -	 */
    -	@Test
    -	public void testHasValidTuples() {
    -		assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given invalid tuple.
    -	 */
    -	@Test
    -	public void testHasValidTuplesInvalid() {
    -		final String[] tuple = new String[] { "name", "type" };
    -		assertFalse(AttributeUtil.hasValidTuples(tuple));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given invalid tuple with valid size.
    -	 */
    -	@Test
    -	public void testHasValidTuplesSameSizeInvalidValues() {
    -		final String[] tuple = new String[] { "age", "type", "[18]", "Available" };
    -		assertFalse(AttributeUtil.hasValidTuples(tuple));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the given null value.
    -	 */
    -	@Test
    -	public void testHasValidTuplesNull() {
    -		assertFalse(AttributeUtil.hasValidTuples(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given attribute list..
    -	 */
    -	@Test
    -	public void testCheckMandatoryAttributes() {
    -		final IPersonalAttributeList attrList = new PersonalAttributeList();
    -		attrList.populate("isAgeOver:true:[18,]:Available;");
    -		assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    -
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given null value.
    -	 */
    -	@Test(expected = NullPointerException.class)
    -	public void testCheckMandatoryAttributesNullAttrList() {
    -		assertTrue(AttributeUtil.checkMandatoryAttributes(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given empty attribute list.
    -	 */
    -	@Test
    -	public void testCheckMandatoryAttributesEmptyAttrList() {
    -		final IPersonalAttributeList attrList = new PersonalAttributeList();
    -		assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    -	}
    -
    -	/**
    -	 * Tests the {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)} method for the given attribute list (missing mandatory attribute).
    -	 */
    -	@Test
    -	public void testCheckMandatoryAttributesMissingAttr() {
    -		final IPersonalAttributeList attrList = new PersonalAttributeList();
    -		attrList.populate("isAgeOver:true:[]:NotAvailable;");
    -		assertFalse(AttributeUtil.checkMandatoryAttributes(attrList));
    -	}
    +    /**
    +     * Empty String to be used on the tests.
    +     */
    +    private static final String EMPTY_STRING = "";
    +
    +    /**
    +     * Tuple value sample to be used on the tests.
    +     */
    +    private static final String[] TUPLE_STRING = new String[]{"age", "true",
    +        "[18]", "Available"};
    +
    +    /**
    +     * Complex value to be used on escape/unescape tests.
    +     */
    +    private static final String COMPLEX_VAL = "postalCode=4100,"
    +            + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379,"
    +            + "streetName=Avenida Sidonio Pais,town=Porto,";
    +
    +    /**
    +     * Escaped Complex value to be used on escape/unescape tests.
    +     */
    +    private static final String ESC_COMPLEX_VAL = "postalCode=4100%44"
    +            + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44"
    +            + "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44";
    +
    +    /**
    +     * Simple value to be used on escape/unescape tests.
    +     */
    +    private static final String SIMPLE_VAL = "Avenida da Boavista, Porto";
    +
    +    /**
    +     * Escaped simple value to be used on escape/unescape tests.
    +     */
    +    private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto";
    +
    +    /**
    +     * Simple text to be used on escape/unescape tests. Must match the escaped
    +     * text.
    +     */
    +    private static final String SIMPLE_TEXT = "John Doe";
    +
    +    /**
    +     * Tests the {@link AttributeUtil#escape(String)} method for the given
    +     * complex attribute value (canonical address' example attribute value).
    +     */
    +    @Test
    +    public void testEscapeSpecialCharsComplexVal() {
    +        assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#escape(String)} method for the given
    +     * attribute value.
    +     */
    +    @Test
    +    public void testEscapeSpecialCharsVal() {
    +        assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#escape(String)} method for the given
    +     * simple text: no special characters to escape.
    +     */
    +    @Test
    +    public void testEscapeNormalChars() {
    +        assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#unescape(String)} method for the given
    +     * escape complex attribute value (canonical address' example attribute
    +     * value).
    +     */
    +    @Test
    +    public void testUnescapeSpecialCharsComplexVal() {
    +        assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#escape(String)} method for the given
    +     * escape attribute value.
    +     */
    +    @Test
    +    public void testUnescapeSpecialCharsVal() {
    +        assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#escape(String)} method for the given
    +     * simple text: no special characters to unescape.
    +     */
    +    @Test
    +    public void testUnescapeNormalChars() {
    +        assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
    +     * method for the given empty string.
    +     */
    +    @Test
    +    public void testAppendIfNotNullEmptyStr() {
    +        final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT);
    +        AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING);
    +        assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
    +     * method for the given string.
    +     */
    +    @Test
    +    public void testAppendIfNotNullStr() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT);
    +        assertEquals(strBuilder.toString(), SIMPLE_TEXT);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
    +     * method for the given null value.
    +     */
    +    @Test
    +    public void testAppendIfNotNull() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        AttributeUtil.appendIfNotNull(strBuilder, null);
    +        assertEquals(strBuilder.toString(), EMPTY_STRING);
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#listToString(List, String)} method for the
    +     * given List with two values.
    +     */
    +    @Test
    +    public void testListToStringTwoVals() {
    +        final List vals = new ArrayList();
    +        vals.add(SIMPLE_VAL);
    +        vals.add(SIMPLE_TEXT);
    +
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append(ESC_SIMPLE_VAL);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +        strBuilder.append(SIMPLE_TEXT);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +
    +        assertEquals(
    +                AttributeUtil.listToString(vals,
    +                        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#listToString(List, String)} method for the
    +     * given List with one values.
    +     */
    +    @Test
    +    public void testListToStringOneVal() {
    +        final List vals = new ArrayList();
    +        vals.add(SIMPLE_VAL);
    +
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append(ESC_SIMPLE_VAL);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +
    +        assertEquals(
    +                AttributeUtil.listToString(vals,
    +                        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#listToString(List, String)} method for the
    +     * given List with one value.
    +     */
    +    @Test
    +    public void testListToStringEmptyVal() {
    +        final List vals = new ArrayList();
    +
    +        final StringBuilder strBuilder = new StringBuilder();
    +
    +        assertEquals(
    +                AttributeUtil.listToString(vals,
    +                        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
    +     * for the given Map with one value.
    +     */
    +    @Test
    +    public void testMapToStringOneVal() {
    +        final Map vals = new HashMap();
    +        vals.put("CanonicalAddress", COMPLEX_VAL);
    +
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append("CanonicalAddress=");
    +        strBuilder.append(ESC_COMPLEX_VAL);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +
    +        assertEquals(AttributeUtil.mapToString(vals,
    +                PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
    +     * for the given empty Map.
    +     */
    +    @Test
    +    public void testMapToStringEmptyVal() {
    +        final Map vals = new HashMap();
    +
    +        final StringBuilder strBuilder = new StringBuilder();
    +
    +        assertEquals(AttributeUtil.mapToString(vals,
    +                PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * invalid List.
    +     */
    +    @Test
    +    public void testIsValidValueInvalidList() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append(ESC_SIMPLE_VAL);
    +        strBuilder.append("]");
    +        assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * null value.
    +     */
    +    @Test
    +    public void testIsValidValueNullList() {
    +        assertFalse(AttributeUtil.isValidValue(null));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * empty List.
    +     */
    +    @Test
    +    public void testIsValidValueEmptyList() {
    +        assertTrue(AttributeUtil.isValidValue("[]"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * empty List.
    +     */
    +    @Test
    +    public void testIsValidValueEmptyCommaList() {
    +        assertTrue(AttributeUtil.isValidValue("[,]"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * one simple value List.
    +     */
    +    @Test
    +    public void testIsValidValueOneValueList() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append("[");
    +        strBuilder.append(ESC_SIMPLE_VAL);
    +        strBuilder.append("]");
    +        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * one simple value List.
    +     */
    +    @Test
    +    public void testIsValidValueOneValueCommaList() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append("[");
    +        strBuilder.append(ESC_SIMPLE_VAL);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +        strBuilder.append("]");
    +        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * one complex value List.
    +     */
    +    @Test
    +    public void testIsValidValueOneComplexValueList() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append("[");
    +        strBuilder.append(ESC_COMPLEX_VAL);
    +        strBuilder.append("]");
    +        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * one complex value List.
    +     */
    +    @Test
    +    public void testIsValidValueOneComplexValueCommaList() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append("[");
    +        strBuilder.append(ESC_COMPLEX_VAL);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +        strBuilder.append("]");
    +        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * multi value List.
    +     */
    +    @Test
    +    public void testIsValidValueMultiValueList() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append("[");
    +        strBuilder.append(ESC_SIMPLE_VAL);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +        strBuilder.append(SIMPLE_TEXT);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +        strBuilder.append("]");
    +        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
    +     * invalid multi value List.
    +     */
    +    @Test
    +    public void testIsValidValueInvalidMultiValueList() {
    +        final StringBuilder strBuilder = new StringBuilder();
    +        strBuilder.append(ESC_SIMPLE_VAL);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +        strBuilder.append(SIMPLE_TEXT);
    +        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
    +        strBuilder.append("]");
    +        assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * true type.
    +     */
    +    @Test
    +    public void testIsValidTypetrue() {
    +        assertTrue(AttributeUtil.isValidType("true"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * True type.
    +     */
    +    @Test
    +    public void testIsValidTypeTrue() {
    +        assertTrue(AttributeUtil.isValidType("True"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * TRUE type.
    +     */
    +    @Test
    +    public void testIsValidTypeTRUE() {
    +        assertTrue(AttributeUtil.isValidType("TRUE"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * invalid type.
    +     */
    +    @Test
    +    public void testIsValidTypeInvalidType() {
    +        assertFalse(AttributeUtil.isValidType("str"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * false type.
    +     */
    +    @Test
    +    public void testIsValidTypefalse() {
    +        assertTrue(AttributeUtil.isValidType("false"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * False type.
    +     */
    +    @Test
    +    public void testIsValidTypeFalse() {
    +        assertTrue(AttributeUtil.isValidType("False"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * FALSE type.
    +     */
    +    @Test
    +    public void testIsValidTypeFALSEVal() {
    +        assertTrue(AttributeUtil.isValidType("False"));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
    +     * null.
    +     */
    +    @Test
    +    public void testIsValidTypeNullVal() {
    +        assertFalse(AttributeUtil.isValidType(null));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    +     * given valid tuple.
    +     */
    +    @Test
    +    public void testHasValidTuples() {
    +        assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    +     * given invalid tuple.
    +     */
    +    @Test
    +    public void testHasValidTuplesInvalid() {
    +        final String[] tuple = new String[]{"name", "type"};
    +        assertFalse(AttributeUtil.hasValidTuples(tuple));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    +     * given invalid tuple with valid size.
    +     */
    +    @Test
    +    public void testHasValidTuplesSameSizeInvalidValues() {
    +        final String[] tuple = new String[]{"age", "type", "[18]", "Available"};
    +        assertFalse(AttributeUtil.hasValidTuples(tuple));
    +    }
    +
    +    /**
    +     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
    +     * given null value.
    +     */
    +    @Test
    +    public void testHasValidTuplesNull() {
    +        assertFalse(AttributeUtil.hasValidTuples(null));
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    +     * method for the given attribute list..
    +     */
    +    @Test
    +    public void testCheckMandatoryAttributes() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList();
    +        attrList.populate("isAgeOver:true:[18,]:Available;");
    +        assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    +
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    +     * method for the given null value.
    +     */
    +    @Test(expected = NullPointerException.class)
    +    public void testCheckMandatoryAttributesNullAttrList() {
    +        assertTrue(AttributeUtil.checkMandatoryAttributes(null));
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    +     * method for the given empty attribute list.
    +     */
    +    @Test
    +    public void testCheckMandatoryAttributesEmptyAttrList() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList();
    +        assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
    +     * method for the given attribute list (missing mandatory attribute).
    +     */
    +    @Test
    +    public void testCheckMandatoryAttributesMissingAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList();
    +        attrList.populate("isAgeOver:true:[]:NotAvailable;");
    +        assertFalse(AttributeUtil.checkMandatoryAttributes(attrList));
    +    }
     
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
    index b8220ce98..f2383c07a 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
    @@ -11,7 +11,6 @@
     package eu.stork.peps.tests;
     
     import java.io.File;
    -import java.io.FileNotFoundException;
     import java.io.FileOutputStream;
     import java.io.StringWriter;
     
    @@ -33,249 +32,215 @@ import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.O
     import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.RepresentationPersonType;
     
     /**
    - * @author Advania Examples on how to use the jaxb marshaller. The classes are created from the StorkcomplexAttributes.xsd schema located in resources.
    + * @author Advania Examples on how to use the jaxb marshaller. The classes are created from the
    + *         StorkcomplexAttributes.xsd schema located in resources.
      * @version $Revision: 1.00 $, $Date: 2014-17-02 11:15:00 $
    - *
      */
     
     public class ComplexAttributesMarshalling {
     
    -	MandateContentType mtObject = new MandateContentType();
    -	RepresentationPersonType rpObject = new RepresentationPersonType();
    -	RepresentationPersonType rptObject = new RepresentationPersonType();
    -
    -	void initMandateValues() {
    -		// Fill in the information ...
    -		mtObject.setIsChained(false);
    -		// mtObject.setIsJoined("IsJoined");
    -		mtObject.setTypeOfPower("The Force");
    -		mtObject.setIsChained(false);
    -		// ... fill in info for the representative
    -		rpObject.setTextRegisteredAddress("Address at some street");
    -		rpObject.setDateOfBirth(DateTime.now().toString());
    -		rpObject.setEIdentifier("123456");
    -		rpObject.setGivenName("Name of some person");
    -		rpObject.setLegalForm("Type of person");
    -		// .... fill in the info for the represented
    -		rptObject.setTextRegisteredAddress("Another Address at some street");
    -		rptObject.setDateOfBirth(DateTime.now().toString());
    -		rptObject.setEIdentifier("654321");
    -		rptObject.setGivenName("Another Name of some person");
    -		rptObject.setLegalForm("Yet another type of person");
    -	}
    -
    -	/**
    -	 * Test marshalling canonical address  
    -	 * IS Reykjavik RVK Reykjavik 101
    -	 * Laugavegur 1 10 
    -	 */
    -	@Test
    -	public void testMarshallCanonicalResidencAddress() {
    -		try {
    -			final CanonicalAddressType object = new CanonicalAddressType();
    -			object.setApartmentNumber("10");
    -			object.setCountryCodeAddress("IS");
    -			object.setMunicipalityCode("RVK");
    -			object.setPostalCode("101");
    -			object.setState("Reykjavik");
    -			object.setStreetName("Laugavegur");
    -			object.setStreetNumber("1");
    -			object.setTown("Reykjavik");
    -
    -			final JAXBContext context = JAXBContext.newInstance(CanonicalAddressType.class);
    -			final Marshaller m = context.createMarshaller();
    -			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    -			final ObjectFactory objf = new ObjectFactory();
    -
    -			m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));
    -			m.marshal(objf.createCanonicalResidenceAddress(object), System.out);
    -		} catch (Exception e) {
    -			e.printStackTrace();
    -		}
    -	}
    -
    -	@Test
    -	public void testForDiana() {
    -		initMandateValues();
    -
    -		try {
    -			// Create the marshallers'
    -
    -			final JAXBContext mandateTypeContext = JAXBContext.newInstance(MandateType.class);
    -			final Marshaller mandateMarshaller = mandateTypeContext.createMarshaller();
    -			final Unmarshaller mandateUnmarshaller = mandateTypeContext.createUnmarshaller();
    -
    -			// final JAXBContext MandateContentTypecontext = JAXBContext.newInstance(MandateContentType.class);
    -			// final Marshaller mandM = MandateContentTypecontext.createMarshaller();
    -			//
    -			// final JAXBContext RepresentationPersonTypecontext =
    -			// JAXBContext.newInstance(RepresentationPersonType.class);
    -			// final Marshaller repM = RepresentationPersonTypecontext.createMarshaller();
    -			//
    -
    -			final ObjectFactory objf = new ObjectFactory();
    -			MandateType mandate = new MandateType();
    -			RepresentationPersonType representative = new RepresentationPersonType();
    -			representative.setDateOfBirth("1990-01-01");
    -			representative.setGivenName("Bilbo");
    -			representative.setSurname("Baggins");
    -			representative.setEIdentifier("IT/IT/12345678990");
    -			mandate.setRepresentative(representative);
    -
    -			RepresentationPersonType represented = new RepresentationPersonType();
    -			represented.setTextRegisteredAddress("Via....");
    -			represented.setELPIdentifier("IT/1111111");
    -			represented.setLegalName("Shire Corp.");
    -			mandate.setRepresented(represented);
    -
    -			MandateContentType mandateContent1 = new MandateContentType();
    -			// OriginalMandateType omt1 = new OriginalMandateType();
    -			// omt1.setMimeType("text/plain");
    -			// omt1.setValue("Chief executive officer".getBytes());
    -			mandateContent1.setOriginalMandate("Chief executive officer".getBytes());
    -			mandateContent1.setOriginalMandateType("text/plain");
    -			MandateContentType mandateContent2 = new MandateContentType();
    -			// mandateContent2.setOriginalMandate(omt1);
    -			mandateContent2.setOriginalMandate("Chief executive officer2".getBytes());
    -			mandateContent2.setOriginalMandateType("text/plain");
    -			mandate.getMandateContent().add(mandateContent1);
    -			mandate.getMandateContent().add(mandateContent2);
    -
    -			// create a hashmap
    -			// HashMap complexMandate = new HashMap();
    -
    -			// marshall the mandatecontent
    -			StringWriter sw = new StringWriter();
    -			mandateMarshaller.marshal(objf.createMandate(mandate), sw);
    -
    -			System.out.print(sw.toString());
    -
    -			// add it to the hashmap
    -			// complexMandate.put("representative", sw.toString());
    -			// sw.flush();
    -			//
    -			// // continue with the rest of the objects.
    -			// repM.marshal(objf.createRepresentationPerson(rpObject), sw);
    -			// System.out.print(sw.toString());
    -			// complexMandate.put("representative", sw.toString());
    -			// sw.flush();
    -			//
    -			// MandateType mandateType = new MandateType();
    -			//
    -			// repM.marshal(objf.createRepresentationPerson(rptObject), sw);
    -			// System.out.print(sw.toString());
    -			// complexMandate.put("represented", sw.toString());
    -			// sw.flush();
    -			//
    -			// // add the complex values to the attr.list.
    -			// PersonalAttribute pal = new PersonalAttribute();
    -			//
    -			// pal.setName("mandateContent");
    -			// pal.setIsRequired(pal.isRequired());
    -			// pal.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
    -			// pal.setComplexValue(complexMandate);
    -			//
    -			// System.out.println(pal.toString());
    -		} catch (JAXBException e) {
    -			e.printStackTrace();
    -		}
    -	}
    -
    -	@Test
    -	public void testMandateContent() {
    -		initMandateValues();
    -		try {
    -			final MandateType object = new MandateType();
    -			// Make the object ....
    -			object.getMandateContent().add(mtObject);
    -			object.setRepresented(rpObject);
    -			object.setRepresentative(rptObject);
    -
    -			final JAXBContext context = JAXBContext.newInstance(MandateType.class);
    -			// Create the marshaller
    -			final Marshaller m = context.createMarshaller();
    -			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    -			final ObjectFactory objf = new ObjectFactory();
    -			// Various types of output
    -			m.marshal(objf.createMandate(object), new FileOutputStream("MandateContentType.xml"));
    -			m.marshal(objf.createMandate(object), System.out);
    -
    -			StringWriter sw = new StringWriter();
    -			m.marshal(objf.createMandate(object), sw);
    -
    -		} catch (Exception e) {
    -			e.printStackTrace();
    -		}
    -	}
    -
    -	/**
    -	 * Test unmarshalling canonical address  
    -	 * IS Reykjavik RVK Reykjavik 101
    -	 * Laugavegur 1 10 
    -	 */
    -	@Test
    -	public void testUnmarshallCanonicalAddress() {
    -		JAXBContext uContext;
    -		try {
    -			uContext = JAXBContext.newInstance(CanonicalAddressType.class);
    -			final Unmarshaller u = uContext.createUnmarshaller();
    -			final File file = new File("CanonicalAddressType.xml");
    -
    -			final JAXBElement root = u.unmarshal(new StreamSource(file), CanonicalAddressType.class);
    -			final CanonicalAddressType foo = root.getValue();
    -
    -			final String A = foo.getStreetName();
    -			final String B = foo.getStreetNumber();
    -
    -			System.out.println("Streetname: " + A);
    -			System.out.println("Streetnumber: " + B);
    -
    -		} catch (final JAXBException e) {
    -			e.printStackTrace();
    -		}
    -	}
    -
    -	/**
    -	 * Test marshalling has bank account   Arion
    -	 * 3 
    -	 */
    -	@Test
    -	public void testMarshallHasBankAccount() {
    -		try {
    -			final HasAccountInBankType object = new HasAccountInBankType();
    -			object.setAQAA(3);
    -			object.setBankName("Arion Bank");
    -			final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);
    -			final Marshaller m = context.createMarshaller();
    -			final ObjectFactory o = new ObjectFactory();
    -			m.marshal(o.createHasAccountInBank(object), new FileOutputStream("hasbankaccount.xml"));
    -			m.marshal(o.createHasAccountInBank(object), System.out);
    -
    -		} catch (FileNotFoundException e) {
    -			e.printStackTrace();
    -
    -		} catch (Exception e) {
    -			e.printStackTrace();
    -
    -		}
    -	}
    -
    -	/**
    -	 * Test unmarshalling has bank account   Arion
    -	 * 3 
    -	 */
    -	@Test
    -	public void testUnmarshallHasBankAccount() {
    -		try {
    -			final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);
    -			final Unmarshaller um = context.createUnmarshaller();
    -			final File file = new File("hasbankaccount.xml");
    -			final JAXBElement root = um.unmarshal(new StreamSource(file), HasAccountInBankType.class);
    -			final HasAccountInBankType foo = root.getValue();
    -			System.out.println(foo.getBankName());
    -		} catch (final JAXBException e) {
    -			e.printStackTrace();
    -		}
    -	}
    +    MandateContentType       mtObject  = new MandateContentType();
    +    RepresentationPersonType rpObject  = new RepresentationPersonType();
    +    RepresentationPersonType rptObject = new RepresentationPersonType();
    +
    +    void initMandateValues() {
    +        // Fill in the information ...
    +        mtObject.setIsChained(false);
    +        // mtObject.setIsJoined("IsJoined");
    +        mtObject.setTypeOfPower("The Force");
    +        mtObject.setIsChained(false);
    +        // ... fill in info for the representative
    +        rpObject.setTextRegisteredAddress("Address at some street");
    +        rpObject.setDateOfBirth(DateTime.now().toString());
    +        rpObject.setEIdentifier("123456");
    +        rpObject.setGivenName("Name of some person");
    +        rpObject.setLegalForm("Type of person");
    +        // .... fill in the info for the represented
    +        rptObject.setTextRegisteredAddress("Another Address at some street");
    +        rptObject.setDateOfBirth(DateTime.now().toString());
    +        rptObject.setEIdentifier("654321");
    +        rptObject.setGivenName("Another Name of some person");
    +        rptObject.setLegalForm("Yet another type of person");
    +    }
    +
    +    /**
    +     * Test marshalling canonical address 
    +     * 
    +     * IS Reykjavik RVK
    +     * Reykjavik 101 Laugavegur
    +     * 1 10 
    +     */
    +    @Test
    +    public void testMarshallCanonicalResidencAddress() {
    +        try {
    +            final CanonicalAddressType object = new CanonicalAddressType();
    +            object.setApartmentNumber("10");
    +            object.setCountryCodeAddress("IS");
    +            object.setMunicipalityCode("RVK");
    +            object.setPostalCode("101");
    +            object.setState("Reykjavik");
    +            object.setStreetName("Laugavegur");
    +            object.setStreetNumber("1");
    +            object.setTown("Reykjavik");
    +
    +            final JAXBContext context = JAXBContext.newInstance(CanonicalAddressType.class);
    +            final Marshaller m = context.createMarshaller();
    +            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    +            final ObjectFactory objf = new ObjectFactory();
    +
    +            m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));
    +            m.marshal(objf.createCanonicalResidenceAddress(object), System.out);
    +        }
    +        catch ( Exception e ) {
    +            e.printStackTrace();
    +        }
    +    }
    +
    +    @Test
    +    public void testForDiana() {
    +        initMandateValues();
    +
    +        try {
    +            // Create the marshallers'
    +
    +            final JAXBContext mandateTypeContext = JAXBContext.newInstance(MandateType.class);
    +            final Marshaller mandateMarshaller = mandateTypeContext.createMarshaller();
    +
    +            final ObjectFactory objf = new ObjectFactory();
    +            MandateType mandate = new MandateType();
    +            RepresentationPersonType representative = new RepresentationPersonType();
    +            representative.setDateOfBirth("1990-01-01");
    +            representative.setGivenName("Bilbo");
    +            representative.setSurname("Baggins");
    +            representative.setEIdentifier("IT/IT/12345678990");
    +            mandate.setRepresentative(representative);
    +
    +            RepresentationPersonType represented = new RepresentationPersonType();
    +            represented.setTextRegisteredAddress("Via....");
    +            represented.setELPIdentifier("IT/1111111");
    +            represented.setLegalName("Shire Corp.");
    +            mandate.setRepresented(represented);
    +
    +            MandateContentType mandateContent1 = new MandateContentType();
    +            mandateContent1.setOriginalMandate("Chief executive officer".getBytes());
    +            mandateContent1.setOriginalMandateType("text/plain");
    +            MandateContentType mandateContent2 = new MandateContentType();
    +            mandateContent2.setOriginalMandate("Chief executive officer2".getBytes());
    +            mandateContent2.setOriginalMandateType("text/plain");
    +            mandate.getMandateContent().add(mandateContent1);
    +            mandate.getMandateContent().add(mandateContent2);
    +
    +            // marshall the mandatecontent
    +            StringWriter sw = new StringWriter();
    +            mandateMarshaller.marshal(objf.createMandate(mandate), sw);
    +
    +            System.out.print(sw.toString());
    +
    +        }
    +        catch ( JAXBException e ) {
    +            e.printStackTrace();
    +        }
    +    }
    +
    +    @Test
    +    public void testMandateContent() {
    +        initMandateValues();
    +        try {
    +            final MandateType object = new MandateType();
    +            // Make the object ....
    +            object.getMandateContent().add(mtObject);
    +            object.setRepresented(rpObject);
    +            object.setRepresentative(rptObject);
    +
    +            final JAXBContext context = JAXBContext.newInstance(MandateType.class);
    +            // Create the marshaller
    +            final Marshaller m = context.createMarshaller();
    +            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
    +            final ObjectFactory objf = new ObjectFactory();
    +            // Various types of output
    +            m.marshal(objf.createMandate(object), new FileOutputStream("MandateContentType.xml"));
    +            m.marshal(objf.createMandate(object), System.out);
    +
    +            StringWriter sw = new StringWriter();
    +            m.marshal(objf.createMandate(object), sw);
    +
    +        }
    +        catch ( Exception e ) {
    +            e.printStackTrace();
    +        }
    +    }
    +
    +    /**
    +     * Test unmarshalling canonical address 
    +     * 
    +     * IS Reykjavik RVK
    +     * Reykjavik 101 Laugavegur
    +     * 1 10 
    +     */
    +    @Test
    +    public void testUnmarshallCanonicalAddress() {
    +        JAXBContext uContext;
    +        try {
    +            uContext = JAXBContext.newInstance(CanonicalAddressType.class);
    +            final Unmarshaller u = uContext.createUnmarshaller();
    +            final File file = new File("CanonicalAddressType.xml");
    +
    +            final JAXBElement root = u.unmarshal(new StreamSource(file),
    +                                                                       CanonicalAddressType.class);
    +            final CanonicalAddressType foo = root.getValue();
    +
    +            final String A = foo.getStreetName();
    +            final String B = foo.getStreetNumber();
    +
    +            System.out.println("Streetname: " + A);
    +            System.out.println("Streetnumber: " + B);
    +
    +        }
    +        catch ( final JAXBException e ) {
    +            e.printStackTrace();
    +        }
    +    }
    +
    +    /**
    +     * Test marshalling has bank account   Arion 3 
    +     */
    +    @Test
    +    public void testMarshallHasBankAccount() {
    +        try {
    +            final HasAccountInBankType object = new HasAccountInBankType();
    +            object.setAQAA(3);
    +            object.setBankName("Arion Bank");
    +            final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);
    +            final Marshaller m = context.createMarshaller();
    +            final ObjectFactory o = new ObjectFactory();
    +            m.marshal(o.createHasAccountInBank(object), new FileOutputStream("hasbankaccount.xml"));
    +            m.marshal(o.createHasAccountInBank(object), System.out);
    +
    +        }
    +        catch ( Exception e ) {
    +            e.printStackTrace();
    +        }
    +    }
    +
    +    /**
    +     * Test unmarshalling has bank account   Arion 3 
    +     */
    +    @Test
    +    public void testUnmarshallHasBankAccount() {
    +        try {
    +            final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);
    +            final Unmarshaller um = context.createUnmarshaller();
    +            final File file = new File("hasbankaccount.xml");
    +            final JAXBElement root = um.unmarshal(new StreamSource(file),
    +                                                                        HasAccountInBankType.class);
    +            final HasAccountInBankType foo = root.getValue();
    +            System.out.println(foo.getBankName());
    +        }
    +        catch ( final JAXBException e ) {
    +            e.printStackTrace();
    +        }
    +    }
     
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
    index 706e7affd..6c9a17ddc 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
    @@ -19,7 +19,6 @@ import java.util.Properties;
     import org.joda.time.DateTime;
     import org.junit.Assert;
     import org.junit.BeforeClass;
    -import org.junit.Ignore;
     import org.junit.Test;
     
     import eu.stork.peps.auth.commons.DateUtil;
    @@ -28,229 +27,268 @@ import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException;
     
     /**
      * The PersonalAttribute's Test Case.
    - * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
    + *
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    + * luis.felix@multicert.com, hugo.magalhaes@multicert.com,
    + * paulo.ribeiro@multicert.com
      * @version $Revision: 1.2 $, $Date: 2010-11-17 05:17:03 $
      */
     public final class DateUtilTestCase {
     
    -	/**
    -	 * Stork Format date.
    -	 */
    -	private static final String FORMAT = "yyyyMMdd";
    -
    -	/**
    -	 * Expected 10 value.
    -	 */
    -	private static final int TEN = 10;
    -
    -	/**
    -	 * Expected 11 value.
    -	 */
    -	private static final int ELEVEN = 11;
    -
    -	/**
    -	 * The testing Date ("current" date).
    -	 */
    -	private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20, 0, 0);
    -
    -	/**
    -	 * Init DateUtilTestCase class.
    -	 */
    -	@BeforeClass
    -	public static void runsBeforeTheTestSuite() {
    -		final Properties configs = new Properties();
    -		configs.setProperty("invalidAgeDateValue.code", "35");
    -		configs.setProperty("invalidAttributeValue.code", "34");
    -		configs.setProperty("invalidAttributeValue.message", "Unexpected or invalid content was encountered within a " + " or  element.");
    -		PEPSUtil.createInstance(configs);
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given year against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -	 */
    -	@Test
    -	public void calculateAgeFromYear() {
    -		Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    -	 */
    -	@Test
    -	public void calculateAgeFromEarlyMonth() {
    -		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -	 */
    -	@Test
    -	public void calculateAgeFromSameMonth() {
    -		Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given year and month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -	 */
    -	@Test
    -	public void calculateAgeFromLaterMonth() {
    -		Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    -	 */
    -	@Test
    -	public void calculateAgeFromEarlyFullDate() {
    -		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    -	 */
    -	@Test
    -	public void calculateAgeFromSameDay() {
    -		Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    -	 */
    -	@Test
    -	public void calculateAgeFromLaterFullDate() {
    -		Assert.assertTrue(TEN == DateUtil.calculateAge("20001011", TESTDATE, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    -	 */
    -	@Test(expected = SecurityPEPSException.class)
    -	public void calculateAgeFromInvalidDate() {
    -		DateUtil.calculateAge("200", TESTDATE, FORMAT);
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    -	 */
    -	@Test(expected = SecurityPEPSException.class)
    -	public void calculateAgeFromInvalidMonth() {
    -		DateUtil.calculateAge("200013", TESTDATE, FORMAT);
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    -	 */
    -	@Test(expected = SecurityPEPSException.class)
    -	public void calculateAgeFromInvalidDay() {
    -		DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    -	 */
    -	@Test(expected = SecurityPEPSException.class)
    -	public void calculateAgeFromNullDate() {
    -		DateUtil.calculateAge(null, TESTDATE, FORMAT);
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    -	 */
    -	@Test(expected = SecurityPEPSException.class)
    -	public void calculateAgeFromNullCurDate() {
    -		DateUtil.calculateAge("2000", null, FORMAT);
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#calculateAge} method for the given full date against the testDate: 2011-10-10 15:20:00.0. Must return a SecurityPEPSException exception.
    -	 */
    -	@Test(expected = SecurityPEPSException.class)
    -	public void calculateAgeFromNullFormat() {
    -		DateUtil.calculateAge("2000", TESTDATE, null);
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return true
    -	 */
    -	@Test
    -	public void isValidFormatDateFromYear() {
    -		Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year and month. Must return true.
    -	 */
    -	@Test
    -	public void isValidFormatDateFromMonth() {
    -		Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    -	 */
    -	@Test
    -	public void isValidFormatDate() {
    -		Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    -	 */
    -	@Test
    -	public void isValidFormatDateInvalidYear() {
    -		Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    -	 */
    -	@Test
    -	public void isValidFormatDateInvalidMonth() {
    -		Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    -	 */
    -	@Test
    -	public void isValidFormatDateInvalidDate() {
    -		Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    -	 */
    -	@Test
    -	public void isValidFormatDateNullDate() {
    -		Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#isValidFormatDate} method for the given year. Must return false.
    -	 */
    -	@Test
    -	public void isValidFormatDateNullFormat() {
    -		Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#currentTimeStamp()} method for the current TimeStamp (TS). Must return true.
    -	 */
    -	@Test
    -	public void testCurrentTimeStampBefore() {
    -		Timestamp ts = DateUtil.currentTimeStamp();
    -		Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
    -	}
    -
    -	/**
    -	 * Tests the {@link DateUtil#currentTimeStamp()} method for the current TimeStamp (TS). Must return true.
    -	 */
    -	@Test
    -	@Ignore
    -	public void testCurrentTimeStampAfter() {
    -		Timestamp ts = DateUtil.currentTimeStamp();
    -		Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
    -	}
    +    /**
    +     * Stork Format date.
    +     */
    +    private static final String FORMAT = "yyyyMMdd";
    +
    +    /**
    +     * Expected 10 value.
    +     */
    +    private static final int TEN = 10;
    +
    +    /**
    +     * Expected 11 value.
    +     */
    +    private static final int ELEVEN = 11;
    +
    +    /**
    +     * The testing Date ("current" date).
    +     */
    +    private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20,
    +            0, 0);
    +
    +    /**
    +     * Init DateUtilTestCase class.
    +     */
    +    @BeforeClass
    +    public static void runsBeforeTheTestSuite() {
    +        final Properties configs = new Properties();
    +        configs.setProperty("invalidAgeDateValue.code", "35");
    +        configs.setProperty("invalidAttributeValue.code", "34");
    +        configs
    +                .setProperty(
    +                        "invalidAttributeValue.message",
    +                        "Unexpected or invalid content was encountered within a "
    +                        + " or  element.");
    +        PEPSUtil.createInstance(configs);
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given year against
    +     * the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +     */
    +    @Test
    +    public void calculateAgeFromYear() {
    +        Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given year and
    +     * month against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    +     */
    +    @Test
    +    public void calculateAgeFromEarlyMonth() {
    +        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE,
    +                FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given year and
    +     * month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +     */
    +    @Test
    +    public void calculateAgeFromSameMonth() {
    +        Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given year and
    +     * month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +     */
    +    @Test
    +    public void calculateAgeFromLaterMonth() {
    +        Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    +     */
    +    @Test
    +    public void calculateAgeFromEarlyFullDate() {
    +        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE,
    +                FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
    +     */
    +    @Test
    +    public void calculateAgeFromSameDay() {
    +        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE,
    +                FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
    +     */
    +    @Test
    +    public void calculateAgeFromLaterFullDate() {
    +        Assert.assertTrue(TEN == DateUtil
    +                .calculateAge("20001011", TESTDATE, FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return a
    +     * SecurityPEPSException exception.
    +     */
    +    @Test(expected = SecurityPEPSException.class)
    +    public void calculateAgeFromInvalidDate() {
    +        DateUtil.calculateAge("200", TESTDATE, FORMAT);
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return a
    +     * SecurityPEPSException exception.
    +     */
    +    @Test(expected = SecurityPEPSException.class)
    +    public void calculateAgeFromInvalidMonth() {
    +        DateUtil.calculateAge("200013", TESTDATE, FORMAT);
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return a
    +     * SecurityPEPSException exception.
    +     */
    +    @Test(expected = SecurityPEPSException.class)
    +    public void calculateAgeFromInvalidDay() {
    +        DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return a
    +     * SecurityPEPSException exception.
    +     */
    +    @Test(expected = SecurityPEPSException.class)
    +    public void calculateAgeFromNullDate() {
    +        DateUtil.calculateAge(null, TESTDATE, FORMAT);
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return a
    +     * SecurityPEPSException exception.
    +     */
    +    @Test(expected = SecurityPEPSException.class)
    +    public void calculateAgeFromNullCurDate() {
    +        DateUtil.calculateAge("2000", null, FORMAT);
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#calculateAge} method for the given full date
    +     * against the testDate: 2011-10-10 15:20:00.0. Must return a
    +     * SecurityPEPSException exception.
    +     */
    +    @Test(expected = SecurityPEPSException.class)
    +    public void calculateAgeFromNullFormat() {
    +        DateUtil.calculateAge("2000", TESTDATE, null);
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    +     * Must return true
    +     */
    +    @Test
    +    public void isValidFormatDateFromYear() {
    +        Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year
    +     * and month. Must return true.
    +     */
    +    @Test
    +    public void isValidFormatDateFromMonth() {
    +        Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    +     * Must return false.
    +     */
    +    @Test
    +    public void isValidFormatDate() {
    +        Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    +     * Must return false.
    +     */
    +    @Test
    +    public void isValidFormatDateInvalidYear() {
    +        Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    +     * Must return false.
    +     */
    +    @Test
    +    public void isValidFormatDateInvalidMonth() {
    +        Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    +     * Must return false.
    +     */
    +    @Test
    +    public void isValidFormatDateInvalidDate() {
    +        Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    +     * Must return false.
    +     */
    +    @Test
    +    public void isValidFormatDateNullDate() {
    +        Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
    +     * Must return false.
    +     */
    +    @Test
    +    public void isValidFormatDateNullFormat() {
    +        Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#currentTimeStamp()} method for the current
    +     * TimeStamp (TS). Must return true.
    +     */
    +    @Test
    +    public void testCurrentTimeStampBefore() {
    +        Timestamp ts = DateUtil.currentTimeStamp();
    +        Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
    +    }
    +
    +    /**
    +     * Tests the {@link DateUtil#currentTimeStamp()} method for the current
    +     * TimeStamp (TS). Must return true.
    +     */
    +    @Test
    +    public void testCurrentTimeStampAfter() {
    +        Timestamp ts = DateUtil.currentTimeStamp();
    +        Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
    +    }
     
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
    index fbef5bc99..95c1f4594 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
    @@ -36,436 +36,518 @@ import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException;
     
     /**
      * The PEPSUtil's Test Case.
    - * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com
    - * 
    + *
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    + * luis.felix@multicert.com
    + *
      * @version $Revision: $, $Date: $
      */
     public final class PEPSUtilTestCase {
     
    -	/**
    -	 * Message example.
    -	 */
    -	private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed";
    -
    -	/**
    -	 * Error message example.
    -	 */
    -	private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed";
    -
    -	/**
    -	 * Error code example.
    -	 */
    -	private static final String ERROR_CODE_SAMPLE = "003002";
    -
    -	/**
    -	 * Properties values for testing proposes.
    -	 */
    -	private static final Properties CONFIGS1 = new Properties();
    -
    -	/**
    -	 * Properties values for testing proposes.
    -	 */
    -	private static final Properties CONFIGS2 = new Properties();
    -
    -	/**
    -	 * The empty string value: "".
    -	 */
    -	private static final String EMPTY_STRING = "";
    -
    -	/**
    -	 * The empty byte value: [].
    -	 */
    -	private static final byte[] EMPTY_BYTE = new byte[] {};
    -
    -	/**
    -	 * The empty byte hash value.
    -	 */
    -	private static final byte[] EMPTY_HASH_BYTE = new byte[] { -49, -125, -31, 53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28, 5, 11, 87, 21, -36, -125, -12, -87, 33, -45,
    -			108, -23, -50, 71, -48, -47, 60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49, -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62 };
    -
    -	/**
    -	 * The SAML example byte[] value.
    -	 */
    -	private static final byte[] SAML_BYTE_SAMPLE = new byte[] { 60, 115, 97, 109, 108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108 };
    -
    -	/**
    -	 * The SAML's Base64 example value.
    -	 */
    -	private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s";
    -
    -	/**
    -	 * The SAML's Base64 byte[] example value.
    -	 */
    -	private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[] { 80, 72, 78, 104, 98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115 };
    -
    -	/**
    -	 * The SAML's Base64 Hash byte[] example value.
    -	 */
    -	private static byte[] HASH_BYTE_SAMPLE = new byte[] { 67, 38, 11, 115, 49, -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67, 90, 101, 30, 82, -13, 60, -106, -72, -103,
    -			-75, 19, 2, -107, 107, -6, -56, 34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12, -102, 12, -56, 30, -59, -104, -21, -42, -103, 82 };
    -
    -	/**
    -	 * Init PEPSUtilTestCase class.
    -	 */
    -	@BeforeClass
    -	public static void runsBeforeTheTestSuite() {
    -
    -		CONFIGS1.setProperty("max.attrList.size", "20000");
    -		CONFIGS1.setProperty("attrList.code", "202005");
    -		CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter");
    -
    -		CONFIGS1.setProperty("max.qaaLevel.size", "1");
    -		CONFIGS1.setProperty("max.spUrl.size", "inv");
    -		CONFIGS1.setProperty("validation.active", "true");
    -		CONFIGS1.setProperty("hashDigest.className", "org.bouncycastle.crypto.digests.SHA512Digest");
    -		CONFIGS1.setProperty("invalidAgeDateValue.code", "35");
    -		CONFIGS1.setProperty("invalidAttributeValue.code", "34");
    -		CONFIGS1.setProperty("invalidAttributeValue.message", "Unexpected or invalid content was encountered within a " + " or  element.");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#createInstance(Properties)} method for the given properties object.
    -	 */
    -	@Test
    -	public void testCreateInstance() {
    -		Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getConfigs()}.
    -	 */
    -	@Test
    -	public void testGetConfigs() {
    -		final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    -		assertEquals(pepsUtils.getConfigs(), CONFIGS1);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getConfigs()}.
    -	 */
    -	@Test
    -	public void testGetConfigsDifferent() {
    -		final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    -		assertNotSame(pepsUtils.getConfigs(), CONFIGS2);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getConfig(String)} method for the given existing config.
    -	 */
    -	@Test
    -	public void testGetConfigExists() {
    -		assertEquals(PEPSUtil.getConfig("hashDigest.className"), "org.bouncycastle.crypto.digests.SHA512Digest");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getConfig(String)} method for the given not existing config.
    -	 */
    -	@Test
    -	public void testGetConfigNoExists() {
    -		assertNull(PEPSUtil.getConfig("doesnt.exists"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getConfig(String)} method for the given null value.
    -	 */
    -	@Test(expected = NullPointerException.class)
    -	public void testGetConfigNull() {
    -		assertNull(PEPSUtil.getConfig(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    -	 */
    -	@Test
    -	public void testIsValidParameterExists() {
    -		assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    -	 */
    -	@Test
    -	public void testIsValidParameterExistsGreat() {
    -		assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    -	 */
    -	@Test
    -	public void testIsValidParameterExistsIvalidConf() {
    -		assertFalse(PEPSUtil.isValidParameter("spUrl", "http://localhost:8080/SP/"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    -	 */
    -	@Test
    -	public void testIsValidParameterNotExists() {
    -		assertFalse(PEPSUtil.isValidParameter("doesntexists", "http://localhost:8080/SP/"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    -	 */
    -	@Test
    -	public void testIsValidParameterNullParamName() {
    -		assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the given param values.
    -	 */
    -	@Test
    -	public void testIsValidParameterNullParamValue() {
    -		assertFalse(PEPSUtil.isValidParameter("spUrl", null));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method for the given object values.
    -	 */
    -	@Test
    -	public void testValidateParameterValid() {
    -		final IPersonalAttributeList persAttrList = new PersonalAttributeList();
    -		persAttrList.populate("isAgeOver:true:[15,]:Available;");
    -		PEPSUtil.validateParameter("ServiceProviderAction", PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method for the given string values.
    -	 */
    -	@Test(expected = InvalidParameterPEPSException.class)
    -	public void testValidateParameterNull() {
    -		PEPSUtil.validateParameter("ServiceProviderAction", PEPSParameters.ATTRIBUTE_LIST.toString(), null);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, String)} method for the given string values.
    -	 * 
    -	 * The tested class just invokes {@link PEPSUtil#validateParameter(String, String, String, String, String)} so further tests will be later.
    -	 */
    -	@Test
    -	public void testValidateParameter() {
    -		PEPSUtil.validateParameter("ServiceProviderAction", PEPSParameters.ATTRIBUTE_LIST.toString(), "isAgeOver:true:[15,]:Available;");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)} method for the given string value and {@link PEPSErrors} enum.
    -	 * 
    -	 * The tested class just invokes {@link PEPSUtil#validateParameter(String, String, String, String, String)} so further tests will be later.
    -	 */
    -	@Test
    -	public void testValidateParameterPEPSErrors() {
    -		PEPSUtil.validateParameter("CountrySelectorAction", PEPSParameters.ATTRIBUTE_LIST.toString(), "isAgeOver:true:[15,]:Available;", PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    -	 */
    -	@Test
    -	public void testValidateParameterValidParams() {
    -		PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1", "qaaLevel.code", "qaaLevel.message");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    -	 */
    -	@Test(expected = InvalidParameterPEPSException.class)
    -	public void testValidateParameterInvalidParamValue() {
    -		PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10", "qaaLevel.code", "qaaLevel.message");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    -	 */
    -	@Test(expected = InvalidParameterPEPSException.class)
    -	public void testValidateParameterInvalidParamName() {
    -		PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1", "qaaLevel.code", "qaaLevel.message");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    -	 */
    -	@Test(expected = InvalidParameterPEPSException.class)
    -	public void testValidateParameterNullParamName() {
    -		PEPSUtil.validateParameter("ServiceProviderAction", null, "1", "qaaLevel.code", "qaaLevel.message");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#validateParameter(String, String, String, String, String)} method for the given string values.
    -	 */
    -	@Test(expected = InvalidParameterPEPSException.class)
    -	public void testValidateParameterNullParamValue() {
    -		PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null, "qaaLevel.code", "qaaLevel.message");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given string value.
    -	 */
    -	@Test
    -	public void testEncodeSAMLToken() {
    -		assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given null.
    -	 */
    -	@Test(expected = NullPointerException.class)
    -	public void testEncodeSAMLTokenNull() {
    -		assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given empty byte[] value.
    -	 */
    -	@Test
    -	public void testEncodeSAMLTokenEmpty() {
    -		assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given byte[] value.
    -	 */
    -	@Test
    -	public void testDecodeSAMLToken() {
    -		assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE), SAML_BYTE_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given null value.
    -	 */
    -	@Test(expected = NullPointerException.class)
    -	public void testDecodeSAMLTokenNull() {
    -		assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given empty string value.
    -	 */
    -	@Test(expected = StringIndexOutOfBoundsException.class)
    -	public void testDecodeSAMLTokenEmpty() {
    -		assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given byte[] value.
    -	 */
    -	@Test
    -	public void testHashPersonalToken() {
    -		assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE), HASH_BYTE_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given null value.
    -	 */
    -	@Test(expected = InternalErrorPEPSException.class)
    -	public void testHashPersonalTokenNull() {
    -		assertNull(PEPSUtil.hashPersonalToken(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given empty value.
    -	 */
    -	@Test
    -	public void testHashPersonalTokenEmpty() {
    -		assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given correct message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorCodeExists() {
    -		assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given invalid message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorCodeNoExists() {
    -		assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given empty message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorCodeEmpty() {
    -		assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given null message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorCodeNull() {
    -		assertNull(PEPSUtil.getStorkErrorCode(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given invalid message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorCodeWithSepFake() {
    -		assertNull(PEPSUtil.getStorkErrorCode("-"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given invalid message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorCodeWithSepAndCodeFake() {
    -		assertNull(PEPSUtil.getStorkErrorCode("000001 -"));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given correct message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorMessageExists() {
    -		assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE), ERROR_MESSAGE_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given invalid message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorMessageNoExists() {
    -		assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE), ERROR_MESSAGE_SAMPLE);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given empty message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorMessageEmpty() {
    -		assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING), EMPTY_STRING);
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given null message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorMessageNull() {
    -		assertNull(PEPSUtil.getStorkErrorMessage(null));
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given invalid message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorMessageWithSepFake() {
    -		assertEquals(PEPSUtil.getStorkErrorMessage("-"), "-");
    -	}
    -
    -	/**
    -	 * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the given invalid message.
    -	 */
    -	@Test
    -	public void testGetStorkErrorMessageWithSepAndCodeFake() {
    -		assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"), "000001 -");
    -	}
    +    /**
    +     * Message example.
    +     */
    +    private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed";
    +
    +    /**
    +     * Error message example.
    +     */
    +    private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed";
    +
    +    /**
    +     * Error code example.
    +     */
    +    private static final String ERROR_CODE_SAMPLE = "003002";
    +
    +    /**
    +     * Properties values for testing proposes.
    +     */
    +    private static final Properties CONFIGS1 = new Properties();
    +
    +    /**
    +     * Properties values for testing proposes.
    +     */
    +    private static final Properties CONFIGS2 = new Properties();
    +
    +    /**
    +     * The empty string value: "".
    +     */
    +    private static final String EMPTY_STRING = "";
    +
    +    /**
    +     * The empty byte value: [].
    +     */
    +    private static final byte[] EMPTY_BYTE = new byte[]{};
    +
    +    /**
    +     * The empty byte hash value.
    +     */
    +    private static final byte[] EMPTY_HASH_BYTE = new byte[]{-49, -125, -31,
    +        53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28,
    +        5, 11, 87, 21, -36, -125, -12, -87, 33, -45, 108, -23, -50, 71, -48, -47,
    +        60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49,
    +        -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62};
    +
    +    /**
    +     * The SAML example byte[] value.
    +     */
    +    private static final byte[] SAML_BYTE_SAMPLE = new byte[]{60, 115, 97, 109,
    +        108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108};
    +
    +    /**
    +     * The SAML's Base64 example value.
    +     */
    +    private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s";
    +
    +    /**
    +     * The SAML's Base64 byte[] example value.
    +     */
    +    private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[]{80, 72, 78, 104,
    +        98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115};
    +
    +    /**
    +     * The SAML's Base64 Hash byte[] example value.
    +     */
    +    private static byte[] HASH_BYTE_SAMPLE = new byte[]{67, 38, 11, 115, 49,
    +        -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67,
    +        90, 101, 30, 82, -13, 60, -106, -72, -103, -75, 19, 2, -107, 107, -6, -56,
    +        34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12,
    +        -102, 12, -56, 30, -59, -104, -21, -42, -103, 82};
    +
    +    /**
    +     * Init PEPSUtilTestCase class.
    +     */
    +    @BeforeClass
    +    public static void runsBeforeTheTestSuite() {
    +
    +        CONFIGS1.setProperty("max.attrList.size", "20000");
    +        CONFIGS1.setProperty("attrList.code", "202005");
    +        CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter");
    +
    +        CONFIGS1.setProperty("max.qaaLevel.size", "1");
    +        CONFIGS1.setProperty("max.spUrl.size", "inv");
    +        CONFIGS1.setProperty("validation.active", "true");
    +        CONFIGS1.setProperty("hashDigest.className",
    +                "org.bouncycastle.crypto.digests.SHA512Digest");
    +        CONFIGS1.setProperty("invalidAgeDateValue.code", "35");
    +        CONFIGS1.setProperty("invalidAttributeValue.code", "34");
    +        CONFIGS1.setProperty("invalidAttributeValue.message",
    +                "Unexpected or invalid content was encountered within a "
    +                + " or  element.");
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#createInstance(Properties)} method for the
    +     * given properties object.
    +     */
    +    @Test
    +    public void testCreateInstance() {
    +        Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getConfigs()}.
    +     */
    +    @Test
    +    public void testGetConfigs() {
    +        final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    +        assertEquals(pepsUtils.getConfigs(), CONFIGS1);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getConfigs()}.
    +     */
    +    @Test
    +    public void testGetConfigsDifferent() {
    +        final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
    +        assertNotSame(pepsUtils.getConfigs(), CONFIGS2);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getConfig(String)} method for the given
    +     * existing config.
    +     */
    +    @Test
    +    public void testGetConfigExists() {
    +        assertEquals(PEPSUtil.getConfig("hashDigest.className"),
    +                "org.bouncycastle.crypto.digests.SHA512Digest");
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getConfig(String)} method for the given not
    +     * existing config.
    +     */
    +    @Test
    +    public void testGetConfigNoExists() {
    +        assertNull(PEPSUtil.getConfig("doesnt.exists"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getConfig(String)} method for the given null
    +     * value.
    +     */
    +    @Test(expected = NullPointerException.class)
    +    public void testGetConfigNull() {
    +        assertNull(PEPSUtil.getConfig(null));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
    +     * the given param values.
    +     */
    +    @Test
    +    public void testIsValidParameterExists() {
    +        assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
    +     * the given param values.
    +     */
    +    @Test
    +    public void testIsValidParameterExistsGreat() {
    +        assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
    +     * the given param values.
    +     */
    +    @Test
    +    public void testIsValidParameterExistsIvalidConf() {
    +        assertFalse(PEPSUtil
    +                .isValidParameter("spUrl", "http://localhost:8080/SP/"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
    +     * the given param values.
    +     */
    +    @Test
    +    public void testIsValidParameterNotExists() {
    +        assertFalse(PEPSUtil.isValidParameter("doesntexists",
    +                "http://localhost:8080/SP/"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
    +     * the given param values.
    +     */
    +    @Test
    +    public void testIsValidParameterNullParamName() {
    +        assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
    +     * the given param values.
    +     */
    +    @Test
    +    public void testIsValidParameterNullParamValue() {
    +        assertFalse(PEPSUtil.isValidParameter("spUrl", null));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#validateParameter(String, String, Object)}
    +     * method for the given object values.
    +     */
    +    @Test
    +    public void testValidateParameterValid() {
    +        final IPersonalAttributeList persAttrList = new PersonalAttributeList();
    +        persAttrList.populate("isAgeOver:true:[15,]:Available;");
    +        PEPSUtil.validateParameter("ServiceProviderAction",
    +                PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#validateParameter(String, String, Object)}
    +     * method for the given string values.
    +     */
    +    @Test(expected = InvalidParameterPEPSException.class)
    +    public void testValidateParameterNull() {
    +        PEPSUtil.validateParameter("ServiceProviderAction",
    +                PEPSParameters.ATTRIBUTE_LIST.toString(), null);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#validateParameter(String, String, String)}
    +     * method for the given string values.
    +     *
    +     * The tested class just invokes
    +     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    +     * so further tests will be later.
    +     */
    +    @Test
    +    public void testValidateParameter() {
    +        PEPSUtil.validateParameter("ServiceProviderAction",
    +                PEPSParameters.ATTRIBUTE_LIST.toString(),
    +                "isAgeOver:true:[15,]:Available;");
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)}
    +     * method for the given string value and {@link PEPSErrors} enum.
    +     *
    +     * The tested class just invokes
    +     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    +     * so further tests will be later.
    +     */
    +    @Test
    +    public void testValidateParameterPEPSErrors() {
    +        PEPSUtil.validateParameter("CountrySelectorAction",
    +                PEPSParameters.ATTRIBUTE_LIST.toString(),
    +                "isAgeOver:true:[15,]:Available;",
    +                PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR);
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    +     * method for the given string values.
    +     */
    +    @Test
    +    public void testValidateParameterValidParams() {
    +        PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1",
    +                "qaaLevel.code", "qaaLevel.message");
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    +     * method for the given string values.
    +     */
    +    @Test(expected = InvalidParameterPEPSException.class)
    +    public void testValidateParameterInvalidParamValue() {
    +        PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10",
    +                "qaaLevel.code", "qaaLevel.message");
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    +     * method for the given string values.
    +     */
    +    @Test(expected = InvalidParameterPEPSException.class)
    +    public void testValidateParameterInvalidParamName() {
    +        PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1",
    +                "qaaLevel.code", "qaaLevel.message");
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    +     * method for the given string values.
    +     */
    +    @Test(expected = InvalidParameterPEPSException.class)
    +    public void testValidateParameterNullParamName() {
    +        PEPSUtil.validateParameter("ServiceProviderAction", null, "1",
    +                "qaaLevel.code", "qaaLevel.message");
    +    }
    +
    +    /**
    +     * Tests the
    +     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
    +     * method for the given string values.
    +     */
    +    @Test(expected = InvalidParameterPEPSException.class)
    +    public void testValidateParameterNullParamValue() {
    +        PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null,
    +                "qaaLevel.code", "qaaLevel.message");
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
    +     * string value.
    +     */
    +    @Test
    +    public void testEncodeSAMLToken() {
    +        assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
    +     * null.
    +     */
    +    @Test(expected = NullPointerException.class)
    +    public void testEncodeSAMLTokenNull() {
    +        assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
    +     * empty byte[] value.
    +     */
    +    @Test
    +    public void testEncodeSAMLTokenEmpty() {
    +        assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
    +     * byte[] value.
    +     */
    +    @Test
    +    public void testDecodeSAMLToken() {
    +        assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE),
    +                SAML_BYTE_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
    +     * null value.
    +     */
    +    @Test(expected = NullPointerException.class)
    +    public void testDecodeSAMLTokenNull() {
    +        assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
    +     * empty string value.
    +     */
    +    @Test(expected = StringIndexOutOfBoundsException.class)
    +    public void testDecodeSAMLTokenEmpty() {
    +        assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
    +     * byte[] value.
    +     */
    +    @Test
    +    public void testHashPersonalToken() {
    +        assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE),
    +                HASH_BYTE_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
    +     * null value.
    +     */
    +    @Test(expected = InternalErrorPEPSException.class)
    +    public void testHashPersonalTokenNull() {
    +        assertNull(PEPSUtil.hashPersonalToken(null));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
    +     * empty value.
    +     */
    +    @Test
    +    public void testHashPersonalTokenEmpty() {
    +        assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    +     * correct message.
    +     */
    +    @Test
    +    public void testGetStorkErrorCodeExists() {
    +        assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    +     * invalid message.
    +     */
    +    @Test
    +    public void testGetStorkErrorCodeNoExists() {
    +        assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    +     * empty message.
    +     */
    +    @Test
    +    public void testGetStorkErrorCodeEmpty() {
    +        assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    +     * null message.
    +     */
    +    @Test
    +    public void testGetStorkErrorCodeNull() {
    +        assertNull(PEPSUtil.getStorkErrorCode(null));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    +     * invalid message.
    +     */
    +    @Test
    +    public void testGetStorkErrorCodeWithSepFake() {
    +        assertNull(PEPSUtil.getStorkErrorCode("-"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
    +     * invalid message.
    +     */
    +    @Test
    +    public void testGetStorkErrorCodeWithSepAndCodeFake() {
    +        assertNull(PEPSUtil.getStorkErrorCode("000001 -"));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    +     * given correct message.
    +     */
    +    @Test
    +    public void testGetStorkErrorMessageExists() {
    +        assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE),
    +                ERROR_MESSAGE_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    +     * given invalid message.
    +     */
    +    @Test
    +    public void testGetStorkErrorMessageNoExists() {
    +        assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE),
    +                ERROR_MESSAGE_SAMPLE);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    +     * given empty message.
    +     */
    +    @Test
    +    public void testGetStorkErrorMessageEmpty() {
    +        assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING),
    +                EMPTY_STRING);
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    +     * given null message.
    +     */
    +    @Test
    +    public void testGetStorkErrorMessageNull() {
    +        assertNull(PEPSUtil.getStorkErrorMessage(null));
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    +     * given invalid message.
    +     */
    +    @Test
    +    public void testGetStorkErrorMessageWithSepFake() {
    +        assertEquals(PEPSUtil.getStorkErrorMessage("-"), "-");
    +    }
    +
    +    /**
    +     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
    +     * given invalid message.
    +     */
    +    @Test
    +    public void testGetStorkErrorMessageWithSepAndCodeFake() {
    +        assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"), "000001 -");
    +    }
     
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
    index 1b6fad6ae..7800e78b5 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
    @@ -22,661 +22,756 @@ import org.junit.Assert;
     import org.junit.BeforeClass;
     import org.junit.Test;
     
    +import eu.stork.peps.auth.commons.IPersonalAttributeList;
     import eu.stork.peps.auth.commons.PersonalAttribute;
     import eu.stork.peps.auth.commons.PersonalAttributeList;
     import eu.stork.peps.auth.commons.STORKStatusCode;
     
     /**
      * The PersonalAttributeList's Test Case.
    - * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
    + *
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    + * luis.felix@multicert.com, hugo.magalhaes@multicert.com,
    + * paulo.ribeiro@multicert.com
      * @version $Revision: 1.5 $, $Date: 2010-11-17 05:17:02 $
      */
     public final class PersonalAttributeListTestCase {
     
    -	/**
    -	 * isAgeOver constant value.
    -	 */
    -	private static final String ISAGEOVER_CONS = "isAgeOver";
    -
    -	/**
    -	 * 1 constant value.
    -	 */
    -	private static final int ONE_CONS = 1;
    -
    -	/**
    -	 * 2 constant value.
    -	 */
    -	private static final int TWO_CONS = 2;
    -
    -	/**
    -	 * An empty attribute.
    -	 */
    -	@SuppressWarnings("unused")
    -	private static final PersonalAttributeList EMPTY_ATTR_LIST = new PersonalAttributeList(0);
    -
    -	/**
    -	 * An attribute with a complex value (canonicalResidenceAddress).
    -	 */
    -	private static PersonalAttribute complexAttrValue = null;
    -
    -	/**
    -	 * Simple attribute value list string.
    -	 */
    -	private static final String SIMPLE_ATTRLIST = "isAgeOver:true:[15,]:Available;";
    -
    -	/**
    -	 * Simple attribute value list string.
    -	 */
    -	private static final String SIMPLE_ATTRLIST2 = "isAgeOver:true:[18,]:Available;";
    -
    -	/**
    -	 * Simple attribute value list string.
    -	 */
    -	private static final String SIMPLE_ATTRLIST3 = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    -
    -	/**
    -	 * Simple attribute value list string.
    -	 */
    -	private static final String SIMPLE_ATTRLIST3_REVERSE = "isAgeOver:true:[18,]:Available;isAgeOver:true:[15,]:Available;";
    -	/**
    -	 * Simple attribute value list string.
    -	 */
    -	private static final String COMPLEX_ATTRLIST = "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B," + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
    -			+ "streetName=Avenida Sidonio Pais,town=Porto,]:Available;";
    -	/**
    -	 * Mix attribute list string.
    -	 */
    -	private static final String STR_MIX_ATTR_LIST = "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    -			+ "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:" + "Available;";
    -
    -	/**
    -	 * Mix attribute list 2 string.
    -	 */
    -	private static final String STR_MIX_ATTR_LIST2 = "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:[" + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    -			+ "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:Available;" + "mandateContent:true:["
    -			+ "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:" + "Available;";
    -
    -	/**
    -	 * Attribute List example.
    -	 */
    -	@SuppressWarnings({ "serial" })
    -	private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute("age", true, new ArrayList() {
    -		{
    -			add("15");
    -		}
    -	}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -	/**
    -	 * Init PersonalAttributeListTestCase class.
    -	 */
    -	@SuppressWarnings("serial")
    -	@BeforeClass
    -	public static void runsBeforeTheTestSuite() {
    -		final Map values = new HashMap() {
    -			{
    -				put("countryCodeAddress", "PT");
    -				put("state", "Porto");
    -				put("town", "Porto");
    -				put("postalCode", "4100");
    -				put("streetName", "Avenida Sidonio Pais");
    -				put("streetNumber", "379");
    -				put("apartmentNumber", "Ed. B");
    -			}
    -		};
    -
    -		complexAttrValue = new PersonalAttribute("canonicalResidenceAddress", true, values, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List add method. Personal Attribute list must be size 1 - Simple attribute.
    -	 */
    -	@Test
    -	public void testAddSimpleAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(ATTR_VALUE);
    -		Assert.assertTrue(attrList.size() == 1);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List add method. Personal Attribute list must be size 1 - Complex attribute.
    -	 */
    -	@Test
    -	public void testAddCompleAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(complexAttrValue);
    -		Assert.assertTrue(attrList.size() == 1);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List add method. Personal Attribute list must be size 0 - no attribute.
    -	 */
    -	@Test
    -	public void testAddNull() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(null);
    -		Assert.assertTrue(attrList.size() == 0);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List add method. Same attribute name added twice. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testAddSameAttrName() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("18");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(attrValueUnder);
    -		attrList.add(attrValueOver);
    -		Assert.assertTrue(attrList.size() == 2);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List add method. Same attribute name added twice. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testAddSameAttrNameEmpty() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(attrValueUnder);
    -		attrList.add(attrValueOver);
    -		Assert.assertTrue(attrList.size() == 2);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List put method. Personal Attribute list must be size 1 - Simple Value.
    -	 */
    -	@Test
    -	public void testPutSimpleAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.put(ATTR_VALUE.getName(), ATTR_VALUE);
    -		Assert.assertTrue(attrList.size() == 1);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List put method. Personal Attribute list must be size 1 - Complex Value.
    -	 */
    -	@Test
    -	public void testPutComplexAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.put(ATTR_VALUE.getName(), complexAttrValue);
    -		Assert.assertTrue(attrList.size() == 1);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List put method. Personal Attribute list must be size 0 - no attribute.
    -	 */
    -	@Test
    -	public void testPutNull() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.put("", null);
    -		Assert.assertTrue(attrList.size() == 0);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List put method. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testPutSameAttrName() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("18");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.put(attrValueUnder.getName(), attrValueUnder);
    -		attrList.put(attrValueOver.getName(), attrValueOver);
    -		Assert.assertTrue(attrList.size() == 2);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List put method. Personal Attribute list must be size 2 - IsAgeOver attribute added twice.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testPutSameAttrNameEmpty() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.put(attrValueUnder.getName(), attrValueUnder);
    -		attrList.put(attrValueOver.getName(), attrValueOver);
    -		Assert.assertTrue(attrList.size() == 2);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List get method. Personal Attribute list must be size 1 - Simple attribute.
    -	 */
    -	@Test
    -	public void testGetSimpleAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(ATTR_VALUE);
    -		Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName()));
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List add method. Personal Attribute list must be size 1 - Complex attribute.
    -	 */
    -	@Test
    -	public void testGetCompleAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(complexAttrValue);
    -		Assert.assertEquals(complexAttrValue.toString(), attrList.get(complexAttrValue.getName()).toString());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List get method. Personal Attribute list must be size 2 - IsAgeOver attribute.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testGetIsAgeOverAttr() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("18");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(attrValueUnder);
    -		attrList.add(attrValueOver);
    -		Assert.assertEquals(SIMPLE_ATTRLIST, attrList.get(attrValueUnder.getName()).toString());
    -		Assert.assertEquals(SIMPLE_ATTRLIST2, attrList.get(attrValueOver.getName()).toString());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List populate method. Personal Attribute list must be size 1 - Simple attribute.
    -	 */
    -	@Test
    -	public void testPopulateSimpleAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.populate(SIMPLE_ATTRLIST);
    -		Assert.assertTrue(attrList.size() == 1);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List populate method. Personal Attribute list must be size 1 - Complex attribute.
    -	 */
    -	@Test
    -	public void testPopulateComplexAttr() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.populate(COMPLEX_ATTRLIST);
    -		Assert.assertTrue(attrList.size() == 1);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List populate method. Personal Attribute list must be size 1 - Simple and Complex attribute.
    -	 */
    -	@Test
    -	public void testPopulateMixAttrs() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.populate(STR_MIX_ATTR_LIST);
    -		Assert.assertTrue(attrList.size() == 2);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List toString method using add.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testToStringFromAdd() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("18");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(attrValueUnder);
    -		attrList.add(attrValueOver);
    -		Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List toString method using put.
    -	 * 
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testToStringFromPut() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("18");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.put(attrValueUnder.getName(), attrValueUnder);
    -		attrList.put(attrValueOver.getName(), attrValueOver);
    -		Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List toString method using populate.
    -	 */
    -	@Test
    -	public void testToStringFromSimplePopulate() {
    -		final String strAttrList = "isAgeOver:true";
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.populate(strAttrList);
    -		Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List toString method using populate.
    -	 */
    -	@Test
    -	public void testToStringFromPopulate() {
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.populate(SIMPLE_ATTRLIST3);
    -		Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List populate method, with invalid values.
    -	 */
    -	@Test
    -	public void testPopulateWithInvalidValuesFormat() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate("name:type:values:status;");
    -		Assert.assertEquals(pal, new PersonalAttributeList());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List populate method, with invalid format.
    -	 */
    -	@Test
    -	public void testPopulateWithInvalidFormat() {
    -
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate("name:type::status;");
    -		Assert.assertEquals(pal, new PersonalAttributeList());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List clone method using add.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testCloneFromAdd() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("18");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.add(attrValueUnder);
    -		attrList.add(attrValueOver);
    -		Assert.assertNotSame(attrList, attrList.clone());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List clone method using put.
    -	 */
    -	@SuppressWarnings("serial")
    -	@Test
    -	public void testCloneFromPut() {
    -		final PersonalAttribute attrValueUnder = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("15");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -		final PersonalAttribute attrValueOver = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    -			{
    -				add("18");
    -			}
    -		}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -		final PersonalAttributeList attrList = new PersonalAttributeList(1);
    -		attrList.put(attrValueUnder.getName(), attrValueUnder);
    -		attrList.put(attrValueOver.getName(), attrValueOver);
    -		Assert.assertNotSame(attrList, attrList.clone());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List clone method using populate.
    -	 */
    -	@Test
    -	public void testCloneFromPopulate() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(SIMPLE_ATTRLIST3);
    -		Assert.assertNotSame(pal, pal.clone());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List iterator.
    -	 */
    -	@Test
    -	public void testIterator() {
    -		final String strAttrList = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(strAttrList);
    -		final Iterator itAttr = pal.iterator();
    -		while (itAttr.hasNext()) {
    -			final PersonalAttribute attr = itAttr.next();
    -			Assert.assertEquals(ISAGEOVER_CONS, attr.getName());
    -		}
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetOptionalAttributes method with empty attribute list.
    -	 */
    -	@Test
    -	public void testGetOptionalAttributesWithEmptyList() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetOptionalAttributes method without optional attributes.
    -	 */
    -	@Test
    -	public void testGetOptionalAttributesWithoutOptional() {
    -		final String strAttrList = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(strAttrList);
    -		Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetOptionalAttributes method with one optional attribute.
    -	 */
    -	@Test
    -	public void testGetOptionalAttributesWithOneOptional() {
    -		final String strAttrList = "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;";
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(strAttrList);
    -		Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetOptionalAttributes method with two optional attribute.
    -	 */
    -	@Test
    -	public void testGetOptionalAttributesWithOnlyOptional() {
    -		final String strAttrList = "age:false:[]:;isAgeOver:false:[18,]:;";
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(strAttrList);
    -		Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getMandatoryAttributes method with empty attribute list.
    -	 */
    -	@Test
    -	public void testGetMandatoryAttributesWithEmptyList() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getMandatoryAttributes method without mandatory attributes.
    -	 */
    -	@Test
    -	public void testGetMandatoryAttributesWithoutMandatory() {
    -		final String strAttrList = "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;";
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(strAttrList);
    -		Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetMandatoryAttributes method with one mandatory attribute.
    -	 */
    -	@Test
    -	public void testGetMandatoryAttributesWithOneMandatory() {
    -		final String strAttrList = "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;";
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(strAttrList);
    -		Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetMandatoryAttributes method with two mandatory attribute.
    -	 */
    -	@Test
    -	public void testGetMandatoryAttributesWithOnlyMandatory() {
    -		final String strAttrList = "age:true:[]:;isAgeOver:true:[18,]:;";
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(strAttrList);
    -		Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getSimpleValueAttributes method with empty attribute list.
    -	 */
    -	@Test
    -	public void testGetSimpleValueAttributesWithEmptyList() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getSimpleValueAttributes() method without simple attributes.
    -	 */
    -	@Test
    -	public void testGetSimpleValueAttributesWithoutSimple() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(COMPLEX_ATTRLIST);
    -		Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getSimpleValueAttributes() method with one simple attribute.
    -	 */
    -	@Test
    -	public void testGetSimpleValueAttributesWithOneSimple() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(STR_MIX_ATTR_LIST);
    -		Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetMandatoryAttributes method with two simple attribute.
    -	 */
    -	@Test
    -	public void testGetSimpleValueAttributesWithOnlySimple() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(SIMPLE_ATTRLIST3);
    -		Assert.assertTrue(pal.getSimpleValueAttributes().size() == TWO_CONS);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getComplexValueAttributes method with empty attribute list.
    -	 */
    -	@Test
    -	public void testGetComplexAttributesWithEmptyList() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getComplexAttributes() method without complex attributes.
    -	 */
    -	@Test
    -	public void testGetComplexAttributesWithoutSimple() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(SIMPLE_ATTRLIST2);
    -		Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's getComplexAttributes() method with one complex attribute.
    -	 */
    -	@Test
    -	public void testGetComplexAttributesWithOneComplex() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(STR_MIX_ATTR_LIST);
    -		Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS);
    -	}
    -
    -	/**
    -	 * Testing Personal Attribute List's GetMandatoryAttributes method with only two Complex attribute.
    -	 */
    -	@Test
    -	public void testGetComplexAttributesWithOnlyComplex() {
    -		final PersonalAttributeList pal = new PersonalAttributeList();
    -		pal.populate(STR_MIX_ATTR_LIST2);
    -		Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS);
    -	}
    +    /**
    +     * isAgeOver constant value.
    +     */
    +    private static final String ISAGEOVER_CONS = "isAgeOver";
    +
    +    /**
    +     * 1 constant value.
    +     */
    +    private static final int ONE_CONS = 1;
    +
    +    /**
    +     * 2 constant value.
    +     */
    +    private static final int TWO_CONS = 2;
    +
    +    /**
    +     * An empty attribute.
    +     */
    +    @SuppressWarnings("unused")
    +    private static final IPersonalAttributeList EMPTY_ATTR_LIST
    +            = new PersonalAttributeList(0);
    +
    +    /**
    +     * An attribute with a complex value (canonicalResidenceAddress).
    +     */
    +    private static PersonalAttribute complexAttrValue = null;
    +
    +    /**
    +     * Simple attribute value list string.
    +     */
    +    private static final String SIMPLE_ATTRLIST
    +            = "isAgeOver:true:[15]:Available;";
    +
    +    /**
    +     * Simple attribute value list string.
    +     */
    +    private static final String SIMPLE_ATTRLIST2
    +            = "isAgeOver:true:[18]:Available;";
    +
    +    /**
    +     * Simple attribute value list string.
    +     */
    +    private static final String SIMPLE_ATTRLIST3
    +            = "isAgeOver:true:[15]:Available;isAgeOver:true:[18]:Available;";
    +    
    +    /**
    +     * Simple attribute value list string.
    +     */
    +    private static final String SIMPLE_ATTRLIST4
    +            = "isAgeOver:true:[15,18]:Available;";
    +
    +    /**
    +     * Simple attribute value list string.
    +     */
    +    private static final String SIMPLE_ATTRLIST3_REVERSE
    +            = "isAgeOver:true:[18]:Available;isAgeOver:true:[15]:Available;";
    +    /**
    +     * Simple attribute value list string.
    +     */
    +    private static final String COMPLEX_ATTRLIST
    +            = "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B,"
    +            + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
    +            + "streetName=Avenida Sidonio Pais,town=Porto]:Available;";
    +    /**
    +     * Mix attribute list string.
    +     */
    +    private static final String STR_MIX_ATTR_LIST
    +            = "isAgeOver:true:[15]:Available;canonicalResidenceAddress:true:["
    +            + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    +            + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto]:"
    +            + "Available;";
    +
    +    /**
    +     * Mix attribute list 2 string.
    +     */
    +    private static final String STR_MIX_ATTR_LIST2
    +            = "isAgeOver:true:[15]:Available;canonicalResidenceAddress:true:["
    +            + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
    +            + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto]:Available;"
    +            + "mandateContent:true:["
    +            + "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:"
    +            + "Available;";
    +
    +    /**
    +     * Attribute List example.
    +     */
    +    @SuppressWarnings({"serial"})
    +    private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
    +            "age", true, new ArrayList() {
    +                {
    +                    add("15");
    +                }
    +            }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +    /**
    +     * Init PersonalAttributeListTestCase class.
    +     */
    +    @SuppressWarnings("serial")
    +    @BeforeClass
    +    public static void runsBeforeTheTestSuite() {
    +        final Map values = new HashMap() {
    +            {
    +                put("countryCodeAddress", "PT");
    +                put("state", "Porto");
    +                put("town", "Porto");
    +                put("postalCode", "4100");
    +                put("streetName", "Avenida Sidonio Pais");
    +                put("streetNumber", "379");
    +                put("apartmentNumber", "Ed. B");
    +            }
    +        };
    +
    +        complexAttrValue
    +                = new PersonalAttribute("canonicalResidenceAddress", true, values,
    +                        STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List add method. Personal Attribute list must
    +     * be size 1 - Simple attribute.
    +     */
    +    @Test
    +    public void testAddSimpleAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(ATTR_VALUE);
    +        Assert.assertTrue(attrList.size() == 1);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List add method. Personal Attribute list must
    +     * be size 1 - Complex attribute.
    +     */
    +    @Test
    +    public void testAddCompleAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(complexAttrValue);
    +        Assert.assertTrue(attrList.size() == 1);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List add method. Personal Attribute list must
    +     * be size 0 - no attribute.
    +     */
    +    @Test
    +    public void testAddNull() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(null);
    +        Assert.assertTrue(attrList.size() == 0);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List add method. Same attribute name added
    +     * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
    +     * twice.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testAddSameAttrName() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("18");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(attrValueUnder);
    +        attrList.add(attrValueOver);
    +        System.out.println();
    +        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List add method. Same attribute name added
    +     * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
    +     * twice.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testAddSameAttrNameEmpty() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(attrValueUnder);
    +        attrList.add(attrValueOver);
    +        Assert.assertTrue(attrList.size() == 1);
    +        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List put method. Personal Attribute list must
    +     * be size 1 - Simple Value.
    +     */
    +    @Test
    +    public void testPutSimpleAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.put(ATTR_VALUE.getName(), ATTR_VALUE);
    +        Assert.assertTrue(attrList.size() == 1);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List put method. Personal Attribute list must
    +     * be size 1 - Complex Value.
    +     */
    +    @Test
    +    public void testPutComplexAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.put(ATTR_VALUE.getName(), complexAttrValue);
    +        Assert.assertTrue(attrList.size() == 1);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List put method. Personal Attribute list must
    +     * be size 0 - no attribute.
    +     */
    +    @Test(expected = NullPointerException.class)
    +    public void testPutNull() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.put("", null);
    +        Assert.assertTrue(attrList.size() == 0);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List put method. Personal Attribute list must
    +     * be size 2 - IsAgeOver attribute added twice.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testPutSameAttrName() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("18");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.put(attrValueUnder.getName(), attrValueUnder);
    +        attrList.put(attrValueOver.getName(), attrValueOver);
    +        Assert.assertTrue(attrList.size() == 1);
    +        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List put method. Personal Attribute list must
    +     * be size 2 - IsAgeOver attribute added twice.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testPutSameAttrNameEmpty() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.put(attrValueUnder.getName(), attrValueUnder);
    +        attrList.put(attrValueOver.getName(), attrValueOver);
    +        Assert.assertTrue(attrList.size() == 1);
    +        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List get method. Personal Attribute list must
    +     * be size 1 - Simple attribute.
    +     */
    +    @Test
    +    public void testGetSimpleAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(ATTR_VALUE);
    +        Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName()));
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List add method. Personal Attribute list must
    +     * be size 1 - Complex attribute.
    +     */
    +    @Test
    +    public void testGetCompleAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(complexAttrValue);
    +        Assert.assertEquals(complexAttrValue.toString(),
    +                attrList.get(complexAttrValue.getName()).toString());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List get method. Personal Attribute list must
    +     * be size 2 - IsAgeOver attribute.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testGetIsAgeOverAttr() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("18");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(attrValueUnder);
    +        attrList.add(attrValueOver);
    +        Assert.assertNotEquals(SIMPLE_ATTRLIST,
    +                attrList.get(attrValueUnder.getName()).toString());
    +        Assert.assertNotEquals(SIMPLE_ATTRLIST2,
    +                attrList.get(attrValueOver.getName()).toString());
    +        Assert.assertEquals(SIMPLE_ATTRLIST4,
    +                attrList.get(attrValueOver.getName()).toString());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List populate method. Personal Attribute list
    +     * must be size 1 - Simple attribute.
    +     */
    +    @Test
    +    public void testPopulateSimpleAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.populate(SIMPLE_ATTRLIST);
    +        Assert.assertTrue(attrList.size() == 1);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List populate method. Personal Attribute list
    +     * must be size 1 - Complex attribute.
    +     */
    +    @Test
    +    public void testPopulateComplexAttr() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.populate(COMPLEX_ATTRLIST);
    +        Assert.assertTrue(attrList.size() == 1);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List populate method. Personal Attribute list
    +     * must be size 1 - Simple and Complex attribute.
    +     */
    +    @Test
    +    public void testPopulateMixAttrs() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.populate(STR_MIX_ATTR_LIST);
    +        Assert.assertTrue(attrList.size() == 2);
    +        //Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List toString method using add.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testToStringFromAdd() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("18");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(attrValueUnder);
    +        attrList.add(attrValueOver);
    +        Assert.assertEquals(SIMPLE_ATTRLIST4, attrList.toString());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List toString method using put.
    +     *
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testToStringFromPut() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("18");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.put(attrValueUnder.getName(), attrValueUnder);
    +        attrList.put(attrValueOver.getName(), attrValueOver);
    +        Assert.assertEquals(SIMPLE_ATTRLIST4, attrList.toString());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List toString method using populate.
    +     */
    +    @Test
    +    public void testToStringFromSimplePopulate() {
    +        final String strAttrList = "isAgeOver:true";
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.populate(strAttrList);
    +        Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List toString method using populate.
    +     */
    +    @Test
    +    public void testToStringFromPopulate() {
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.populate(SIMPLE_ATTRLIST3);
    +        Assert.assertEquals(SIMPLE_ATTRLIST4, attrList.toString());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List populate method, with invalid values.
    +     */
    +    @Test
    +    public void testPopulateWithInvalidValuesFormat() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate("name:type:values:status;");
    +        Assert.assertEquals(pal, new PersonalAttributeList());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List populate method, with invalid format.
    +     */
    +    @Test
    +    public void testPopulateWithInvalidFormat() {
    +
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate("name:type::status;");
    +        Assert.assertEquals(pal, new PersonalAttributeList());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List clone method using add.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testCloneFromAdd() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("18");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.add(attrValueUnder);
    +        attrList.add(attrValueOver);
    +        Assert.assertNotSame(attrList, attrList.clone());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List clone method using put.
    +     */
    +    @SuppressWarnings("serial")
    +    @Test
    +    public void testCloneFromPut() {
    +        final PersonalAttribute attrValueUnder
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("15");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +        final PersonalAttribute attrValueOver
    +                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList() {
    +                    {
    +                        add("18");
    +                    }
    +                }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
    +        attrList.put(attrValueUnder.getName(), attrValueUnder);
    +        attrList.put(attrValueOver.getName(), attrValueOver);
    +        Assert.assertNotSame(attrList, attrList.clone());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List clone method using populate.
    +     */
    +    @Test
    +    public void testCloneFromPopulate() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(SIMPLE_ATTRLIST3);
    +        Assert.assertNotSame(pal, pal.clone());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List iterator.
    +     */
    +    @Test
    +    public void testIterator() {
    +        final String strAttrList
    +                = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(strAttrList);
    +        final Iterator itAttr = pal.iterator();
    +        while (itAttr.hasNext()) {
    +            final PersonalAttribute attr = itAttr.next();
    +            Assert.assertEquals(ISAGEOVER_CONS, attr.getName());
    +        }
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetOptionalAttributes method with empty
    +     * attribute list.
    +     */
    +    @Test
    +    public void testGetOptionalAttributesWithEmptyList() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetOptionalAttributes method without
    +     * optional attributes.
    +     */
    +    @Test
    +    public void testGetOptionalAttributesWithoutOptional() {
    +        final String strAttrList
    +                = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(strAttrList);
    +        Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetOptionalAttributes method with one
    +     * optional attribute.
    +     */
    +    @Test
    +    public void testGetOptionalAttributesWithOneOptional() {
    +        final String strAttrList
    +                = "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;";
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(strAttrList);
    +        Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetOptionalAttributes method with two
    +     * optional attribute.
    +     */
    +    @Test
    +    public void testGetOptionalAttributesWithOnlyOptional() {
    +        final String strAttrList
    +                = "age:false:[]:;isAgeOver:false:[18,]:;";
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(strAttrList);
    +        Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getMandatoryAttributes method with
    +     * empty attribute list.
    +     */
    +    @Test
    +    public void testGetMandatoryAttributesWithEmptyList() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getMandatoryAttributes method without
    +     * mandatory attributes.
    +     */
    +    @Test
    +    public void testGetMandatoryAttributesWithoutMandatory() {
    +        final String strAttrList
    +                = "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;";
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(strAttrList);
    +        Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetMandatoryAttributes method with one
    +     * mandatory attribute.
    +     */
    +    @Test
    +    public void testGetMandatoryAttributesWithOneMandatory() {
    +        final String strAttrList
    +                = "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;";
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(strAttrList);
    +        Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetMandatoryAttributes method with two
    +     * mandatory attribute.
    +     */
    +    @Test
    +    public void testGetMandatoryAttributesWithOnlyMandatory() {
    +        final String strAttrList
    +                = "age:true:[]:;isAgeOver:true:[18,]:;";
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(strAttrList);
    +        Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getSimpleValueAttributes method with
    +     * empty attribute list.
    +     */
    +    @Test
    +    public void testGetSimpleValueAttributesWithEmptyList() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getSimpleValueAttributes() method
    +     * without simple attributes.
    +     */
    +    @Test
    +    public void testGetSimpleValueAttributesWithoutSimple() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(COMPLEX_ATTRLIST);
    +        Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getSimpleValueAttributes() method with
    +     * one simple attribute.
    +     */
    +    @Test
    +    public void testGetSimpleValueAttributesWithOneSimple() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(STR_MIX_ATTR_LIST);
    +        Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetMandatoryAttributes method with two
    +     * simple attribute.
    +     */
    +    @Test
    +    public void testGetSimpleValueAttributesWithOnlySimple() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(SIMPLE_ATTRLIST3);
    +        Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getComplexValueAttributes method with
    +     * empty attribute list.
    +     */
    +    @Test
    +    public void testGetComplexAttributesWithEmptyList() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getComplexAttributes() method without
    +     * complex attributes.
    +     */
    +    @Test
    +    public void testGetComplexAttributesWithoutSimple() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(SIMPLE_ATTRLIST2);
    +        Assert.assertTrue(pal.getComplexAttributes().isEmpty());
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's getComplexAttributes() method with one
    +     * complex attribute.
    +     */
    +    @Test
    +    public void testGetComplexAttributesWithOneComplex() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(STR_MIX_ATTR_LIST);
    +        Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS);
    +    }
    +
    +    /**
    +     * Testing Personal Attribute List's GetMandatoryAttributes method with only
    +     * two Complex attribute.
    +     */
    +    @Test
    +    public void testGetComplexAttributesWithOnlyComplex() {
    +        final IPersonalAttributeList pal = new PersonalAttributeList();
    +        pal.populate(STR_MIX_ATTR_LIST2);
    +        Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS);
    +    }
     
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
    index 0f014d896..82676ccf0 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
    @@ -17,8 +17,6 @@ import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.Map;
     
    -import junit.framework.Assert;
    -
     import org.junit.BeforeClass;
     import org.junit.Test;
     
    @@ -27,138 +25,167 @@ import eu.stork.peps.auth.commons.STORKStatusCode;
     
     /**
      * The PersonalAttribute's Test Case.
    - * 
    - * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
    + *
    + * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
    + * luis.felix@multicert.com, hugo.magalhaes@multicert.com,
    + * paulo.ribeiro@multicert.com
      * @version $Revision: 1.4 $, $Date: 2010-11-17 05:17:03 $
      */
     public final class PersonalAttributeTestCase {
     
    -	/**
    -	 * An empty attribute.
    -	 */
    -	private static final PersonalAttribute EMPTYATTR = new PersonalAttribute();
    -
    -	/**
    -	 * An attribute with a complex value (canonicalResidenceAddress).
    -	 */
    -	private static PersonalAttribute complexAttrValue = null;
    -
    -	/**
    -	 * An attribute with a simple value (age).
    -	 */
    -	@SuppressWarnings("serial")
    -	private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute("age", true, new ArrayList() {
    -		{
    -			add("15");
    -		}
    -	}, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -	/**
    -	 * Init PersonalAttributeTestCase class.
    -	 */
    -	@SuppressWarnings("serial")
    -	@BeforeClass
    -	public static void runsBeforeTheTestSuite() {
    -		final Map values = new HashMap() {
    -			{
    -				put("countryCodeAddress", "PT");
    -				put("state", "Porto");
    -				put("town", "Porto");
    -				put("postalCode", "4100");
    -				put("streetName", "Avenida Sidonio Pais");
    -				put("streetNumber", "379");
    -				put("apartmentNumber", "B");
    -			}
    -		};
    -
    -		complexAttrValue = new PersonalAttribute("canonicalResidenceAddress", true, values, STORKStatusCode.STATUS_AVAILABLE.toString());
    -
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#toString()} method for the given simple attribute value. Values must match.
    -	 */
    -	@Test
    -	public void testToStringValues() {
    -		Assert.assertEquals("age:true:[15,]:Available;", ATTR_VALUE.toString());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#toString()} method for the given complex attribute value. Values must match.
    -	 */
    -	@Test
    -	public void testToStringComplexValues() {
    -		Assert.assertEquals("canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=B," + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
    -				+ "streetName=Avenida Sidonio Pais,town=Porto,]:Available;", complexAttrValue.toString());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given empty attribute. Must return true.
    -	 */
    -	@Test
    -	public void testToIsEmptyStatusWithNull() {
    -		Assert.assertTrue(EMPTYATTR.isEmptyStatus());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given new attribute. Must return true.
    -	 */
    -	@Test
    -	public void testToIsEmptyStatusWithEmptyString() {
    -		final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    -		attr.setStatus("");
    -		Assert.assertTrue(attr.isEmptyStatus());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given empty attribute. Must return true.
    -	 */
    -	@Test
    -	public void testToIsEmptyValueWithNull() {
    -		final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    -		attr.setValue(null);
    -		Assert.assertTrue(attr.isEmptyValue());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given empty attribute. Must return true.
    -	 */
    -	@Test
    -	public void testToIsEmptyValue() {
    -		Assert.assertTrue(EMPTYATTR.isEmptyValue());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the given empty attribute. Must return true.
    -	 */
    -	@Test
    -	public void testToIsEmptyComplexValueWithNull() {
    -		final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    -		attr.setComplexValue(null);
    -		Assert.assertTrue(attr.isEmptyComplexValue());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the given empty attribute. Must return true.
    -	 */
    -	@Test
    -	public void testToIsEmptyComplexValueWithEmptyComplexValue() {
    -		Assert.assertTrue(EMPTYATTR.isEmptyComplexValue());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#clone()} method for the given attribute. Must return true.
    -	 */
    -	@Test
    -	public void testCloneToComplexValue() {
    -		Assert.assertNotSame(complexAttrValue, complexAttrValue.clone());
    -	}
    -
    -	/**
    -	 * Tests the {@link PersonalAttribute#clone()} method for the given attribute. Must return true.
    -	 */
    -	@Test
    -	public void testCloneToValue() {
    -		Assert.assertNotSame(ATTR_VALUE, ATTR_VALUE.clone());
    -	}
    +    /**
    +     * An empty attribute.
    +     */
    +    private static final PersonalAttribute EMPTYATTR = new PersonalAttribute();
    +
    +    /**
    +     * An attribute with a complex value (canonicalResidenceAddress).
    +     */
    +    private static PersonalAttribute complexAttrValue = null;
    +
    +    /**
    +     * An attribute with a simple value (age).
    +     */
    +    @SuppressWarnings("serial")
    +    private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
    +            "age", true, new ArrayList() {
    +                {
    +                    add("15");
    +                }
    +            }, STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +    /**
    +     * Init PersonalAttributeTestCase class.
    +     */
    +    @SuppressWarnings("serial")
    +    @BeforeClass
    +    public static void runsBeforeTheTestSuite() {
    +        final Map values = new HashMap() {
    +            {
    +                put("countryCodeAddress", "PT");
    +                put("state", "Porto");
    +                put("town", "Porto");
    +                put("postalCode", "4100");
    +                put("streetName", "Avenida Sidonio Pais");
    +                put("streetNumber", "379");
    +                put("apartmentNumber", "B");
    +            }
    +        };
    +
    +        complexAttrValue
    +                = new PersonalAttribute("canonicalResidenceAddress", true, values,
    +                        STORKStatusCode.STATUS_AVAILABLE.toString());
    +
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#toString()} method for the given
    +     * simple attribute value. Values must match.
    +     */
    +    @Test
    +    public void testToStringValues() {
    +      final String attrVal = ATTR_VALUE.toString();
    +        assert "age:true:[15]:Available;".equals(attrVal);
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#toString()} method for the given
    +     * complex attribute value. Values must match.
    +     */
    +    @Test
    +    public void testToStringComplexValues() {
    +      //We are testing normal attribute Canonical address, only one value!
    +      final Map complexAttrVal = complexAttrValue.getComplexValue();
    +      final boolean testResult = containsKeyAndValue(complexAttrVal, "postalCode", "4100") &&
    +        containsKeyAndValue(complexAttrVal, "apartmentNumber", "B") &&
    +        containsKeyAndValue(complexAttrVal, "state", "Porto") &&
    +        containsKeyAndValue(complexAttrVal, "countryCodeAddress", "PT") &&
    +        containsKeyAndValue(complexAttrVal, "streetNumber", "379") &&
    +        containsKeyAndValue(complexAttrVal, "streetName", "Avenida Sidonio Pais") &&
    +        containsKeyAndValue(complexAttrVal, "town", "Porto");
    +      assert  testResult;
    +    }
    +    
    +    private boolean containsKeyAndValue(final Map complexAttrVal, final String key, final String expectedValue) {
    +      final boolean res = complexAttrVal.containsKey(key) && complexAttrVal.get(key).equals(expectedValue);
    +      return res;
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
    +     * empty attribute. Must return true.
    +     */
    +    @Test
    +    public void testToIsEmptyStatusWithNull() {
    +        assert EMPTYATTR.isEmptyStatus();
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
    +     * new attribute. Must return true.
    +     */
    +    @Test
    +    public void testToIsEmptyStatusWithEmptyString() {
    +        final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    +        attr.setStatus("");
    +        assert attr.isEmptyStatus();
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
    +     * empty attribute. Must return true.
    +     */
    +    @Test
    +    public void testToIsEmptyValueWithNull() {
    +        final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    +        attr.setValue(null);
    +        assert attr.isEmptyValue();
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
    +     * empty attribute. Must return true.
    +     */
    +    @Test
    +    public void testToIsEmptyValue() {
    +      assert EMPTYATTR.isEmptyValue();
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
    +     * given empty attribute. Must return true.
    +     */
    +    @Test
    +    public void testToIsEmptyComplexValueWithNull() {
    +        final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
    +        attr.setComplexValue(null);
    +        assert attr.isEmptyComplexValue();
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
    +     * given empty attribute. Must return true.
    +     */
    +    @Test
    +    public void testToIsEmptyComplexValueWithEmptyComplexValue() {
    +      assert EMPTYATTR.isEmptyComplexValue();
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#clone()} method for the given
    +     * attribute. Must return true.
    +     */
    +    @Test
    +    public void testCloneToComplexValue() {
    +      assert (complexAttrValue.getComplexValue().toString().equals(complexAttrValue.getComplexValue().toString()) && !complexAttrValue.equals(complexAttrValue.clone()));
    +    }
    +
    +    /**
    +     * Tests the {@link PersonalAttribute#clone()} method for the given
    +     * attribute. Must return true.
    +     */
    +    @Test
    +    public void testCloneToValue() {
    +        assert !ATTR_VALUE.equals(ATTR_VALUE.clone());
    +    }
     }
    diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java
    index 452602210..37841dd03 100644
    --- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java
    +++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java
    @@ -2,4 +2,3 @@
      * This package provides all JUnit test classes.
      */
     package eu.stork.peps.tests;
    -
    diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
    index 2b20da600..2a266a975 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
    @@ -2,86 +2,111 @@
     
     
     
    -	SAML constants for AuthnRequests and Responses.
    -
    -	
    -	unspecified
    -
    -	
    -	obtained
    -
    -	
    -	entity
    -
    -	
    -	
    -	HTTP-POST
    -
    -
    -
    -
    -	
    -
    -
    -
    -	
    -	false
    -
    -	
    -	true
    -
    -	
    -	http://S-PEPS.gov.xx
    -
    -	
    -	http://C-PEPS.gov.xx
    -
    -	
    -	300
    -
    -	
    -	false
    -
    -
    -	
    -	http://www.stork.gov.eu/1.0/eIdentifier
    -	http://www.stork.gov.eu/1.0/givenName
    -	http://www.stork.gov.eu/1.0/surname
    -	http://www.stork.gov.eu/1.0/inheritedFamilyName
    -	http://www.stork.gov.eu/1.0/adoptedFamilyName
    -	http://www.stork.gov.eu/1.0/gender
    -	http://www.stork.gov.eu/1.0/dateOfBirth
    -	http://www.stork.gov.eu/1.0/countryCodeOfBirth
    -	http://www.stork.gov.eu/1.0/nationalityCode
    -	http://www.stork.gov.eu/1.0/maritalStatus
    -	http://www.stork.gov.eu/1.0/residenceAddress
    -	http://www.stork.gov.eu/1.0/eMail
    -	http://www.stork.gov.eu/1.0/academicTitle
    -	http://www.stork.gov.eu/1.0/pseudonym
    -	http://www.stork.gov.eu/1.0/age
    -	http://www.stork.gov.eu/1.0/isAgeOver
    -
    -	http://www.stork.gov.eu/1.0/textResidenceAddress
    -	http://www.stork.gov.eu/1.0/canonicalResidenceAddress
    -
    -	http://www.stork.gov.eu/1.0/title
    -	http://www.stork.gov.eu/1.0/residencePermit
    -
    -	http://www.stork.gov.eu/1.0/signedDoc
    -	http://www.stork.gov.eu/1.0/citizen509Certificate
    -
    -	http://www.stork.gov.eu/1.0/newAttribute1
    -	http://www.stork.gov.eu/1.0/newAttribute2
    -	http://www.stork.gov.eu/1.0/hasDegree
    -	http://www.stork.gov.eu/1.0/mandateContent
    -
    -	http://www.stork.gov.eu/1.0/docRequest
    -
    +    SAML constants for AuthnRequests and Responses.
    +
    +    
    +    unspecified
    +
    +    
    +    obtained
    +
    +    
    +    entity
    +
    +    
    +    
    +    HTTP-POST
    +
    +
    +
    +
    +    
    +
    +
    +
    +    
    +    false
    +
    +    
    +    true
    +
    +    
    +    http://S-PEPS.gov.xx
    +
    +    
    +    http://C-PEPS.gov.xx
    +        
    +     	
    +    urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
    +
    +    
    +    300
    +
    +    
    +    false
    +
    +
    +    
    +    http://www.stork.gov.eu/1.0/eIdentifier
    +    http://www.stork.gov.eu/1.0/givenName
    +    http://www.stork.gov.eu/1.0/surname
    +    http://www.stork.gov.eu/1.0/inheritedFamilyName
    +    http://www.stork.gov.eu/1.0/adoptedFamilyName
    +    http://www.stork.gov.eu/1.0/gender
    +    http://www.stork.gov.eu/1.0/dateOfBirth
    +    http://www.stork.gov.eu/1.0/countryCodeOfBirth
    +    http://www.stork.gov.eu/1.0/placeOfBirth
    +    http://www.stork.gov.eu/1.0/nationalityCode
    +    http://www.stork.gov.eu/1.0/maritalStatus
    +    http://www.stork.gov.eu/1.0/textResidenceAddress
    +    http://www.stork.gov.eu/1.0/canonicalResidenceAddress
    +    http://www.stork.gov.eu/1.0/eMail
    +    http://www.stork.gov.eu/1.0/title
    +    http://www.stork.gov.eu/1.0/residencePermit
    +    http://www.stork.gov.eu/1.0/pseudonym
    +    http://www.stork.gov.eu/1.0/age
    +    http://www.stork.gov.eu/1.0/isAgeOver
    +    http://www.stork.gov.eu/1.0/signedDoc
    +    http://www.stork.gov.eu/1.0/citizenQAALevel
    +    http://www.stork.gov.eu/1.0/fiscalNumber
    +    http://www.stork.gov.eu/1.0/unknown
    +    http://www.stork.gov.eu/1.0/newAttribute1
    +    http://www.stork.gov.eu/1.0/newAttribute2
    +    http://www.stork.gov.eu/1.0/hasDegree
    +	
    +    http://www.stork.gov.eu/1.0/diplomaSupplement
    +    http://www.stork.gov.eu/1.0/currentStudiesSupplement
    +    http://www.stork.gov.eu/1.0/isStudent
    +    http://www.stork.gov.eu/1.0/isAcademicStaff
    +    http://www.stork.gov.eu/1.0/isTeacherOf
    +    http://www.stork.gov.eu/1.0/isCourseCoordinator
    +    http://www.stork.gov.eu/1.0/isAdminStaff
    +    http://www.stork.gov.eu/1.0/habilitation
    +    http://www.stork.gov.eu/1.0/Title
    +    http://www.stork.gov.eu/1.0/hasDegree
    +    http://www.stork.gov.eu/1.0/hasAccountInBank
    +    http://www.stork.gov.eu/1.0/isHealthCareProfessional	
    +	
    +    http://www.stork.gov.eu/1.0/eLPIdentifier
    +    http://www.stork.gov.eu/1.0/legalName
    +    http://www.stork.gov.eu/1.0/alternativeName
    +    http://www.stork.gov.eu/1.0/type
    +    http://www.stork.gov.eu/1.0/translatableType
    +    http://www.stork.gov.eu/1.0/status
    +    http://www.stork.gov.eu/1.0/activity
    +    http://www.stork.gov.eu/1.0/registeredAddress
    +    http://www.stork.gov.eu/1.0/registeredCanonicalAddress
    +    http://www.stork.gov.eu/1.0/contactInformation
    +    http://www.stork.gov.eu/1.0/LPFiscalNumber
    +    http://www.stork.gov.eu/1.0/mandate
    +    http://www.stork.gov.eu/1.0/docRequest
    +	
    +	
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml
    index ad04cc3df..a65717a05 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml
    @@ -2,84 +2,110 @@
     
     
     
    -	SAML constants for AuthnRequests and Responses.
    -
    -	
    -	unspecified
    -
    -	
    -	obtained
    -
    -	
    -	entity
    -
    -	
    -	
    -	HTTP-POST
    -
    -
    -
    -
    -	
    -
    -
    -
    -	
    -	false
    -
    -	
    -	true
    -
    -	
    -	http://S-PEPS.gov.xx
    -
    -	
    -	http://C-PEPS.gov.xx
    -
    -	
    -	300
    -
    -	
    -	false
    -
    -
    -	
    -	http://www.stork.gov.eu/1.0/eIdentifier
    -	http://www.stork.gov.eu/1.0/givenName
    -	http://www.stork.gov.eu/1.0/surname
    -	http://www.stork.gov.eu/1.0/inheritedFamilyName
    -	http://www.stork.gov.eu/1.0/adoptedFamilyName
    -	http://www.stork.gov.eu/1.0/gender
    -	http://www.stork.gov.eu/1.0/dateOfBirth
    -	http://www.stork.gov.eu/1.0/countryCodeOfBirth
    -	http://www.stork.gov.eu/1.0/nationalityCode
    -	http://www.stork.gov.eu/1.0/maritalStatus
    -	http://www.stork.gov.eu/1.0/residenceAddress
    -	http://www.stork.gov.eu/1.0/eMail
    -	http://www.stork.gov.eu/1.0/academicTitle
    -	http://www.stork.gov.eu/1.0/pseudonym
    -	http://www.stork.gov.eu/1.0/age
    -	http://www.stork.gov.eu/1.0/isAgeOver
    -
    -	http://www.stork.gov.eu/1.0/textResidenceAddress
    -	http://www.stork.gov.eu/1.0/canonicalResidenceAddress
    -
    -	http://www.stork.gov.eu/1.0/title
    -	http://www.stork.gov.eu/1.0/residencePermit
    -
    -	http://www.stork.gov.eu/1.0/signedDoc
    -	http://www.stork.gov.eu/1.0/citizen509Certificate
    -
    -	http://www.stork.gov.eu/1.0/newAttribute1
    -	http://www.stork.gov.eu/1.0/newAttribute2
    -	http://www.stork.gov.eu/1.0/hasDegree
    -	http://www.stork.gov.eu/1.0/mandateContent
    +    SAML constants for AuthnRequests and Responses.
    +
    +    
    +    unspecified
    +
    +    
    +    obtained
    +
    +    
    +    entity
    +
    +    
    +    
    +    HTTP-POST
    +
    +
    +
    +
    +    
    +
    +
    +
    +    
    +    false
    +
    +    
    +    true
    +
    +    
    +    http://S-PEPS.gov.xx
    +
    +    
    +    http://C-PEPS.gov.xx  	
    +        
    +     	
    +    urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
    +
    +    
    +    300
    +
    +    
    +    false
    +
    +
    +    
    +    http://www.stork.gov.eu/1.0/eIdentifier
    +    http://www.stork.gov.eu/1.0/givenName
    +    http://www.stork.gov.eu/1.0/surname
    +    http://www.stork.gov.eu/1.0/inheritedFamilyName
    +    http://www.stork.gov.eu/1.0/adoptedFamilyName
    +    http://www.stork.gov.eu/1.0/gender
    +    http://www.stork.gov.eu/1.0/dateOfBirth
    +    http://www.stork.gov.eu/1.0/countryCodeOfBirth
    +    http://www.stork.gov.eu/1.0/placeOfBirth
    +    http://www.stork.gov.eu/1.0/nationalityCode
    +    http://www.stork.gov.eu/1.0/maritalStatus
    +    http://www.stork.gov.eu/1.0/textResidenceAddress
    +    http://www.stork.gov.eu/1.0/canonicalResidenceAddress
    +    http://www.stork.gov.eu/1.0/eMail
    +    http://www.stork.gov.eu/1.0/title
    +    http://www.stork.gov.eu/1.0/residencePermit
    +    http://www.stork.gov.eu/1.0/pseudonym
    +    http://www.stork.gov.eu/1.0/age
    +    http://www.stork.gov.eu/1.0/isAgeOver
    +    http://www.stork.gov.eu/1.0/signedDoc
    +    http://www.stork.gov.eu/1.0/citizenQAALevel
    +    http://www.stork.gov.eu/1.0/fiscalNumber
    +    http://www.stork.gov.eu/1.0/unknown
    +    http://www.stork.gov.eu/1.0/newAttribute1
    +    http://www.stork.gov.eu/1.0/newAttribute2
    +    http://www.stork.gov.eu/1.0/hasDegree
    +	
    +    http://www.stork.gov.eu/1.0/diplomaSupplement
    +    http://www.stork.gov.eu/1.0/currentStudiesSupplement
    +    http://www.stork.gov.eu/1.0/isStudent
    +    http://www.stork.gov.eu/1.0/isAcademicStaff
    +    http://www.stork.gov.eu/1.0/isTeacherOf
    +    http://www.stork.gov.eu/1.0/isCourseCoordinator
    +    http://www.stork.gov.eu/1.0/isAdminStaff
    +    http://www.stork.gov.eu/1.0/habilitation
    +    http://www.stork.gov.eu/1.0/Title
    +    http://www.stork.gov.eu/1.0/hasDegree
    +    http://www.stork.gov.eu/1.0/hasAccountInBank
    +    http://www.stork.gov.eu/1.0/isHealthCareProfessional	
    +	
    +    http://www.stork.gov.eu/1.0/eLPIdentifier
    +    http://www.stork.gov.eu/1.0/legalName
    +    http://www.stork.gov.eu/1.0/alternativeName
    +    http://www.stork.gov.eu/1.0/type
    +    http://www.stork.gov.eu/1.0/translatableType
    +    http://www.stork.gov.eu/1.0/status
    +    http://www.stork.gov.eu/1.0/activity
    +    http://www.stork.gov.eu/1.0/registeredAddress
    +    http://www.stork.gov.eu/1.0/registeredCanonicalAddress
    +    http://www.stork.gov.eu/1.0/contactInformation
    +    http://www.stork.gov.eu/1.0/LPFiscalNumber
    +    http://www.stork.gov.eu/1.0/mandate
    +    http://www.stork.gov.eu/1.0/docRequest
     
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml
    index fd1db92ac..a0a5bea10 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml
    @@ -2,59 +2,100 @@
     
     
     
    -	SAML constants for AuthnRequests and Responses.
    -
    -	
    -	unspecified
    -	
    -	obtained
    -
    -	
    -	entity
    -
    -	
    -	
    -	HTTP-POST
    -
    -	false
    -	false
    -	false
    -
    -	
    -	http://S-PEPS.gov.xx
    -
    -	
    -	http://C-PEPS.gov.xx
    -
    -	
    -	300
    -
    -	
    -	false
    -
    -	
    -	false
    -
    -
    -	
    -	http://www.stork.gov.eu/1.0/eIdentifier
    -	http://www.stork.gov.eu/1.0/givenName
    -	http://www.stork.gov.eu/1.0/surname
    -	http://www.stork.gov.eu/1.0/inheritedFamilyName
    -	http://www.stork.gov.eu/1.0/adoptedFamilyName
    -	http://www.stork.gov.eu/1.0/gender
    -	http://www.stork.gov.eu/1.0/dateOfBirth
    -	http://www.stork.gov.eu/1.0/countryCodeOfBirth
    -	http://www.stork.gov.eu/1.0/nationalityCode
    -	http://www.stork.gov.eu/1.0/maritalStatus
    -	http://www.stork.gov.eu/1.0/residenceAddress
    -	http://www.stork.gov.eu/1.0/eMail
    -	http://www.stork.gov.eu/1.0/academicTitle
    -	http://www.stork.gov.eu/1.0/pseudonym
    -	http://www.stork.gov.eu/1.0/age
    -	http://www.stork.gov.eu/1.0/isAgeOver
    +    SAML constants for AuthnRequests and Responses.
    +
    +    
    +    unspecified
    +    
    +    obtained
    +
    +    
    +    entity
    +
    +    
    +    
    +    HTTP-POST
    +
    +    false
    +    false
    +    false
    +
    +    
    +    http://S-PEPS.gov.xx
    +
    +    
    +    http://C-PEPS.gov.xx  	
    +        
    +     	
    +    urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
    +
    +    
    +    300
    +
    +    
    +    false
    +
    +    
    +    false
    +
    +
    +    
    +    http://www.stork.gov.eu/1.0/eIdentifier
    +    http://www.stork.gov.eu/1.0/givenName
    +    http://www.stork.gov.eu/1.0/surname
    +    http://www.stork.gov.eu/1.0/inheritedFamilyName
    +    http://www.stork.gov.eu/1.0/adoptedFamilyName
    +    http://www.stork.gov.eu/1.0/gender
    +    http://www.stork.gov.eu/1.0/dateOfBirth
    +    http://www.stork.gov.eu/1.0/countryCodeOfBirth
    +    http://www.stork.gov.eu/1.0/placeOfBirth
    +    http://www.stork.gov.eu/1.0/nationalityCode
    +    http://www.stork.gov.eu/1.0/maritalStatus
    +    http://www.stork.gov.eu/1.0/textResidenceAddress
    +    http://www.stork.gov.eu/1.0/canonicalResidenceAddress
    +    http://www.stork.gov.eu/1.0/eMail
    +    http://www.stork.gov.eu/1.0/title
    +    http://www.stork.gov.eu/1.0/residencePermit
    +    http://www.stork.gov.eu/1.0/pseudonym
    +    http://www.stork.gov.eu/1.0/age
    +    http://www.stork.gov.eu/1.0/isAgeOver
    +    http://www.stork.gov.eu/1.0/signedDoc
    +    http://www.stork.gov.eu/1.0/citizenQAALevel
    +    http://www.stork.gov.eu/1.0/fiscalNumber
    +    http://www.stork.gov.eu/1.0/unknown
    +    http://www.stork.gov.eu/1.0/newAttribute1
    +    http://www.stork.gov.eu/1.0/newAttribute2
    +    http://www.stork.gov.eu/1.0/hasDegree
    +	
    +    http://www.stork.gov.eu/1.0/diplomaSupplement
    +    http://www.stork.gov.eu/1.0/currentStudiesSupplement
    +    http://www.stork.gov.eu/1.0/isStudent
    +    http://www.stork.gov.eu/1.0/isAcademicStaff
    +    http://www.stork.gov.eu/1.0/isTeacherOf
    +    http://www.stork.gov.eu/1.0/isCourseCoordinator
    +    http://www.stork.gov.eu/1.0/isAdminStaff
    +    http://www.stork.gov.eu/1.0/habilitation
    +    http://www.stork.gov.eu/1.0/Title
    +    http://www.stork.gov.eu/1.0/hasDegree
    +    http://www.stork.gov.eu/1.0/hasAccountInBank
    +    http://www.stork.gov.eu/1.0/isHealthCareProfessional	
    +	
    +    http://www.stork.gov.eu/1.0/eLPIdentifier
    +    http://www.stork.gov.eu/1.0/legalName
    +    http://www.stork.gov.eu/1.0/alternativeName
    +    http://www.stork.gov.eu/1.0/type
    +    http://www.stork.gov.eu/1.0/translatableType
    +    http://www.stork.gov.eu/1.0/status
    +    http://www.stork.gov.eu/1.0/activity
    +    http://www.stork.gov.eu/1.0/registeredAddress
    +    http://www.stork.gov.eu/1.0/registeredCanonicalAddress
    +    http://www.stork.gov.eu/1.0/contactInformation
    +    http://www.stork.gov.eu/1.0/LPFiscalNumber
    +    http://www.stork.gov.eu/1.0/mandate
    +    http://www.stork.gov.eu/1.0/docRequest
    +	
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml
    index bea40d274..61c6cd6d6 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml
    @@ -2,56 +2,96 @@
     
     
     
    -	SAML constants for AuthnRequests and Responses.
    -
    -	
    -	unspecified
    -	
    -	obtained
    -
    -	
    -	entity
    -
    -	
    -	
    -	HTTP-POST
    -
    -	false
    -	false
    -	false
    -
    -	
    -	http://S-PEPS.gov.xx
    -
    -	
    -	http://C-PEPS.gov.xx
    -
    -	
    -	300
    -
    -	
    -	false
    -
    -	
    -	http://www.stork.gov.eu/1.0/eIdentifier
    -	http://www.stork.gov.eu/1.0/givenName
    -	http://www.stork.gov.eu/1.0/surname
    -	http://www.stork.gov.eu/1.0/inheritedFamilyName
    -	http://www.stork.gov.eu/1.0/adoptedFamilyName
    -	http://www.stork.gov.eu/1.0/gender
    -	http://www.stork.gov.eu/1.0/dateOfBirth
    -	http://www.stork.gov.eu/1.0/countryCodeOfBirth
    -	http://www.stork.gov.eu/1.0/nationalityCode
    -	http://www.stork.gov.eu/1.0/maritalStatus
    -	http://www.stork.gov.eu/1.0/residenceAddress
    -	http://www.stork.gov.eu/1.0/eMail
    -	http://www.stork.gov.eu/1.0/academicTitle
    -	http://www.stork.gov.eu/1.0/pseudonym
    -	http://www.stork.gov.eu/1.0/age
    -	http://www.stork.gov.eu/1.0/isAgeOver
    -	http://www.stork.gov.eu/1.0/unknown
    +    SAML constants for AuthnRequests and Responses.
    +
    +    
    +    unspecified
    +    
    +    obtained
    +
    +    
    +    entity
    +
    +    
    +    
    +    HTTP-POST
    +
    +    false
    +    false
    +    false
    +
    +    
    +    http://S-PEPS.gov.xx
    +
    +    
    +    http://C-PEPS.gov.xx  	
    +        
    +     	
    +    urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
    +
    +    
    +    300
    +
    +    
    +    false
    +
    +    
    +    http://www.stork.gov.eu/1.0/eIdentifier
    +    http://www.stork.gov.eu/1.0/givenName
    +    http://www.stork.gov.eu/1.0/surname
    +    http://www.stork.gov.eu/1.0/inheritedFamilyName
    +    http://www.stork.gov.eu/1.0/adoptedFamilyName
    +    http://www.stork.gov.eu/1.0/gender
    +    http://www.stork.gov.eu/1.0/dateOfBirth
    +    http://www.stork.gov.eu/1.0/countryCodeOfBirth
    +    http://www.stork.gov.eu/1.0/placeOfBirth
    +    http://www.stork.gov.eu/1.0/nationalityCode
    +    http://www.stork.gov.eu/1.0/maritalStatus
    +    http://www.stork.gov.eu/1.0/textResidenceAddress
    +    http://www.stork.gov.eu/1.0/canonicalResidenceAddress
    +    http://www.stork.gov.eu/1.0/eMail
    +    http://www.stork.gov.eu/1.0/title
    +    http://www.stork.gov.eu/1.0/residencePermit
    +    http://www.stork.gov.eu/1.0/pseudonym
    +    http://www.stork.gov.eu/1.0/age
    +    http://www.stork.gov.eu/1.0/isAgeOver
    +    http://www.stork.gov.eu/1.0/signedDoc
    +    http://www.stork.gov.eu/1.0/citizenQAALevel
    +    http://www.stork.gov.eu/1.0/fiscalNumber
    +    http://www.stork.gov.eu/1.0/unknown
    +    http://www.stork.gov.eu/1.0/newAttribute1
    +    http://www.stork.gov.eu/1.0/newAttribute2
    +    http://www.stork.gov.eu/1.0/hasDegree
    +	
    +    http://www.stork.gov.eu/1.0/diplomaSupplement
    +    http://www.stork.gov.eu/1.0/currentStudiesSupplement
    +    http://www.stork.gov.eu/1.0/isStudent
    +    http://www.stork.gov.eu/1.0/isAcademicStaff
    +    http://www.stork.gov.eu/1.0/isTeacherOf
    +    http://www.stork.gov.eu/1.0/isCourseCoordinator
    +    http://www.stork.gov.eu/1.0/isAdminStaff
    +    http://www.stork.gov.eu/1.0/habilitation
    +    http://www.stork.gov.eu/1.0/Title
    +    http://www.stork.gov.eu/1.0/hasDegree
    +    http://www.stork.gov.eu/1.0/hasAccountInBank
    +    http://www.stork.gov.eu/1.0/isHealthCareProfessional	
    +	
    +    http://www.stork.gov.eu/1.0/eLPIdentifier
    +    http://www.stork.gov.eu/1.0/legalName
    +    http://www.stork.gov.eu/1.0/alternativeName
    +    http://www.stork.gov.eu/1.0/type
    +    http://www.stork.gov.eu/1.0/translatableType
    +    http://www.stork.gov.eu/1.0/status
    +    http://www.stork.gov.eu/1.0/activity
    +    http://www.stork.gov.eu/1.0/registeredAddress
    +    http://www.stork.gov.eu/1.0/registeredCanonicalAddress
    +    http://www.stork.gov.eu/1.0/contactInformation
    +    http://www.stork.gov.eu/1.0/LPFiscalNumber
    +    http://www.stork.gov.eu/1.0/mandate
    +    http://www.stork.gov.eu/1.0/docRequest
    +
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml
    index 3764389e4..d4f6f89da 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml
    @@ -1,82 +1,68 @@
    -
    -
    -	http://S-PEPS.gov.xx
    -	
    -		
    -			
    -			
    -			
    -				
    -					
    -					
    -						
    -					
    -				
    -				
    -				BgPDTVCv7BhiWIs6HsC06jaHaag=
    -			
    -		
    -		dIC61bGi6Jqp1zSVojpjaVq9WaZcDtNImXgo1Dyze5/hJA07Sy4TaHu+/IuLEC99aLjM6rxh2UUNqpPaQCFlF5eVkVv/c4gHEZVyevhjJKTidqmnuhlI78PGMx2thfxFsHsPcqHqOzy1Z6w18K1ds6APQP+aXI9TNKis+pykn4nJititYuiSseD0VY0F4QnXx+U6k3raoi1CAFE5fe7EuI/KfxuhhQLAbLq90Vm8R94ITBjfSS25mXstXNe9zppTSjDB42ld1TjDovDwXAn5OxiZasIEb5m68sRlxgoQ/2/+ZdYNNINFLAwkCbb8MiCbGASd626Bme0Kx+ropeWdxw==
    -		
    -			
    -				MIIDXjCCAkagAwIBAgIEUk1MbDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJJUzESMBAGA1UE
    -					CAwJUmV5a2phdmlrMRIwEAYDVQQHDAlSZXlramF2aWsxEDAOBgNVBAoMB0FkdmFuaWExDzANBgNV
    -					BAsMBlNUT1JLMjEXMBUGA1UEAwwOc2FtbC1kZW1vLWNlcnQwHhcNMTMxMDAzMTA1MzEyWhcNMjMx
    -					MDAzMTA1MzEyWjBxMQswCQYDVQQGEwJJUzESMBAGA1UECAwJUmV5a2phdmlrMRIwEAYDVQQHDAlS
    -					ZXlramF2aWsxEDAOBgNVBAoMB0FkdmFuaWExDzANBgNVBAsMBlNUT1JLMjEXMBUGA1UEAwwOc2Ft
    -					bC1kZW1vLWNlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkSgTxZkNRXZTKLB0c
    -					4oz7/8Dh56FX+0cYg7hjw4e8vn+ITXkxzrmUH57FtsvKln4mq1H0FHXL80u3IiWX8qY+QLgNeKeB
    -					m85lXuyOb3wWpKAaQvpLAkejGLCx22AN2L0WZkKZV2puwRQVsRHCq6U6vToJXDZ6Ui6ltKsAl/ZS
    -					8qUFpiIvqD5ea4ohz4JsFE/uApRc7pbJ4VbOmAAeH/tQTayptq2kPb2vvUVk+2cH5J7UD+GCI88E
    -					e+mS+C33tV9NmWUHL69mYEe8FXjumbKA5e9i1ejn9i0/BLUtHFonHnL9YFMim0foI7NNc5mNg9aw
    -					vm0PuByVU3kuibQkqGBLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAA9X5B4NBmVuhjECi+KOnRRX
    -					5oUV+jbYKhGZODDPi+F4Uo7ZtPFQ6sS3tE54+8AoDl5zQ5q5fDDVXhB42IIIjDxHKo8cBXie5FZ6
    -					mJtErvWZWYWdO0uV2OQAUALq2LieidqSFDJ+Pjl8w1New8oi3migwyE0jZo4Q97lJGDfJTruV0A2
    -					JE/Gt6QAAcWhhN2hZl92pYkIi5OeqHXyzBUp5vg8LLfNmeyziCAiXDC1Sy/aQU/cllZ3zFJMrqZM
    -					s2xBpmB4sF1YRbIrr2OqEVE6M6DUx+pAQOd2uogV3AMT9D5MYpckI1jx/o/Tto7ju74nIVOskDiN
    -					K0FR8izxcT0HixM=
    -			
    -		
    -	
    -	
    -		3
    -		false
    -		false
    -		false
    -		
    -			
    -			
    -				16
    -				18
    -			
    -			
    -				Sveinbjorn
    -			
    -			
    -				ES/IS/1234567890
    -			
    -		
    -	
    -	
    -		
    -	
    +
    +    http://S-PEPS.gov.xx
    +    
    +        
    +            
    +            
    +            
    +                
    +                    
    +                    
    +                        
    +                    
    +                
    +                
    +                NwBXMUys6XjoR7Ddbr6JI5gB+O8=
    +            
    +        
    +        MFoAC5mncGKFyvZKygSIH7+9JrXWMJ18jolBHZ0WisxpIrDldS+K+Mf6uwOirL5mal2uktpIT2RRiT1Twk+fS5t94wnobaLpktpv+uoZCzd2BAqFpBBHnImwC/UEy7hCF9htsW8CCx97wRXHA4IGx5OX9Fg4f+ZJdPPFLrGpdfJ3bJXvQeQPwGLqhjWio/XnAYwJYQ8YGQvRywZDDodTZDWHsKMHAsrIdmNJz93wmMPceRtgcUceZdN4jDkPE8SPNrApe2ksd3dEKauyyJQ2DR5jryVQpGM7sJzQhP9Z57XIJta+c/nJ7bttw+M+QsZn/E+CLQpcI8MeuuhBb1+mGA==
    +        
    +            
    +                MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
    +                    CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
    +                    LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
    +                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
    +                    Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
    +                    NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
    +                    ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
    +                    NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
    +                    rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
    +                    fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
    +                    9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
    +                    yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
    +                    USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
    +                    nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
    +                    y66jvDrin5I=
    +            
    +        
    +    
    +    
    +        3
    +        IS
    +        false
    +        false
    +        false
    +        
    +            
    +                ES/IS/1234567890
    +            
    +            
    +                Sveinbjorn
    +            
    +            
    +            
    +                fiscalNumber
    +            
    +            
    +                16
    +                18
    +            
    +            
    +                LPFiscalNumber
    +            
    +        
    +    
    +    
    +        
    +    
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
    index 7dffe0312..fadc86d14 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
    @@ -1,68 +1,54 @@
    -
    -
    -	http://S-PEPS.gov.xx
    -	
    -		
    -			
    -			
    -			
    -				
    -					
    -					
    -						
    -					
    -				
    -				
    -				X1nUVB6qXdoKbJzNekiSo9ExLdw=
    -			
    -		
    -		ExCPHHC/9OhdhOl1Ou+43Qw1nvskpbMYMu9vqa7m16doxM2PIUmK7LUw7hZiKtjIdBxuhpca3OrjO8O6MuTDN1FksWoj+7B1KTLFtmspucT5O7Cu2OqhK5WIVuCaLuA7CD0N2UfFouRwR5NlLHyzn9Trd7IM5OjA41dGb5jqYl7Ir+62+MgjhZRlLooDzb5fDAczbxv9LHGiKRBpgnk40w3gDAvoSPNdEuKhZi8LPQWWNBvVi3N5ZmJmAIacZWBqePywXTjygmChWAc8p7ptAX6tw0hpBxyxoW3aaZZzWQNcwobTRYbn89fcM11gqIz/YK7VXtiQ7WEQt1enQD/GAA==
    -		
    -			
    -				MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
    -					CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
    -					LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
    -					A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
    -					Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
    -					NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
    -					ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
    -					NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
    -					rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
    -					fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
    -					9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
    -					yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
    -					USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
    -					nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
    -					y66jvDrin5I=
    -			
    -		
    -	
    -	
    -		3
    -		IS
    -		false
    -		false
    -		false
    -		
    -			
    -				IS/IS/fbea6e68-0393-401b-b616-f767fff9418c
    -			
    -		
    -	
    -	
    -		
    -	
    +
    +    http://S-PEPS.gov.xx
    +    
    +        
    +            
    +            
    +            
    +                
    +                    
    +                    
    +                        
    +                    
    +                
    +                
    +                2WMvsIXoH1VpwqbNiXG8lWS2ZPc=
    +            
    +        
    +        nMfUZiYHyHgSky4NHfDGch8a6UxWupS1Dhk2mu3L065Vq2eKLfDwWjgNkKPDoLcEkgAiDpNlLsS0+nDk8IexAMSq+T54Mlt4AhMRIrDP3SlWya5mqQ0VnxFENGlhi7kSKK2oIMfkiaeIBART7QBZggSZFnk0mw/BzmJM5bJ4Dipymndx7tv98BDlWFZEKH7iSc9uUuMpVygTNDxtEsdMcBKpqYiyVyTln8/xKsqXSL4RA10MYmqfvFsMZWUwQUgdl5tor910/XrAXHXJY50zH0CwekUXszOdvO7s3WvrG4lt3goqq2WDcaeDzizV93+Ih+lVl9PebTtMxCyO4fxw7Q==
    +        
    +            
    +                MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
    +                    CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
    +                    LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
    +                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
    +                    Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
    +                    NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
    +                    ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
    +                    NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
    +                    rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
    +                    fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
    +                    9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
    +                    yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
    +                    USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
    +                    nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
    +                    y66jvDrin5I=
    +            
    +        
    +    
    +    
    +        3
    +        IS
    +        false
    +        false
    +        false
    +        
    +            
    +                IS/IS/fbea6e68-0393-401b-b616-f767fff9418c
    +            
    +        
    +    
    +    
    +        
    +    
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml
    index becc689fe..5c04f5c93 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml
    @@ -1,66 +1,66 @@
     
     
    -	http://S-PEPS.gov.xx
    -	
    -		hhQXDKNrJJ3Yy/pkZNZF4GlWrA/Xsx4CH9chgVa5HK4qZQvFXvZwegdw6U7rm7qv0zmI4xaLTv/bpmqJzEPfY3sIvrDRu9EouEKwtjbMbcvVQsx7I+j0yy7/cBcQJe3lRwQwyvazfYVbnSeGFxBN6WOHPqv6uInaQO/hXkicT3tBtm8o3UgUDY6c8wIMuD5A0hWTkL6z6f893AbdN85OQYAdHItNsQWeLOIeiGC918X7qqTfhFtBAB2oGVjlsSEqWox1jNqrPl1jjA0dP76m5SIVSqF8XcDR306ZB9GLJywOHKba0lxGLsXOAzJ+8u9jeixJ6VZKFqZg2Fhl/saKbg==
    -		
    -			
    -				MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
    -					YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
    -					LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
    -					A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
    -					Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
    -					ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
    -					0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
    -					6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
    -					y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
    -					9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
    -					6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
    -					pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
    -					/NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
    -					yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
    -					Ppm8IFVTk8mYfX8/jw==
    -			
    -		
    -	
    -	
    -		3
    -		false
    -		false
    -		false
    -		
    -			
    -			
    -				16
    -				18
    -			
    -			
    -				Sveinbjörn
    -			
    -			
    -				ES/IS/1234567890
    -			
    -		
    -	
    -	
    -		
    -	
    +                       xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
    +                       xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
    +                       xmlns:xs="http://www.w3.org/2001/XMLSchema" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified"
    +                       Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest" ID="_f6c8fc355b9f125cb5283f038e1b3cdf"
    +                       IssueInstant="2013-10-03T10:28:15.449Z" Version="2.0">
    +    http://S-PEPS.gov.xx
    +    
    +        hhQXDKNrJJ3Yy/pkZNZF4GlWrA/Xsx4CH9chgVa5HK4qZQvFXvZwegdw6U7rm7qv0zmI4xaLTv/bpmqJzEPfY3sIvrDRu9EouEKwtjbMbcvVQsx7I+j0yy7/cBcQJe3lRwQwyvazfYVbnSeGFxBN6WOHPqv6uInaQO/hXkicT3tBtm8o3UgUDY6c8wIMuD5A0hWTkL6z6f893AbdN85OQYAdHItNsQWeLOIeiGC918X7qqTfhFtBAB2oGVjlsSEqWox1jNqrPl1jjA0dP76m5SIVSqF8XcDR306ZB9GLJywOHKba0lxGLsXOAzJ+8u9jeixJ6VZKFqZg2Fhl/saKbg==
    +        
    +            
    +                MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
    +                    YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
    +                    LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
    +                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
    +                    Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
    +                    ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
    +                    0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
    +                    6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
    +                    y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
    +                    9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
    +                    6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
    +                    pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
    +                    /NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
    +                    yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
    +                    Ppm8IFVTk8mYfX8/jw==
    +            
    +        
    +    
    +    
    +        3
    +        false
    +        false
    +        false
    +        
    +            
    +            
    +                16
    +                18
    +            
    +            
    +                Sveinbjörn
    +            
    +            
    +                ES/IS/1234567890
    +            
    +        
    +    
    +    
    +        
    +    
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml
    index 7ea486812..79c59f5ed 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml
    @@ -1,124 +1,124 @@
     
     
    -	http://C-PEPS.gov.xx
    -	
    -		
    -			
    -			
    -			
    -				
    -					
    -					
    -						
    -					
    -				
    -				
    -				yMOVS1T/yRiVh3L6IBM9rR9Ie3w=
    -			
    -		
    -		d8e/RyNNPmnHRIzTIuRSnW6B60oWGBGxjRua/HvNxTuod0qSarYJxEedhY9Wl1Z9WYXlry28FuKjp3DA3HhzNaVd7A7QpFqNC4dnizSVWFjxlhmoE/Uv3Y/ha9P/fk6nbtHCSKW4kHSX7QfFLeggcLmUG0IULRF8UmRdQ0WerCl0aSZZeSp8J3LsFBPeWCRSwXgfiLn+RehggzZmQU6g0ssxrpnsYEAtjAiOli+YVQGuumsZGaJ8zHA/DgJ2FTGovNUyfuSUFLhd9nLlSqFs2Avnx0Ck7Q1dxDO5truOm6e285YLHqLaGdetFyPQAj/Z4w4RJ5u5X6d7rhBjTfRAAw==
    -		
    -			
    -				MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
    -					YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
    -					LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
    -					A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
    -					Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
    -					ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
    -					0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
    -					6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
    -					y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
    -					9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
    -					6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
    -					pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
    -					/NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
    -					yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
    -					Ppm8IFVTk8mYfX8/jw==
    -			
    -		
    -	
    -	
    -		
    -		urn:oasis:names:tc:SAML:2.0:status:Success
    -	
    -	
    -		http://C-PEPS.gov.xx
    -		
    -			urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
    -			
    -				
    -			
    -		
    -		
    -			
    -				http://S-PEPS.gov.xx
    -			
    -			
    -		
    -		
    -			
    -			
    -				
    -			
    -		
    -		
    -			
    -				16/12/2008
    -			
    -			
    -				
    -					105
    -					IS
    -					10
    -					Gudrunartun
    -					Reykjavik
    -				
    -			
    -			
    -				
    -					value3
    -					value4
    -					value1
    -					value2
    -				
    -			
    -			
    -				16
    -				18
    -			
    -			
    -				123456789IS
    -			
    -		
    -	
    +                 xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
    +                 xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
    +                 xmlns:xs="http://www.w3.org/2001/XMLSchema" Consent="urn:oasis:names:tc:SAML:2.0:consent:obtained"
    +                 Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest" ID="_483140d440fc4eef8e949ace49669f2e"
    +                 InResponseTo="_0a22c1120bf2de912714c24e99dd38ed" IssueInstant="2013-10-08T09:11:17.255Z"
    +                 Version="2.0">
    +    http://C-PEPS.gov.xx
    +    
    +        
    +            
    +            
    +            
    +                
    +                    
    +                    
    +                        
    +                    
    +                
    +                
    +                yMOVS1T/yRiVh3L6IBM9rR9Ie3w=
    +            
    +        
    +        d8e/RyNNPmnHRIzTIuRSnW6B60oWGBGxjRua/HvNxTuod0qSarYJxEedhY9Wl1Z9WYXlry28FuKjp3DA3HhzNaVd7A7QpFqNC4dnizSVWFjxlhmoE/Uv3Y/ha9P/fk6nbtHCSKW4kHSX7QfFLeggcLmUG0IULRF8UmRdQ0WerCl0aSZZeSp8J3LsFBPeWCRSwXgfiLn+RehggzZmQU6g0ssxrpnsYEAtjAiOli+YVQGuumsZGaJ8zHA/DgJ2FTGovNUyfuSUFLhd9nLlSqFs2Avnx0Ck7Q1dxDO5truOm6e285YLHqLaGdetFyPQAj/Z4w4RJ5u5X6d7rhBjTfRAAw==
    +        
    +            
    +                MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
    +                    YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
    +                    LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
    +                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
    +                    Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
    +                    ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
    +                    0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
    +                    6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
    +                    y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
    +                    9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
    +                    6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
    +                    pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
    +                    /NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
    +                    yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
    +                    Ppm8IFVTk8mYfX8/jw==
    +            
    +        
    +    
    +    
    +        
    +        urn:oasis:names:tc:SAML:2.0:status:Success
    +    
    +    
    +        http://C-PEPS.gov.xx
    +        
    +            urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
    +            
    +                
    +            
    +        
    +        
    +            
    +                http://S-PEPS.gov.xx
    +            
    +            
    +        
    +        
    +            
    +            
    +                
    +            
    +        
    +        
    +            
    +                16/12/2008
    +            
    +            
    +                
    +                    105
    +                    IS
    +                    10
    +                    Gudrunartun
    +                    Reykjavik
    +                
    +            
    +            
    +                
    +                    value3
    +                    value4
    +                    value1
    +                    value2
    +                
    +            
    +            
    +                16
    +                18
    +            
    +            
    +                123456789IS
    +            
    +        
    +    
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml
    index c48bfde95..93e778113 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml
    @@ -1,72 +1,72 @@
     
     
    -	http://S-PEPS.gov.xx
    -	
    -		
    -			
    -			
    -			
    -				
    -					
    -					
    -						
    -					
    -				
    -				
    -				yzsqaxBNicOrixBUno5cL0CBOpE=
    -			
    -		
    -		
    -			Xycll1PF7hh3Xdykpr6nIr8Q6PQ6OxLIBBBugoGpAm/V4Hu7tKakHJp8TgtRWZ30jG5eolOXnJkC
    -			wiaTVUFaQz7cNn27syRJkdA+eYlz9doiwUJ5eD1cAyddZYsNPpSeAj5UK45oN0qCH+/pI9mRw8Oi
    -			YIN/BUEtXkoYTjPtkmA=
    -		
    -		
    -			
    -				MIIBmDCCAQECBEuWisIwDQYJKoZIhvcNAQEFBQAwEzERMA8GA1UEAxMIY291bnRyeTEwHhcNMTAw
    -					MzA5MTc1MjAyWhcNMTAwNjA3MTc1MjAyWjATMREwDwYDVQQDEwhjb3VudHJ5MTCBnzANBgkqhkiG
    -					9w0BAQEFAAOBjQAwgYkCgYEAnb2gcchwxvJBclcsfCBWJnYefLJYQnDGCQ3RUtYZc26JznnLXclu
    -					h1XfLJlWgYk/pFKz7B9KfJztal47c6mBfisnxjhdcLqcbXOuRIm7E8TZPzdbHEd60WHPDv20jr+r
    -					/WkOQs12tKQMbgDX2wtBBcJODLYCDiYa1oQsnyhdOGkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBk
    -					3luVRc0EqEE1zZeYvRPi5a2yOZfI9H+/rXI1qNLwmICnuJX++ukUbqJHm/FV1iSPM9O9oqzifJ/K
    -					eKL5EcUugJ76Tu5XO8za2FoJvYr+jIZDsEkCg+OSzcp/eljiWAIh2enZcQ/ON6QxWXeSNJPH0xOq
    -					KAoZgbUK0Zld3Dsheg==
    -			
    -		
    -	
    -	
    -		3
    -		EDU001
    -		OXF001
    -		APP001
    -		EN
    -		true
    -		true
    -		true
    -		
    -			
    -				16
    -				18
    -			
    -			
    -			
    -		
    -	
    +                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
    +                     xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
    +                     AssertionConsumerServiceURL="http://S-PEPS.gov.xx/PEPS/ColleagueResponse"
    +                     Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest"
    +                     ForceAuthn="true" ID="_e54eee285e7b8e2772875c406ec39674" IsPassive="false"
    +                     IssueInstant="2010-06-08T07:37:54.533Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
    +                     ProviderName="University of Oxford" Version="2.0">
    +    http://S-PEPS.gov.xx
    +    
    +        
    +            
    +            
    +            
    +                
    +                    
    +                    
    +                        
    +                    
    +                
    +                
    +                yzsqaxBNicOrixBUno5cL0CBOpE=
    +            
    +        
    +        
    +            Xycll1PF7hh3Xdykpr6nIr8Q6PQ6OxLIBBBugoGpAm/V4Hu7tKakHJp8TgtRWZ30jG5eolOXnJkC
    +            wiaTVUFaQz7cNn27syRJkdA+eYlz9doiwUJ5eD1cAyddZYsNPpSeAj5UK45oN0qCH+/pI9mRw8Oi
    +            YIN/BUEtXkoYTjPtkmA=
    +        
    +        
    +            
    +                MIIBmDCCAQECBEuWisIwDQYJKoZIhvcNAQEFBQAwEzERMA8GA1UEAxMIY291bnRyeTEwHhcNMTAw
    +                    MzA5MTc1MjAyWhcNMTAwNjA3MTc1MjAyWjATMREwDwYDVQQDEwhjb3VudHJ5MTCBnzANBgkqhkiG
    +                    9w0BAQEFAAOBjQAwgYkCgYEAnb2gcchwxvJBclcsfCBWJnYefLJYQnDGCQ3RUtYZc26JznnLXclu
    +                    h1XfLJlWgYk/pFKz7B9KfJztal47c6mBfisnxjhdcLqcbXOuRIm7E8TZPzdbHEd60WHPDv20jr+r
    +                    /WkOQs12tKQMbgDX2wtBBcJODLYCDiYa1oQsnyhdOGkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBk
    +                    3luVRc0EqEE1zZeYvRPi5a2yOZfI9H+/rXI1qNLwmICnuJX++ukUbqJHm/FV1iSPM9O9oqzifJ/K
    +                    eKL5EcUugJ76Tu5XO8za2FoJvYr+jIZDsEkCg+OSzcp/eljiWAIh2enZcQ/ON6QxWXeSNJPH0xOq
    +                    KAoZgbUK0Zld3Dsheg==
    +            
    +        
    +    
    +    
    +        3
    +        EDU001
    +        OXF001
    +        APP001
    +        EN
    +        true
    +        true
    +        true
    +        
    +            
    +                16
    +                18
    +            
    +            
    +            
    +        
    +    
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml
    index 8766f9a8b..cca0dbc27 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml
    @@ -1,47 +1,47 @@
     
     
    -	http://S-PEPS.gov.xx
    -	
    -		
    -			S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
    -			Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
    -			Xt8p8tK3EoMocZse2hw=
    -		
    -		
    -			
    -				MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
    -					OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
    -					A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
    -					lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
    -					ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
    -					r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
    -					kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
    -					3cyl/wz8
    -			
    -		
    -	
    -	
    -		3
    -		false
    -		false
    -		false
    -		
    -			
    -			
    -			
    -		
    -	
    +                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
    +                     xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:stork" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
    +                     AssertionConsumerServiceURL="http://localhost:8080/SP/ReturnPage"
    +                     Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://locahost:8080/PEPS/ServiceProvider"
    +                     ForceAuthn="true" ID="_0c64ff85-1323-4618-847b-12d1983b86e4" IsPassive="false"
    +                     IssueInstant="2010-04-07T16:45:03.593Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
    +                     ProviderName="PT-SP" Version="2.0">
    +    http://S-PEPS.gov.xx
    +    
    +        
    +            S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
    +            Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
    +            Xt8p8tK3EoMocZse2hw=
    +        
    +        
    +            
    +                MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
    +                    OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
    +                    A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
    +                    lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
    +                    ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
    +                    r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
    +                    kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
    +                    3cyl/wz8
    +            
    +        
    +    
    +    
    +        3
    +        false
    +        false
    +        false
    +        
    +            
    +            
    +            
    +        
    +    
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml
    index 1b1e1646c..db606145c 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml
    @@ -1,47 +1,47 @@
     
     
    -	http://S-PEPS.gov.xx
    -	
    -		
    -			S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
    -			Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
    -			Xt8p8tK3EoMocZse2hw=
    -		
    -		
    -			
    -				MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
    -					OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
    -					A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
    -					lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
    -					ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
    -					r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
    -					kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
    -					3cyl/wz8
    -			
    -		
    -	
    -	
    -		3
    -		false
    -		false
    -		false
    -		
    -			
    -			
    -			
    -		
    -	
    +                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
    +                     xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:stork" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
    +                     AssertionConsumerServiceURL="http://localhost:8080/SP/ReturnPage"
    +                     Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://localhost:8080/PEPS/ServiceProvider"
    +                     ForceAuthn="true" ID="_0c64ff85-1323-4618-847b-12d1983b86e4" IsPassive="false"
    +                     IssueInstant="2010-04-07T16:45:03.593Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
    +                     ProviderName="PT-SP" Version="2.0">
    +    http://S-PEPS.gov.xx
    +    
    +        
    +            S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
    +            Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
    +            Xt8p8tK3EoMocZse2hw=
    +        
    +        
    +            
    +                MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
    +                    OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
    +                    A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
    +                    lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
    +                    ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
    +                    r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
    +                    kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
    +                    3cyl/wz8
    +            
    +        
    +    
    +    
    +        3
    +        false
    +        false
    +        false
    +        
    +            
    +            
    +            
    +        
    +    
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/logback-test.xml b/id/server/stork2-saml-engine/src/test/resources/logback-test.xml
    index 99d7d353a..84d48c00e 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/logback-test.xml
    +++ b/id/server/stork2-saml-engine/src/test/resources/logback-test.xml
    @@ -2,20 +2,20 @@
     
     
     
    -	
    -		
    -			%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
    -			
    -		
    -	
    +    
    +        
    +            %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
    +            
    +        
    +    
     
    -	
    -		
    -	
    +    
    +        
    +    
     
    -	
    -		
    -		
    -	
    +    
    +        
    +        
    +    
     
     
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg b/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg
    index bd9f357ce..84f7050d1 100644
    --- a/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg
    +++ b/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg
    @@ -1,21 +1,15 @@
    -//ATTRIBUTE			VALUE
    -//name				name suffix of this provider instance
    -//library			pathname of PKCS#11 implementation
    -//slotListIndex		slot index
    -
    -//PREFIX			DESCRIPTION
    -//CKO_ 				Object class
    -//CKA_ 				Attribute
    -//CKK_ 				Key type
    -
    -//attributes(operation, keytype, keyalgorithm) = {
    -//  name1 = value1
    -//  [...]
    -//}
    -
    -name=nameProvider
    -library=library.dll
    -slotListIndex=0
    +name=OpenDNSSEC
    +library = /usr/lib/softhsm/libsofthsm.so
    +slot = 0
    +attributes(generate, *, *) = {
    +	CKA_TOKEN = true
    +}
    +attributes(generate, CKO_CERTIFICATE, *) = {
    +   CKA_PRIVATE = false
    +}
    +attributes(generate, CKO_PUBLIC_KEY, *) = {
    +   CKA_PRIVATE = false
    +}
     attributes(*,CKO_PUBLIC_KEY,CKK_RSA)={
     	CKA_VERIFY=true
     }
    -- 
    cgit v1.2.3
    
    
    From a7c29dbe4c1103457d717a90a138fd605d562ac9 Mon Sep 17 00:00:00 2001
    From: Florian Reimair 
    Date: Mon, 10 Aug 2015 17:07:52 +0200
    Subject: approved some xmls and schemas
    
    ---
     .../src/main/config/embedded/pepsUtil.properties   |  273 -
     ...demic-language-diplomasupplement-schema-1_1.xsd | 7966 ++++++++++----------
     .../src/main/resources/schema/diploma.xsd          | 3497 +++++----
     .../main/resources/schema/xmldsig-core-schema.xsd  |  603 +-
     .../stork2-commons/src/test/resources/log4j.xml    |   24 +-
     5 files changed, 5773 insertions(+), 6590 deletions(-)
     delete mode 100644 id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
    
    diff --git a/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties b/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
    deleted file mode 100644
    index acc79a8c9..000000000
    --- a/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
    +++ /dev/null
    @@ -1,273 +0,0 @@
    -#Max allowed params size
    -validation.active=true
    -max.spUrl.size=150
    -max.attrList.size=20000
    -max.invalidAttributeList.size=20000
    -max.attrName.size=100
    -max.callback.size=300
    -max.idp.url.size=300
    -max.atp.url.size=300
    -max.cpepsURL.size=300
    -max.attrValue.size=20000
    -max.attrType.size=25
    -max.spId.size=40
    -max.providerName.size=128
    -max.spName.size=25
    -max.country.size=150
    -max.qaaLevel.size=1
    -max.spQaaLevel.size=1
    -max.errorCode.size=5
    -max.errorMessage.size=300
    -max.username.size=30
    -max.spepsRedirectUrl.size=300
    -max.speps.redirectUrl.size=300
    -max.cpeps.redirectUrl.size=300
    -max.cpepsRedirectUrl.size=300
    -max.spepsAssertionUrl.size=300
    -max.SAMLRequest.size=131072
    -max.SAMLResponse.size=131072
    -max.RelayState.size=80
    -max.remoteAddr.size=300
    -max.remoteHost.size=300
    -max.localAddr.size=300
    -max.localName.size=300
    -max.apepsUrl.size=300
    -max.apeps.callbackUrl.size=300
    -max.spCountryCode.size=5
    -
    -dtl.url=http://localhost:8080/DocumentService/DocumentService
    -
    -#ERROR codes/messages (accordingly to specification)
    -
    -#CountrySelector Interface errors
    -spCountrySelector.invalidSPQAA.code=0000001
    -spCountrySelector.invalidSPQAA.message=invalid.spQAA.parameter
    -
    -spCountrySelector.invalidQaaSPid.code=0000001
    -spCountrySelector.invalidQaaSPid.message=invalid.spQAAId.parameter
    -
    -spCountrySelector.invalidSpId.code=000002
    -spCountrySelector.invalidSpId.message=invalid.spId.parameter
    -
    -spCountrySelector.invalidSpURL.code=000003
    -spCountrySelector.invalidSpURL.message=invalid.spUrl.parameter
    -
    -domain.CountrySelectorAction.code=000003
    -domain.CountrySelectorAction.message=invalid.cs.domain
    -
    -requests.CountrySelectorAction.code=000004
    -requests.CountrySelectorAction.message=reached.max.requests.cs
    -
    -spCountrySelector.spNotAllowed.code=000006
    -spCountrySelector.spNotAllowed.message=attr.access.deny
    -
    -spCountrySelector.invalidAttr.code=000007
    -spCountrySelector.invalidAttr.message=invalid.spAttr.parameter
    -
    -spCountrySelector.invalidProviderName.code=000008
    -spCountrySelector.invalidProviderName.message=invalid.spProvidername.parameter
    -
    -spCountrySelector.errorCreatingSAML.code=203001
    -spCountrySelector.errorCreatingSAML.message=error.create.sp.saml
    -
    -spepsSAMLRequest.code=203001
    -spepsSAMLRequest.message=error.create.saml.speps
    -
    -#ServiceProvider Interface errors
    -sProviderAction.invalidSPQAA.code=200001
    -sProviderAction.invalidSPQAA.message=invalid.sp.qaa
    -
    -sProviderAction.invalidSPQAAId.code=200001
    -sProviderAction.invalidSPQAAId.message=invalid.sp.qaaid
    -
    -sProviderAction.invalidSPId.code=200002
    -sProviderAction.invalidSPId.message=invalid.sp.id
    -
    -domain.ServiceProviderAction.code=200003
    -domain.ServiceProviderAction.message=invalid.sp.domain
    -
    -sProviderAction.invalidSPDomain.code=200003
    -sProviderAction.invalidSPDomain.message=invalid.sp.domain
    -
    -sProviderAction.invalidCountry.code=200004
    -sProviderAction.invalidCountry.message=invalid.sp.country
    -
    -sProviderAction.spNotAllowed.code=200005
    -sProviderAction.spNotAllowed.message=sp.not.allowed
    -
    -sProviderAction.invalidSaml.code=200006
    -sProviderAction.invalidSaml.message=invalid.sp.samlrequest
    -
    -sProviderAction.invalidSPProviderName.code=200007
    -sProviderAction.invalidSPProviderName.message=sp.not.identified
    -
    -sProviderAction.invalidSPRedirect.code=200008
    -sProviderAction.invalidSPRedirect.message=invalid.sp.redirectUrl
    -
    -sProviderAction.invalidRelayState.code=200009
    -sProviderAction.invalidRelayState.message=invalid.sp.relaystate
    -
    -sProviderAction.invalidAttr.code=200011
    -sProviderAction.invalidAttr.message=invalid.sp.attr
    -
    -requests.ServiceProviderAction.code=200012
    -requests.ServiceProviderAction.message=reached.max.requests.sp
    -
    -sPPowerValidationAction.invalidSPPVAttrList.code=200013
    -sPPowerValidationAction.invalidSPPVAttrList.message=invalid.sp.pv.attrlist
    -
    -invalid.sp.pv.attrlist.code=200013
    -invalid.sp.pv.attrlist.message=invalid.sp.pv.attrlist
    -
    -sProviderAction.invalidSPAlias.code=203003
    -sProviderAction.invalidSPAlias.message=invalid.sp.alias
    -
    -sProviderAction.errorCreatingSAML.code=203001
    -sProviderAction.errorCreatingSAML.message=error.create.saml.speps
    -
    -#Internal Error 
    -internalError.code=203001
    -internalError.message=internalError
    -
    -attrList.code=202005
    -attrList.message=invalid.attrList.parameter
    -
    -missing.sessionId.code=203010
    -missing.sessionId.message=missing.session.id
    -
    -sessionError.code=203011
    -sessionError.message=invalid.session.id
    -
    -invalid.sessionId.code=203011
    -invalid.sessionId.message=invalid.session.id
    -
    -missing.mandate.code=203013
    -missing.mandate.message=missing.mandate
    -
    -invalid.session.code=203012
    -invalid.session.message=invalid.session
    -
    -callback.code=203006
    -callback.message=invalid.callback.url
    -
    -idp.url.code=203006
    -idp.url.message=invalid.idp.url
    -
    -IdPSAMLResponse.code=002001
    -IdPSAMLResponse.message=invalid.idp.response
    -
    -authenticationFailed.code=003002
    -authenticationFailed.message=authentication.failed
    -
    -username.code=003002
    -username.message=authentication.failed
    -
    -invalidAttributeList.code=203001
    -invalidAttributeList.message=invalid.attrlist
    -
    -invalidAttributeValue.code=203001
    -invalidAttributeValue.message=invalid.attr.value
    -
    -attVerification.mandatory.code=202010
    -attVerification.mandatory.message=missing.mandatory.attr
    -
    -attrValue.verification.code=203008
    -attrValue.verification.message=invalid.stork.attrValue
    -
    -cpepsSAMLResponse.code=202012
    -cpepsSAMLResponse.message=error.gen.cpeps.saml
    -
    -AtPSAMLResponse.code=202009
    -AtPSAMLResponse.message=error.gen.atp.saml
    -
    -atp.url.code=203006
    -atp.url.message=invalid.atp.url
    -
    -hash.error.code=203001
    -hash.error.message=error.hash
    -
    -qaaLevel.code=203006
    -qaaLevel.message=invalid.cpeps.qaalevel
    -
    -SAMLRequest.code=203001
    -SAMLRequest.message=invalid.SAMLRequest
    -
    -atp.response.error.code=202011
    -atp.response.error.message=atp.response.error
    -
    -#Colleague Request Interface errors
    -
    -colleagueRequest.invalidSAML.code=201002
    -colleagueRequest.invalidSAML.message=invalid.speps.samlrequest
    -
    -colleagueRequest.invalidCountryCode.code=002001
    -colleagueRequest.invalidCountryCode.message=country.cpeps.nomatch
    -
    -colleagueRequest.errorCreatingSAML.code=203001
    -colleagueRequest.errorCreatingSAML.message=error.create.saml.cpeps
    -
    -colleagueRequest.invalidQaa.code=202004
    -colleagueRequest.invalidQaa.message=invalid.requested.cpeps.qaalevel
    -
    -colleagueRequest.attrNull.code=202005
    -colleagueRequest.attrNull.message=invalid.requested.attrlist.cpeps
    -
    -colleaguePVRequest.invalidPVAttrList.code=202013
    -colleaguePVRequest.invalidPVAttrList.message=invalid.speps.pv.attrlist
    -
    -colleagueRequest.invalidRedirect.code=202001
    -colleagueRequest.invalidRedirect.message=invalid.redirecturl.cpeps
    -
    -colleagueRequest.invalidDestUrl.code=203006
    -colleagueRequest.invalidDestUrl.message=invalid.cpeps.destUrl
    -
    -cpepsRedirectUrl.code=203006
    -cpepsRedirectUrl.message=invalid.cpeps.redirectUrl
    -
    -#Citizen Consent Interfaces errors
    -
    -citizenResponse.mandatory.code=202007
    -citizenResponse.mandatory.message=no.consent.mand.attr
    -
    -cPeps.attrNull.code=202005
    -cPeps.attrNull.message=invalid.attrList.cpeps
    -
    -citizenNoConsent.mandatory.code=202012
    -citizenNoConsent.mandatory.message=no.consent.val.mand.attr
    -
    -#Colleague Response Interface errors
    -
    -colleagueResponse.invalidSAML.code=202002
    -colleagueResponse.invalidSAML.message=invalid.cpeps.samlresp
    -
    -auRequestIdError.code=201005
    -auRequestIdError.message=invalid.speps.saml.id
    -
    -audienceRestrictionError.code=201004
    -audienceRestrictionError.message=speps.saml.condition.notmet
    -
    -spepsSAMLResponse.code=200010
    -spepsSAMLResponse.message=error.gen.speps.saml
    -
    -
    -invalid.apepsRedirectUrl.code=204001
    -invalid.apepsRedirectUrl.message=invalid.apeps.redirectUrl
    -
    -apepsSAMLRequest.code=204002
    -apepsSAMLRequest.message=invalid.apeps.saml.request
    -
    -apepsSAMLResponse.code=204003
    -apepsSAMLResponse.message=invalid.apeps.saml.response
    -
    -invalid.apepsCallbackUrl.code=204004
    -invalid.apepsCallbackUrl.message=invalid.apeps.callback.url
    -
    -colleagueAttributeRequest.invalidSAML.code=204005
    -colleagueAttributeRequest.invalidSAML.message=invalid.attr.request.saml
    -
    -colleagueAttributeRequest.invalidCountryCode.code=204006
    -colleagueAttributeRequest.invalidCountryCode.message=invalid.attr.country.code
    -
    -
    -#Hash Digests
    -hashDigest.className=org.bouncycastle.crypto.digests.SHA512Digest
    diff --git a/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd b/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
    index f51742e51..3728a7904 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
    @@ -1,4196 +1,3778 @@
     
     
    +           xmlns:aclan="urn:crue:academic:xsd:language:diplomasupplement"
    +           attributeFormDefault="unqualified"
    +           elementFormDefault="qualified"
    +           targetNamespace="urn:crue:academic:xsd:language:diplomasupplement"
    +           version="1.1"
    +           xmlns:xs="http://www.w3.org/2001/XMLSchema">
    +		
    +    
     
    -	
    -
    -	
    -		
    -			Academic year constraint
    -				YYYY-YY. (e.g. 2005-06, 2006-07, ...)
    -		
    -		
    -			
    -		
    -	
    -	
    -		
    -			ISO 3166-1-alpha-2
    -			
    -		
    -		
    -			
    -				
    -					Andorra
    -					
    -				
    -			
    -			
    -				
    -					United Arab Emirates
    -					
    -				
    -			
    -			
    -				
    -					Afghanistan
    -					
    -				
    -			
    -			
    -				
    -					Antigua and Barbuda
    -					
    -				
    -			
    -			
    -				
    -					Albania
    -					
    -				
    -			
    -			
    -				
    -					Armenia
    -					
    -				
    -			
    -			
    -				
    -					Angola
    -					
    -				
    -			
    -			
    -				
    -					Argentina
    -					
    -				
    -			
    -			
    -				
    -					Austria
    -					
    -				
    -			
    -			
    -				
    -					Australia
    -					
    -				
    -			
    -			
    -				
    -					Azerbaijan
    -					
    -				
    -			
    -			
    -				
    -					Bosnia and Herzegovina
    -					
    -				
    -			
    -			
    -				
    -					Barbados
    -					
    -				
    -			
    -			
    -				
    -					Bangladesh
    -					
    -				
    -			
    -			
    -				
    -					Belgium
    -					
    -				
    -			
    -			
    -				
    -					Burkina Faso
    -					
    -				
    -			
    -			
    -				
    -					Bulgaria
    -					
    -				
    -			
    -			
    -				
    -					Bahrain
    -					
    -				
    -			
    -			
    -				
    -					Burundi
    -					
    -				
    -			
    -			
    -				
    -					Benin
    -					
    -				
    -			
    -			
    -				
    -					Brunei Darussalam
    -					
    -				
    -			
    -			
    -				
    -					Bolivia
    -					
    -				
    -			
    -			
    -				
    -					Brazil
    -					
    -				
    -			
    -			
    -				
    -					Bahamas
    -					
    -				
    -			
    -			
    -				
    -					Bhutan
    -					
    -				
    -			
    -			
    -				
    -					Botswana
    -					
    -				
    -			
    -			
    -				
    -					Belarus
    -					
    -				
    -			
    -			
    -				
    -					Belize
    -					
    -				
    -			
    -			
    -				
    -					Canada
    -					
    -				
    -			
    -			
    -				
    -					Congo, Democratic
    -						Republic of the
    -				
    -			
    -			
    -				
    -					Central African
    -						Republic
    -				
    -			
    -			
    -				
    -					Congo, Republic of the
    -					
    -				
    -			
    -			
    -				
    -					Switzerland
    -					
    -				
    -			
    -			
    -				
    -					Cote d/Ivoire
    -					
    -				
    -			
    -			
    -				
    -					Chile
    -					
    -				
    -			
    -			
    -				
    -					Cameroon
    -					
    -				
    -			
    -			
    -				
    -					China
    -					
    -				
    -			
    -			
    -				
    -					Colombia
    -					
    -				
    -			
    -			
    -				
    -					Costa Rica
    -					
    -				
    -			
    -			
    -				
    -					Cuba
    -				
    -			
    -			
    -				
    -					Cape Verde
    -					
    -				
    -			
    -			
    -				
    -					Cyprus
    -					
    -				
    -			
    -			
    -				
    -					Czech Republic
    -					
    -				
    -			
    -			
    -				
    -					Germany
    -					
    -				
    -			
    -			
    -				
    -					Djibouti
    -					
    -				
    -			
    -			
    -				
    -					Denmark
    -					
    -				
    -			
    -			
    -				
    -					Dominica
    -					
    -				
    -			
    -			
    -				
    -					Dominican Republic
    -					
    -				
    -			
    -			
    -				
    -					Algeria
    -					
    -				
    -			
    -			
    -				
    -					Ecuador
    -					
    -				
    -			
    -			
    -				
    -					Estonia
    -					
    -				
    -			
    -			
    -				
    -					Egypt
    -					
    -				
    -			
    -			
    -				
    -					Eritrea
    -					
    -				
    -			
    -			
    -				
    -					Spain
    -					
    -				
    -			
    -			
    -				
    -					Ethiopia
    -					
    -				
    -			
    -			
    -				
    -					Finland
    -					
    -				
    -			
    -			
    -				
    -					Fiji
    -				
    -			
    -			
    -				
    -					Federated States of
    -						Micronesia
    -				
    -			
    -			
    -				
    -					France
    -					
    -				
    -			
    -			
    -				
    -					Gabon
    -					
    -				
    -			
    -			
    -				
    -					United Kingdom
    -					
    -				
    -			
    -			
    -				
    -					Grenada
    -					
    -				
    -			
    -			
    -				
    -					Georgia
    -					
    -				
    -			
    -			
    -				
    -					Ghana
    -					
    -				
    -			
    -			
    -				
    -					Greenland
    -					
    -				
    -			
    -			
    -				
    -					Gambia
    -					
    -				
    -			
    -			
    -				
    -					Guinea
    -					
    -				
    -			
    -			
    -				
    -					Equatorial Guinea
    -					
    -				
    -			
    -			
    -				
    -					Greece
    -					
    -				
    -			
    -			
    -				
    -					Guatemala
    -					
    -				
    -			
    -			
    -				
    -					Guinea-Bissau
    -					
    -				
    -			
    -			
    -				
    -					Guyana
    -					
    -				
    -			
    -			
    -				
    -					Honduras
    -					
    -				
    -			
    -			
    -				
    -					Croatia
    -					
    -				
    -			
    -			
    -				
    -					Haiti
    -					
    -				
    -			
    -			
    -				
    -					Hungary
    -					
    -				
    -			
    -			
    -				
    -					Indonesia
    -					
    -				
    -			
    -			
    -				
    -					Ireland
    -					
    -				
    -			
    -			
    -				
    -					Israel
    -					
    -				
    -			
    -			
    -				
    -					India
    -					
    -				
    -			
    -			
    -				
    -					Iraq
    -				
    -			
    -			
    -				
    -					Iran
    -				
    -			
    -			
    -				
    -					Iceland
    -					
    -				
    -			
    -			
    -				
    -					Italy
    -					
    -				
    -			
    -			
    -				
    -					Jamaica
    -					
    -				
    -			
    -			
    -				
    -					Jordan
    -					
    -				
    -			
    -			
    -				
    -					Japan
    -					
    -				
    -			
    -			
    -				
    -					Kenya
    -					
    -				
    -			
    -			
    -				
    -					Kyrgyzstan
    -					
    -				
    -			
    -			
    -				
    -					Cambodia
    -					
    -				
    -			
    -			
    -				
    -					Kiribati
    -					
    -				
    -			
    -			
    -				
    -					Comoros
    -					
    -				
    -			
    -			
    -				
    -					Saint Kitts and Nevis
    -					
    -				
    -			
    -			
    -				
    -					Korea, Democratic
    -						People/s Republic
    -				
    -			
    -			
    -				
    -					Korea, Republic of
    -					
    -				
    -			
    -			
    -				
    -					Kuwait
    -					
    -				
    -			
    -			
    -				
    -					Kazakstan
    -					
    -				
    -			
    -			
    -				
    -					Lao People/s Democratic
    -						Republic
    -				
    -			
    -			
    -				
    -					Lebanon
    -					
    -				
    -			
    -			
    -				
    -					Saint Lucia
    -					
    -				
    -			
    -			
    -				
    -					Liechtenstein
    -					
    -				
    -			
    -			
    -				
    -					Sri Lanka
    -					
    -				
    -			
    -			
    -				
    -					Liberia
    -					
    -				
    -			
    -			
    -				
    -					Lesotho
    -					
    -				
    -			
    -			
    -				
    -					Lithuania
    -					
    -				
    -			
    -			
    -				
    -					Luxembourg
    -					
    -				
    -			
    -			
    -				
    -					Latvia
    -					
    -				
    -			
    -			
    -				
    -					Libyan Arab Jamahiriya
    -					
    -				
    -			
    -			
    -				
    -					Morocco
    -					
    -				
    -			
    -			
    -				
    -					Monaco
    -					
    -				
    -			
    -			
    -				
    -					Moldova, Republic of
    -					
    -				
    -			
    -			
    -				
    -					Montenegro
    -					
    -				
    -			
    -			
    -				
    -					Madagascar
    -					
    -				
    -			
    -			
    -				
    -					Marshall Islands
    -					
    -				
    -			
    -			
    -				
    -					Macedonia, the former
    -						Yugoslav Republic of
    -				
    -			
    -			
    -				
    -					Mali
    -				
    -			
    -			
    -				
    -					Myanmar
    -					
    -				
    -			
    -			
    -				
    -					Mongolia
    -					
    -				
    -			
    -			
    -				
    -					Mauritania
    -					
    -				
    -			
    -			
    -				
    -					Malta
    -					
    -				
    -			
    -			
    -				
    -					Mauritius
    -					
    -				
    -			
    -			
    -				
    -					Maldives
    -					
    -				
    -			
    -			
    -				
    -					Malawi
    -					
    -				
    -			
    -			
    -				
    -					Mexico
    -					
    -				
    -			
    -			
    -				
    -					Malaysia
    -					
    -				
    -			
    -			
    -				
    -					Mozambique
    -					
    -				
    -			
    -			
    -				
    -					Namibia
    -					
    -				
    -			
    -			
    -				
    -					Niger
    -					
    -				
    -			
    -			
    -				
    -					Nigeria
    -					
    -				
    -			
    -			
    -				
    -					Nicaragua
    -					
    -				
    -			
    -			
    -				
    -					Netherlands
    -					
    -				
    -			
    -			
    -				
    -					Norway
    -					
    -				
    -			
    -			
    -				
    -					Nepal
    -					
    -				
    -			
    -			
    -				
    -					Nauru
    -					
    -				
    -			
    -			
    -				
    -					Niue
    -				
    -			
    -			
    -				
    -					New Zealand
    -					
    -				
    -			
    -			
    -				
    -					Oman
    -				
    -			
    -			
    -				
    -					Panama
    -					
    -				
    -			
    -			
    -				
    -					Peru
    -				
    -			
    -			
    -				
    -					Papua New Guinea
    -					
    -				
    -			
    -			
    -				
    -					Philippines
    -					
    -				
    -			
    -			
    -				
    -					Pakistan
    -					
    -				
    -			
    -			
    -				
    -					Poland
    -					
    -				
    -			
    -			
    -				
    -					Puerto Rico
    -					
    -				
    -			
    -			
    -				
    -					Palestinian Territory,
    -						Occupied
    -				
    -			
    -			
    -				
    -					Portugal
    -					
    -				
    -			
    -			
    -				
    -					Palau
    -					
    -				
    -			
    -			
    -				
    -					Paraguay
    -					
    -				
    -			
    -			
    -				
    -					Qatar
    -					
    -				
    -			
    -			
    -				
    -					Romania
    -					
    -				
    -			
    -			
    -				
    -					Serbia
    -					
    -				
    -			
    -			
    -				
    -					Russian Federation
    -					
    -				
    -			
    -			
    -				
    -					Rwanda
    -					
    -				
    -			
    -			
    -				
    -					Saudi Arabia
    -					
    -				
    -			
    -			
    -				
    -					Solomon Islands
    -					
    -				
    -			
    -			
    -				
    -					Seychelles
    -					
    -				
    -			
    -			
    -				
    -					Sudan
    -					
    -				
    -			
    -			
    -				
    -					Sweden
    -					
    -				
    -			
    -			
    -				
    -					Singapore
    -					
    -				
    -			
    -			
    -				
    -					Slovenia
    -					
    -				
    -			
    -			
    -				
    -					Slovakia
    -					
    -				
    -			
    -			
    -				
    -					Sierra Leone
    -					
    -				
    -			
    -			
    -				
    -					San Marino
    -					
    -				
    -			
    -			
    -				
    -					Senegal
    -					
    -				
    -			
    -			
    -				
    -					Somalia
    -					
    -				
    -			
    -			
    -				
    -					Suriname
    -					
    -				
    -			
    -			
    -				
    -					Sao Tome and Principe
    -					
    -				
    -			
    -			
    -				
    -					El Salvador
    -					
    -				
    -			
    -			
    -				
    -					Syrian Arab Republic
    -					
    -				
    -			
    -			
    -				
    -					Swaziland
    -					
    -				
    -			
    -			
    -				
    -					Chad
    -				
    -			
    -			
    -				
    -					Togo
    -				
    -			
    -			
    -				
    -					Thailand
    -					
    -				
    -			
    -			
    -				
    -					Tajikistan
    -					
    -				
    -			
    -			
    -				
    -					Timor-Leste
    -					
    -				
    -			
    -			
    -				
    -					Turkmenistan
    -					
    -				
    -			
    -			
    -				
    -					Tunisia
    -					
    -				
    -			
    -			
    -				
    -					Tonga
    -					
    -				
    -			
    -			
    -				
    -					Turkey
    -					
    -				
    -			
    -			
    -				
    -					Trindidad and Tobago
    -					
    -				
    -			
    -			
    -				
    -					Tuvalu
    -					
    -				
    -			
    -			
    -				
    -					Tanzania, United
    -						republic of
    -				
    -			
    -			
    -				
    -					Ukraina
    -					
    -				
    -			
    -			
    -				
    -					Uganda
    -					
    -				
    -			
    -			
    -				
    -					United States
    -					
    -				
    -			
    -			
    -				
    -					Uruguay
    -					
    -				
    -			
    -			
    -				
    -					Uzbekistan
    -					
    -				
    -			
    -			
    -				
    -					Holy See (Vatican City
    -						State)
    -				
    -			
    -			
    -				
    -					Saint Vincent and the
    -						Granadines
    -				
    -			
    -			
    -				
    -					Venezuela
    -					
    -				
    -			
    -			
    -				
    -					Viet Nam
    -					
    -				
    -			
    -			
    -				
    -					Vanuatu
    -					
    -				
    -			
    -			
    -				
    -					Samoa
    -					
    -				
    -			
    -			
    -				
    -					Yemen
    -					
    -				
    -			
    -			
    -				
    -					South Africa
    -					
    -				
    -			
    -			
    -				
    -					Zambia
    -					
    -				
    -			
    -			
    -				
    -					Zimbabwe
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Type of course unit
    -			
    -		
    -		
    -			
    -				
    -					Compulsory
    -					
    -				
    -			
    -			
    -				
    -					Optional
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Date format yyyy-mm-dd.
    -				Ex.: 2013-05-04, ...
    -		
    -		
    -	
    -	
    -		
    -			ECTS grading scale
    -			
    -		
    -		
    -			
    -				
    -					Top 10%
    -					
    -				
    -			
    -			
    -				
    -					Next 25%
    -					
    -				
    -			
    -			
    -				
    -					Next 30%
    -					
    -				
    -			
    -			
    -				
    -					Next 25%
    -					
    -				
    -			
    -			
    -				
    -					Lowest 10%
    -					
    -				
    -			
    -			
    -				
    -					Fail
    -				
    -			
    -			
    -				
    -					Fail
    -				
    -			
    -		
    -	
    -	
    -		
    -			E-Mail address constraint
    -			
    -		
    -		
    -	
    -	
    -		
    -			EHEA Framework (Bologna:
    -				Framework of Qualifications/European Qualifications Framework)
    -			
    -		
    -		
    -			
    -				
    -					First Cycle
    -					
    -				
    -			
    -			
    -				
    -					Second Cycle
    -					
    -				
    -			
    -			
    -				
    -					Third Cycle
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Empty text constraint
    -			
    -		
    -		
    -			
    -				Empty text constraint
    -				
    -			
    -			
    -		
    -	
    -	
    -		
    -			Gender
    -		
    -		
    -			
    -				
    -					Female
    -					
    -				
    -			
    -			
    -				
    -					Male
    -				
    -			
    -		
    -	
    -	
    -		
    -			MIME: Type image
    -			
    -		
    -		
    -			
    -				
    -					GIF image
    -					
    -				
    -			
    -			
    -				
    -					JPEG JFIF image
    -					
    -				
    -			
    -			
    -				
    -					JPEG JFIF image
    -					
    -				
    -			
    -			
    -				
    -					Portable Network
    -						Graphics
    -				
    -			
    -			
    -				
    -					Tag Image File Format
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			International Standard
    -				Classification of Education (ISCED) 1997
    -		
    -		
    -			
    -				
    -					Level 0: Pre-primary
    -						education
    -				
    -			
    -			
    -				
    -					Level 1: Primary
    -						education or first stage of basic education
    -				
    -			
    -			
    -				
    -					Level 2: Lower
    -						secondary education or second stage of basic education
    -					
    -				
    -			
    -			
    -				
    -					Level 3: Upper
    -						secondary education
    -				
    -			
    -			
    -				
    -					Level 4: Post-secondary
    -						non-tertiary education
    -				
    -			
    -			
    -				
    -					Level 5A: First stage
    -						of tertiary education: largely theoretically based programmes
    -						intended to provide qualifications for gaining entry into more
    -						advanced research programmes and professions with higher skills
    -						requirements
    -				
    -			
    -			
    -				
    -					Level 5B: First stage
    -						of tertiary education: shorter, more
    -						practical/technical/occupationally specific prgrammes leading to
    -						professional qualifications
    -				
    -			
    -			
    -				
    -					Level 6: Second stage
    -						of tertiary education (leading to an advanced research
    -						qualification)
    -				
    -			
    -		
    -	
    -	
    -		
    -			International Standard
    -				Classification of Education (ISCED) 2011
    -		
    -		
    -			
    -				
    -					Level 0: Early
    -						childhood Education
    -				
    -			
    -			
    -				
    -					Level 1: Primary
    -						education
    -				
    -			
    -			
    -				
    -					Level 2: Lower
    -						secondary education
    -				
    -			
    -			
    -				
    -					Level 3: Upper
    -						secondary education
    -				
    -			
    -			
    -				
    -					Level 4: Post-secondary
    -						non-tertiary education
    -				
    -			
    -			
    -				
    -					Level 5: Short-cycle
    -						teriary education
    -				
    -			
    -			
    -				
    -					Level 6: Bachelor or
    -						equivalent
    -				
    -			
    -			
    -				
    -					Level 7: Master or
    -						equivalent
    -				
    -			
    -			
    -				
    -					Level 8: Doctoral or
    -						equivalent
    -				
    -			
    -		
    -	
    -	
    -		
    -			ISO 639-1 languages
    -			
    -		
    -		
    -			
    -				
    -					Abkhazian
    -					
    -				
    -			
    -			
    -				
    -					Afrikaans
    -					
    -				
    -			
    -			
    -				
    -					Aragonese
    -					
    -				
    -			
    -			
    -				
    -					Arabic
    -					
    -				
    -			
    -			
    -				
    -					Assamese
    -					
    -				
    -			
    -			
    -				
    -					Azerbaijani
    -					
    -				
    -			
    -			
    -				
    -					Belarusian
    -					
    -				
    -			
    -			
    -				
    -					Bulgarian
    -					
    -				
    -			
    -			
    -				
    -					Bengali
    -					
    -				
    -			
    -			
    -				
    -					Tibetan
    -					
    -				
    -			
    -			
    -				
    -					Breton
    -					
    -				
    -			
    -			
    -				
    -					Bosnian
    -					
    -				
    -			
    -			
    -				
    -					Catalan / Valencian
    -					
    -				
    -			
    -			
    -				
    -					Chechen
    -					
    -				
    -			
    -			
    -				
    -					Corsican
    -					
    -				
    -			
    -			
    -				
    -					Czech
    -					
    -				
    -			
    -			
    -				
    -					Welsh
    -					
    -				
    -			
    -			
    -				
    -					Danish
    -					
    -				
    -			
    -			
    -				
    -					German
    -					
    -				
    -			
    -			
    -				
    -					Greek
    -					
    -				
    -			
    -			
    -				
    -					English
    -					
    -				
    -			
    -			
    -				
    -					Spanish / Castilian
    -					
    -				
    -			
    -			
    -				
    -					Estonian
    -					
    -				
    -			
    -			
    -				
    -					Basque
    -					
    -				
    -			
    -			
    -				
    -					Persian
    -					
    -				
    -			
    -			
    -				
    -					Finnish
    -					
    -				
    -			
    -			
    -				
    -					Fijian
    -					
    -				
    -			
    -			
    -				
    -					Faroese
    -					
    -				
    -			
    -			
    -				
    -					French
    -					
    -				
    -			
    -			
    -				
    -					Western Frisian
    -					
    -				
    -			
    -			
    -				
    -					Irish
    -					
    -				
    -			
    -			
    -				
    -					Gaelic / Scottish
    -						Gaelic
    -				
    -			
    -			
    -				
    -					Galician
    -					
    -				
    -			
    -			
    -				
    -					Manx
    -				
    -			
    -			
    -				
    -					Ancient Greek
    -					
    -				
    -			
    -			
    -				
    -					Alemanic; Swiss German
    -					
    -				
    -			
    -			
    -				
    -					Hebrew
    -					
    -				
    -			
    -			
    -				
    -					Hindi
    -					
    -				
    -			
    -			
    -				
    -					Croatian
    -					
    -				
    -			
    -			
    -				
    -					Haitian; Haitian Creole
    -					
    -				
    -			
    -			
    -				
    -					Hungarian
    -					
    -				
    -			
    -			
    -				
    -					Armenian
    -					
    -				
    -			
    -			
    -				
    -					Indonesian
    -					
    -				
    -			
    -			
    -				
    -					Icelandic
    -					
    -				
    -			
    -			
    -				
    -					Italian
    -					
    -				
    -			
    -			
    -				
    -					Japanese
    -					
    -				
    -			
    -			
    -				
    -					Javanese
    -					
    -				
    -			
    -			
    -				
    -					Georgian
    -					
    -				
    -			
    -			
    -				
    -					Kongo
    -					
    -				
    -			
    -			
    -				
    -					Korean
    -					
    -				
    -			
    -			
    -				
    -					Kurdish
    -					
    -				
    -			
    -			
    -				
    -					Cornish
    -					
    -				
    -			
    -			
    -				
    -					Kirghiz
    -					
    -				
    -			
    -			
    -				
    -					Luxembourgish;
    -						Letzeburgesch
    -				
    -			
    -			
    -				
    -					Limburgan; Limburger;
    -						Limburgish
    -				
    -			
    -			
    -				
    -					Lingala
    -					
    -				
    -			
    -			
    -				
    -					Lithuanian
    -					
    -				
    -			
    -			
    -				
    -					Latvian
    -					
    -				
    -			
    -			
    -				
    -					Malagasy
    -					
    -				
    -			
    -			
    -				
    -					Macedonian
    -					
    -				
    -			
    -			
    -				
    -					Mongolian
    -					
    -				
    -			
    -			
    -				
    -					Moldavian
    -					
    -				
    -			
    -			
    -				
    -					Malay
    -					
    -				
    -			
    -			
    -				
    -					Maltese
    -					
    -				
    -			
    -			
    -				
    -					Burmese
    -					
    -				
    -			
    -			
    -				
    -					Norwegian (Bokmål)
    -					
    -				
    -			
    -			
    -				
    -					Nepali
    -					
    -				
    -			
    -			
    -				
    -					Dutch
    -					
    -				
    -			
    -			
    -				
    -					Norwegian (Nynorsk)
    -					
    -				
    -			
    -			
    -				
    -					Norwegian
    -					
    -				
    -			
    -			
    -				
    -					Polish
    -					
    -				
    -			
    -			
    -				
    -					Portuguese
    -					
    -				
    -			
    -			
    -				
    -					Raeto-Romance
    -					
    -				
    -			
    -			
    -				
    -					Romanian
    -					
    -				
    -			
    -			
    -				
    -					Russian
    -					
    -				
    -			
    -			
    -				
    -					Sardinian
    -					
    -				
    -			
    -			
    -				
    -					Northern Sami
    -					
    -				
    -			
    -			
    -				
    -					Slovak
    -					
    -				
    -			
    -			
    -				
    -					Slovenian
    -					
    -				
    -			
    -			
    -				
    -					Somali
    -					
    -				
    -			
    -			
    -				
    -					Albanian
    -					
    -				
    -			
    -			
    -				
    -					Serbian
    -					
    -				
    -			
    -			
    -				
    -					Swedish
    -					
    -				
    -			
    -			
    -				
    -					Swahili
    -					
    -				
    -			
    -			
    -				
    -					Turkmen
    -					
    -				
    -			
    -			
    -				
    -					Turkish
    -					
    -				
    -			
    -			
    -				
    -					Tahitian
    -					
    -				
    -			
    -			
    -				
    -					Ukrainian
    -					
    -				
    -			
    -			
    -				
    -					Urdu
    -				
    -			
    -			
    -				
    -					Uzbek
    -					
    -				
    -			
    -			
    -				
    -					Vietnamese
    -					
    -				
    -			
    -			
    -				
    -					Yiddish
    -					
    -				
    -			
    -			
    -				
    -					Chinese
    -					
    -				
    -			
    -			
    -				
    -					Church Slavic
    -					
    -				
    -			
    -			
    -				
    -					Esperanto
    -					
    -				
    -			
    -			
    -				
    -					Latin
    -					
    -				
    -			
    -			
    -				
    -					Occitan (post 1500);
    -						Provençal
    -				
    -			
    -			
    -				
    -					VVolapük
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			MIME types
    -			
    -		
    -		
    -			
    -				
    -					GIF image
    -					
    -				
    -			
    -			
    -				
    -					JPEG JFIF image
    -					
    -				
    -			
    -			
    -				
    -					JPEG JFIF image
    -					
    -				
    -			
    -			
    -				
    -					Portable Network
    -						Graphics
    -				
    -			
    -			
    -				
    -					Tag Image File Format
    -					
    -				
    -			
    -			
    -				
    -					HTML
    -				
    -			
    -			
    -				
    -					Portable Document
    -						Format
    -				
    -			
    -		
    -	
    -	
    -		
    -			Mode of study
    -			
    -		
    -		
    -			
    -				
    -					Full time
    -					
    -				
    -			
    -			
    -				
    -					Par time
    -					
    -				
    -			
    -			
    -				
    -					Distance
    -					
    -				
    -			
    -			
    -				
    -					eLearning
    -					
    -				
    -			
    -			
    -				
    -					Another
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Model of delivery
    -			
    -		
    -		
    -			
    -				
    -					Face-to-face
    -					
    -				
    -			
    -			
    -				
    -					Distance learning
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			National Framework of
    -				Qualifications (NFQ) Level 
    -		
    -		
    -	
    -	
    -		
    -			Plain text constraint
    -			
    -		
    -		
    -			
    -				Non empty text
    -				
    -			
    -			
    -		
    -	
    -	
    -		
    -			Percent constraint
    -			
    -		
    -		
    -			
    -				Restriction between 0
    -					and 100
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			Positive decimal number
    -			
    -		
    -		
    -			
    -				Positive decimal numbers
    -					restriction
    -			
    -			
    -		
    -	
    -	
    -		
    -			Positive integer number
    -			
    -		
    -		
    -			
    -				Positive integer numbers
    -					restriction
    -			
    -			
    -		
    -	
    -	
    -		
    -			Source of the course unit
    -				performance
    -		
    -		
    -			
    -				
    -					Recognized
    -					
    -				
    -			
    -			
    -				
    -					Course unit attended in
    -						mobility programme
    -				
    -			
    -			
    -				
    -					Another
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Uniform Resource Locator
    -				(URL)
    -		
    -		
    -			
    -				http and https
    -					restriction
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			Additional information
    -			
    -		
    -		
    -			
    -				
    -					Specific information
    -					
    -				
    -			
    -			
    -				
    -					Other sources
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Address
    -			
    -		
    -		
    -			
    -				
    -					Name, street, PO box,
    -						...
    -				
    -			
    -			
    -				
    -					City
    -				
    -			
    -			
    -				
    -					State or region
    -					
    -				
    -			
    -			
    -				
    -					Postal code
    -					
    -				
    -			
    -			
    -				
    -					Country
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Country code ISO
    -										3166-1-alpha-2
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Data file
    -			
    -		
    -		
    -			
    -				
    -					Description
    -					
    -				
    -			
    -			
    -				
    -					MIME type code
    -					
    -				
    -			
    -			
    -				
    -					Base64 binary data
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			URL reference to the file
    -			
    -		
    -		
    -			
    -				
    -					Description
    -					
    -				
    -			
    -			
    -				
    -					MIME type code
    -					
    -				
    -			
    -			
    -				
    -					URL
    -				
    -			
    -		
    -	
    -	
    -		
    -			Image data file
    -			
    -		
    -		
    -			
    -				
    -					Description
    -					
    -				
    -			
    -			
    -				
    -					MIME type image code
    -					
    -				
    -			
    -			
    -				
    -					Base64 binary data
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			URL reference to the
    -				image file
    -		
    -		
    -			
    -				
    -					Description
    -					
    -				
    -			
    -			
    -				
    -					MIME type image code
    -					
    -				
    -			
    -			
    -				
    -					URL
    -				
    -			
    -		
    -	
    -	
    -		
    -			Attachment resource
    -			
    -		
    -		
    -			
    -				
    -					Data file
    -					
    -				
    -			
    -			
    -				
    -					URL reference to the
    -						file
    -				
    -			
    -			
    -				
    -					Image data file
    -					
    -				
    -			
    -			
    -				
    -					URL reference to the
    -						image file
    -				
    -			
    -		
    -		
    -			
    -				Attached identifier
    -				
    -			
    -		
    -	
    -	
    -		
    -			Attachments resources
    -			
    -		
    -		
    -			
    -				
    -					Attachment resource
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Certification of the
    -				Supplement
    -		
    -		
    -			
    -				
    -					Date was issued
    -					
    -				
    -			
    -			
    -				
    -					Officials certifying
    -					
    -				
    -			
    -			
    -				
    -					Official stamp or seal
    -						of the institution
    -				
    -			
    -		
    -	
    -	
    -		
    -			Contact information
    -			
    -		
    -		
    -			
    -				
    -					Address
    -					
    -				
    -			
    -			
    -				
    -					Phone number
    -					
    -				
    -			
    -			
    -				
    -					E-Mail address
    -					
    -				
    -			
    -			
    -				
    -					Web site
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			
    -				
    -					Mobility programme
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Course structure diagram
    -			
    -		
    -		
    -			
    -				
    -					Courses groups
    -					
    -				
    -			
    -			
    -				
    -					Course units
    -					
    -				
    -				
    -					
    -						Unique: Course unit
    -							code
    -					
    -					
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Course units
    -			
    -		
    -		
    -			
    -				
    -					Course unit
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Language of instruction
    -			
    -		
    -		
    -			
    -				
    -					Language of instruction
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Student performance
    -			
    -		
    -		
    -			
    -				
    -					Local grade
    -					
    -				
    -			
    -			
    -				
    -					ECTS grade
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Course unit
    -			
    -		
    -		
    -			
    -				
    -					Course unit code
    -					
    -				
    -			
    -			
    -			
    -				
    -					Course unit title
    -					
    -				
    -			
    -			
    -				
    -					Theme (example:
    -						Academic project)
    -				
    -			
    -			
    -				
    -					Type of course unit
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Type of course unit
    -										code
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Year of study
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Year of study
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Level of course unit
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									EHEA Framework code
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Number of ECTS credits
    -					
    -				
    -			
    -			
    -				
    -					Number of local credits
    -					
    -				
    -			
    -			
    -				
    -					Number of hours
    -					
    -				
    -			
    -			
    -				
    -					Languages of
    -						instruction
    -				
    -				
    -					
    -						Unique: Language
    -						
    -					
    -					
    -					
    -				
    -			
    -			
    -				
    -					Mode of delivery
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Mode of delivery
    -										oode
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Work placements
    -					
    -				
    -			
    -			
    -				
    -					Student performance
    -					
    -				
    -			
    -			
    -				
    -					Name of lecturer(s)
    -					
    -				
    -			
    -			
    -				
    -					Learning outcomes of
    -						the course unit
    -				
    -			
    -			
    -				
    -					Prerequisites and
    -						co-requisites
    -				
    -			
    -			
    -				
    -					Recomended optional
    -						programme components
    -				
    -			
    -			
    -				
    -					Course contents
    -					
    -				
    -			
    -			
    -				
    -					Recomended or required
    -						reading
    -				
    -			
    -			
    -				
    -					Planed learning
    -						activities and teaching method
    -				
    -			
    -			
    -				
    -					Assesment methods and
    -						criteria
    -				
    -			
    -			
    -				
    -					Observations
    -					
    -				
    -			
    -		
    -		
    -			
    -				Group identifier
    -				
    -			
    -		
    -		
    -			
    -				Institution
    -					administering studies identifier 
    -			
    -		
    -		
    -			
    -				Is required by the
    -					programme?
    -			
    -		
    -	
    -	
    -		
    -			Course unit work
    -				placements
    -		
    -		
    -			
    -				
    -					Work placement
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Course unit work
    -				placement
    -		
    -		
    -			
    -				
    -					Name of collaborating
    -						institution
    -				
    -			
    -			
    -				
    -					Date from
    -					
    -				
    -			
    -			
    -				
    -					Date to
    -					
    -				
    -			
    -			
    -				
    -					Training Hours
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Language of instruction
    -			
    -		
    -		
    -			
    -				
    -					
    -						Language code ISO
    -							639-1 of the Supplement
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Diploma Supplement
    -			
    -		
    -		
    -			
    -				
    -					Information identifying
    -						the holder of the qualification
    -				
    -			
    -			
    -				
    -					Information identifying
    -						the qualification
    -				
    -			
    -			
    -				
    -					Information on the
    -						level of the qualification
    -				
    -			
    -			
    -				
    -					Information on the
    -						contents and results gained
    -				
    -			
    -			
    -				
    -					Information on the
    -						function of the qualification
    -				
    -			
    -			
    -				
    -					Additional
    -						informationType
    -				
    -			
    -			
    -				
    -					Certification of the
    -						Supplement
    -				
    -			
    -			
    -				
    -					Information on the
    -						national higher education system
    -				
    -			
    -			
    -				
    -					Attachments resources
    -					
    -				
    -			
    -			
    -				
    -					Extension content
    -					
    -				
    -			
    -			
    -				
    -					Digital signature
    -					
    -				
    -			
    -		
    -		
    -			
    -				Language code ISO 639-1
    -					of the Supplement
    -			
    -		
    -		
    -			
    -				Indicate if language is
    -					the original language
    -			
    -		
    -	
    -	
    -		
    -			Extension content
    -			
    -		
    -		
    -			
    -		
    -		
    -	
    -	
    -		
    -			Family name(s)
    -			
    -		
    -		
    -			
    -				
    -					Surname
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Given name(s)
    -			
    -		
    -		
    -			
    -				
    -					Name
    -				
    -			
    -		
    -	
    -	
    -		
    -			Grading scheme and grade
    -				distribution guidance
    -		
    -		
    -			
    -				
    -					Grading scheme
    -					
    -				
    -			
    -			
    -				
    -					Grade distribution
    -						guidance
    -				
    -			
    -		
    -	
    -	
    -		
    -			Courses groups
    -			
    -		
    -		
    -			
    -				
    -					Groups set name
    -					
    -				
    -			
    -			
    -				
    -					Header information
    -					
    -				
    -			
    -			
    -				
    -					Courses group
    -					
    -				
    -			
    -			
    -				
    -					Footer information
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Courses group
    -			
    -		
    -		
    -			
    -				
    -					Name of the group
    -					
    -				
    -			
    -			
    -				
    -					Header information
    -					
    -				
    -			
    -			
    -				
    -					Courses group
    -					
    -				
    -			
    -			
    -				
    -					Footer information
    -					
    -				
    -			
    -		
    -		
    -			
    -				Group identifier
    -				
    -			
    -		
    -	
    -	
    -		
    -			Information identifying
    -				the holder of the qualification
    -		
    -		
    -			
    -				
    -					Family name(s)
    -					
    -				
    -			
    -			
    -				
    -					Given name(s)
    -					
    -				
    -			
    -			
    -				
    -					Date of birth
    -					
    -				
    -			
    -			
    -				
    -					Student identification
    -						number or code
    -				
    -			
    -			
    -				
    -					Country of birth
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Country code ISO
    -										3166-1-alpha-2
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Place of birth
    -					
    -				
    -			
    -			
    -				
    -					Gender
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Gender code
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Information identifying
    -				the qualification
    -		
    -		
    -			
    -				
    -					Qualification
    -					
    -				
    -			
    -			
    -				
    -					Title conferred
    -					
    -				
    -			
    -			
    -				
    -					Main fields of study
    -					
    -				
    -			
    -			
    -				
    -					Name and status of
    -						awarding institution
    -				
    -			
    -			
    -				
    -					Name and status of
    -						institution administering studies
    -				
    -			
    -			
    -				
    -					Language of instruction
    -						and examination
    -				
    -				
    -					
    -						Unique: Language of
    -							instruction and examinatio
    -					
    -					
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Information on the
    -				contents and results gained
    -		
    -		
    -			
    -				
    -					Mode of study
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Mode of study
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Programme requirements
    -					
    -				
    -			
    -			
    -				
    -					Programme details
    -					
    -				
    -			
    -			
    -				
    -					Grading scheme and
    -						grade distribution guidance
    -				
    -			
    -			
    -				
    -					Overall classification
    -						of the qualification
    -				
    -			
    -		
    -	
    -	
    -		
    -			Information on the
    -				function of the qualification type
    -		
    -		
    -			
    -				
    -					Access to further study
    -					
    -				
    -			
    -			
    -				
    -					Professional status
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Is regulated
    -										profession
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Information on the level
    -				of the qualification
    -		
    -		
    -			
    -				
    -					Level ff the
    -						qualification
    -				
    -				
    -					
    -						
    -							
    -								
    -									ISCED 1997 code
    -									
    -								
    -							
    -							
    -								
    -									ISCED 2011 code
    -									
    -								
    -							
    -							
    -								
    -									EHEA Framework code
    -									
    -								
    -							
    -							
    -								
    -									NFQ code
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Official length of
    -						programme
    -				
    -				
    -					
    -						
    -							
    -								
    -									Number of ECTS
    -										credits
    -								
    -							
    -							
    -								
    -									Number of years
    -									
    -								
    -							
    -							
    -								
    -									Number of semesters
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Access requirements
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Name and status of the
    -				institution
    -		
    -		
    -			
    -				
    -					Name of the institution
    -					
    -				
    -			
    -			
    -				
    -					Status of the
    -						institution
    -				
    -			
    -			
    -				
    -					Country of the
    -						institution
    -				
    -				
    -					
    -						
    -							
    -								
    -									Country code ISO
    -										3166-1-alpha-2
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Additional Information
    -						about the institution
    -				
    -			
    -			
    -				
    -					Contact information
    -					
    -				
    -			
    -			
    -				
    -					Logo of the institution
    -						reference
    -				
    -				
    -					
    -						
    -							
    -								
    -									Attached identifier
    -										reference
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -		
    -			
    -				National identification
    -					code or number of the institution
    -			
    -		
    -		
    -			
    -				ERASMUS code of the
    -					institution
    -			
    -		
    -	
    -	
    -		
    -			Language of instruction
    -				and examination
    -		
    -		
    -			
    -				
    -					Language of instruction
    -						and examination
    -				
    -				
    -					
    -						
    -							
    -								
    -									Language code ISO
    -										639-1
    -								
    -							
    -							
    -								
    -									Percent
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Local grade
    -			
    -		
    -		
    -			
    -				
    -					Academic year
    -					
    -				
    -			
    -			
    -				
    -					Date issued
    -					
    -				
    -			
    -			
    -				
    -					Grade
    -					
    -				
    -			
    -			
    -				
    -					Source grade
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Source grade code
    -									
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Mobility programme
    -				courses units
    -		
    -		
    -			
    -				
    -					Course unit
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Mobility programme course
    -				unit
    -		
    -		
    -			
    -				
    -					Course unit code
    -					
    -				
    -			
    -			
    -				
    -					Course unit title
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Language code ISO
    -										639-1
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Number of ECTS credits
    -					
    -				
    -			
    -			
    -				
    -					Additional information
    -					
    -				
    -			
    -		
    -		
    -			
    -				Is in the learning
    -					agreement?
    -			
    -		
    -	
    -	
    -		
    -			Mobility programme
    -			
    -		
    -		
    -			
    -				
    -					Mobility programme type
    -						(e.g. ERASMUS, ISEP, ...)
    -				
    -			
    -			
    -				
    -					Field of study
    -					
    -				
    -			
    -			
    -				
    -					Country
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Country code ISO
    -										3166-1-alpha-2
    -								
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					Receiving institution
    -					
    -				
    -			
    -			
    -				
    -					Academic year
    -					
    -				
    -			
    -			
    -				
    -					Study period (Date
    -						from)
    -				
    -			
    -			
    -				
    -					Study period (Date to)
    -					
    -				
    -			
    -			
    -				
    -					Course units
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Multilingual Diploma
    -				Supplement (DS)
    -		
    -		
    -			
    -				
    -					Diploma Supplement
    -					
    -				
    -			
    -			
    -				
    -					Digital signature
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Name and status of
    -				awarding institution
    -		
    -		
    -			
    -				
    -					Awarding institution
    -					
    -				
    -				
    -					
    -						
    -							
    -								
    -									Awarding
    -										institution identifier
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Name and status of
    -				institution administering studies
    -		
    -		
    -			
    -				
    -					Institution
    -						administering studies
    -				
    -				
    -					
    -						
    -							
    -								
    -									Institution
    -										administering studies identifier
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Official certifying the
    -				DS
    -		
    -		
    -			
    -				
    -					Family name(s)
    -					
    -				
    -			
    -			
    -				
    -					Given name(s)
    -					
    -				
    -			
    -			
    -				
    -					Official capacity
    -					
    -				
    -			
    -		
    -		
    -			
    -				Identifier of awarding
    -					institution
    -			
    -		
    -	
    -	
    -		
    -			Officials certifying
    -			
    -		
    -		
    -			
    -				
    -					Official certifying
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Official stamp or seal of
    -				the institution
    -		
    -		
    -			
    -				
    -					Stamp description
    -					
    -				
    -			
    -		
    -		
    -			
    -				Identifier of awarding
    -					institution
    -			
    -		
    -	
    -	
    -		
    -			Programme details
    -			
    -		
    -		
    -			
    -				
    -					Course structure
    -						diagram
    -				
    -			
    -			
    -				
    -					Courses attended in
    -						other institution in mobility programs
    -				
    -			
    -		
    -	
    -	
    -		
    -			Programme requirements
    -			
    -		
    -		
    -			
    -				
    -					Programme requirements
    -					
    -				
    -			
    -			
    -				
    -					Key learning outcomes
    -						of the programme
    -				
    -			
    -		
    -	
    -	
    -		
    -			Qualification
    -			
    -		
    -		
    -			
    -				
    -					Name of the
    -						qualification
    -				
    -			
    -			
    -				
    -					Additional information
    -						about the qualification
    -				
    -			
    -		
    -		
    -			
    -				Local identification
    -					code or number of the qualification
    -			
    -		
    -		
    -			
    -				National identification
    -					code or number of the qualification
    -			
    -		
    -	
    -	
    -		
    -			Rich text tag
    -			
    -		
    -		
    -			
    -				
    -					Specifies bold text
    -					
    -				
    -			
    -			
    -				
    -					Specifies break line
    -					
    -				
    -			
    -			
    -				
    -					Specifies italic text
    -					
    -				
    -			
    -			
    -				
    -					Specifies underline
    -						text
    -				
    -			
    -			
    -				
    -					Specifies reference to
    -						the attached resource 
    -				
    -				
    -					
    -						
    -							
    -								
    -									Attached identifier
    -										reference
    -								
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -	
    -		
    -			Title conferred
    -			
    -		
    -		
    -			
    -				
    -					Name of the title
    -						conferred
    -				
    -			
    -		
    -	
    -	
    -		
    -			Diploma Supplement
    -			
    -		
    -		
    -		
    -			
    -				Primary Key: Group
    -					identifier
    -			
    -			
    -			
    -		
    -		
    -			
    -				Primary Key: Awarding
    -					institution identifier
    -			
    -			
    -			
    -		
    -		
    -			
    -				Primary Key: Intitution
    -					administering studies identifier
    -			
    -			
    -			
    -		
    -		
    -		
    -			
    -				Foreign Key: Group
    -					identifier
    -			
    -			
    -			
    -		
    -		
    -			
    -				Foreign Key: Awarding
    -					institution (Official Stamp) identifier
    -			
    -			
    -			
    -		
    -		
    -			
    -				Foreign Key: Awarding
    -					institution (Official Stamp) identifier
    -			
    -			
    -			
    -		
    -		
    -			
    -				Foreign Key: Institution
    -					administering studies identifier
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			Multilingual Diploma
    -				Supplement
    -		
    -		
    -		
    -			
    -				Unique: Diploma
    -					Supplement language
    -			
    -			
    -			
    -		
    -	
    +    
    +        
    +            Academic year constraint YYYY-YY. (e.g. 2005-06, 2006-07, ...)
    +        
    +        
    +            
    +        
    +    
    +    
    +        
    +            ISO 3166-1-alpha-2
    +        
    +        
    +            
    +                
    +                    Andorra
    +                
    +            
    +            
    +                
    +                    United Arab Emirates
    +                
    +            
    +            
    +                
    +                    Afghanistan
    +                
    +            
    +            
    +                
    +                    Antigua and Barbuda
    +                
    +            
    +            
    +                
    +                    Albania
    +                
    +            
    +            
    +                
    +                    Armenia
    +                
    +            
    +            
    +                
    +                    Angola
    +                
    +            
    +            
    +                
    +                    Argentina
    +                
    +            
    +            
    +                
    +                    Austria
    +                
    +            
    +            
    +                
    +                    Australia
    +                
    +            
    +            
    +                
    +                    Azerbaijan
    +                
    +            
    +            
    +                
    +                    Bosnia and Herzegovina
    +                
    +            
    +            
    +                
    +                    Barbados
    +                
    +            
    +            
    +                
    +                    Bangladesh
    +                
    +            
    +            
    +                
    +                    Belgium
    +                
    +            
    +            
    +                
    +                    Burkina Faso
    +                
    +            
    +            
    +                
    +                    Bulgaria
    +                
    +            
    +            
    +                
    +                    Bahrain
    +                
    +            
    +            
    +                
    +                    Burundi
    +                
    +            
    +            
    +                
    +                    Benin
    +                
    +            
    +            
    +                
    +                    Brunei Darussalam
    +                
    +            
    +            
    +                
    +                    Bolivia
    +                
    +            
    +            
    +                
    +                    Brazil
    +                
    +            
    +            
    +                
    +                    Bahamas
    +                
    +            
    +            
    +                
    +                    Bhutan
    +                
    +            
    +            
    +                
    +                    Botswana
    +                
    +            
    +            
    +                
    +                    Belarus
    +                
    +            
    +            
    +                
    +                    Belize
    +                
    +            
    +            
    +                
    +                    Canada
    +                
    +            
    +            
    +                
    +                    Congo, Democratic Republic of the
    +                
    +            
    +            
    +                
    +                    Central African Republic
    +                
    +            
    +            
    +                
    +                    Congo, Republic of the
    +                
    +            
    +            
    +                
    +                    Switzerland
    +                
    +            
    +            
    +                
    +                    Cote d/Ivoire
    +                
    +            
    +            
    +                
    +                    Chile
    +                
    +            
    +            
    +                
    +                    Cameroon
    +                
    +            
    +            
    +                
    +                    China
    +                
    +            
    +            
    +                
    +                    Colombia
    +                
    +            
    +            
    +                
    +                    Costa Rica
    +                
    +            
    +            
    +                
    +                    Cuba
    +                
    +            
    +            
    +                
    +                    Cape Verde
    +                
    +            
    +            
    +                
    +                    Cyprus
    +                
    +            
    +            
    +                
    +                    Czech Republic
    +                
    +            
    +            
    +                
    +                    Germany
    +                
    +            
    +            
    +                
    +                    Djibouti
    +                
    +            
    +            
    +                
    +                    Denmark
    +                
    +            
    +            
    +                
    +                    Dominica
    +                
    +            
    +            
    +                
    +                    Dominican Republic
    +                
    +            
    +            
    +                
    +                    Algeria
    +                
    +            
    +            
    +                
    +                    Ecuador
    +                
    +            
    +            
    +                
    +                    Estonia
    +                
    +            
    +            
    +                
    +                    Egypt
    +                
    +            
    +            
    +                
    +                    Eritrea
    +                
    +            
    +            
    +                
    +                    Spain
    +                
    +            
    +            
    +                
    +                    Ethiopia
    +                
    +            
    +            
    +                
    +                    Finland
    +                
    +            
    +            
    +                
    +                    Fiji
    +                
    +            
    +            
    +                
    +                    Federated States of Micronesia
    +                
    +            
    +            
    +                
    +                    France
    +                
    +            
    +            
    +                
    +                    Gabon
    +                
    +            
    +            
    +                
    +                    United Kingdom
    +                
    +            
    +            
    +                
    +                    Grenada
    +                
    +            
    +            
    +                
    +                    Georgia
    +                
    +            
    +            
    +                
    +                    Ghana
    +                
    +            
    +            
    +                
    +                    Greenland
    +                
    +            
    +            
    +                
    +                    Gambia
    +                
    +            
    +            
    +                
    +                    Guinea
    +                
    +            
    +            
    +                
    +                    Equatorial Guinea
    +                
    +            
    +            
    +                
    +                    Greece
    +                
    +            
    +            
    +                
    +                    Guatemala
    +                
    +            
    +            
    +                
    +                    Guinea-Bissau
    +                
    +            
    +            
    +                
    +                    Guyana
    +                
    +            
    +            
    +                
    +                    Honduras
    +                
    +            
    +            
    +                
    +                    Croatia
    +                
    +            
    +            
    +                
    +                    Haiti
    +                
    +            
    +            
    +                
    +                    Hungary
    +                
    +            
    +            
    +                
    +                    Indonesia
    +                
    +            
    +            
    +                
    +                    Ireland
    +                
    +            
    +            
    +                
    +                    Israel
    +                
    +            
    +            
    +                
    +                    India
    +                
    +            
    +            
    +                
    +                    Iraq
    +                
    +            
    +            
    +                
    +                    Iran
    +                
    +            
    +            
    +                
    +                    Iceland
    +                
    +            
    +            
    +                
    +                    Italy
    +                
    +            
    +            
    +                
    +                    Jamaica
    +                
    +            
    +            
    +                
    +                    Jordan
    +                
    +            
    +            
    +                
    +                    Japan
    +                
    +            
    +            
    +                
    +                    Kenya
    +                
    +            
    +            
    +                
    +                    Kyrgyzstan
    +                
    +            
    +            
    +                
    +                    Cambodia
    +                
    +            
    +            
    +                
    +                    Kiribati
    +                
    +            
    +            
    +                
    +                    Comoros
    +                
    +            
    +            
    +                
    +                    Saint Kitts and Nevis
    +                
    +            
    +            
    +                
    +                    Korea, Democratic People/s Republic
    +                
    +            
    +            
    +                
    +                    Korea, Republic of
    +                
    +            
    +            
    +                
    +                    Kuwait
    +                
    +            
    +            
    +                
    +                    Kazakstan
    +                
    +            
    +            
    +                
    +                    Lao People/s Democratic Republic
    +                
    +            
    +            
    +                
    +                    Lebanon
    +                
    +            
    +            
    +                
    +                    Saint Lucia
    +                
    +            
    +            
    +                
    +                    Liechtenstein
    +                
    +            
    +            
    +                
    +                    Sri Lanka
    +                
    +            
    +            
    +                
    +                    Liberia
    +                
    +            
    +            
    +                
    +                    Lesotho
    +                
    +            
    +            
    +                
    +                    Lithuania
    +                
    +            
    +            
    +                
    +                    Luxembourg
    +                
    +            
    +            
    +                
    +                    Latvia
    +                
    +            
    +            
    +                
    +                    Libyan Arab Jamahiriya
    +                
    +            
    +            
    +                
    +                    Morocco
    +                
    +            
    +            
    +                
    +                    Monaco
    +                
    +            
    +            
    +                
    +                    Moldova, Republic of
    +                
    +            
    +            
    +                
    +                    Montenegro
    +                
    +            
    +            
    +                
    +                    Madagascar
    +                
    +            
    +            
    +                
    +                    Marshall Islands
    +                
    +            
    +            
    +                
    +                    Macedonia, the former Yugoslav Republic of
    +                
    +            
    +            
    +                
    +                    Mali
    +                
    +            
    +            
    +                
    +                    Myanmar
    +                
    +            
    +            
    +                
    +                    Mongolia
    +                
    +            
    +            
    +                
    +                    Mauritania
    +                
    +            
    +            
    +                
    +                    Malta
    +                
    +            
    +            
    +                
    +                    Mauritius
    +                
    +            
    +            
    +                
    +                    Maldives
    +                
    +            
    +            
    +                
    +                    Malawi
    +                
    +            
    +            
    +                
    +                    Mexico
    +                
    +            
    +            
    +                
    +                    Malaysia
    +                
    +            
    +            
    +                
    +                    Mozambique
    +                
    +            
    +            
    +                
    +                    Namibia
    +                
    +            
    +            
    +                
    +                    Niger
    +                
    +            
    +            
    +                
    +                    Nigeria
    +                
    +            
    +            
    +                
    +                    Nicaragua
    +                
    +            
    +            
    +                
    +                    Netherlands
    +                
    +            
    +            
    +                
    +                    Norway
    +                
    +            
    +            
    +                
    +                    Nepal
    +                
    +            
    +            
    +                
    +                    Nauru
    +                
    +            
    +            
    +                
    +                    Niue
    +                
    +            
    +            
    +                
    +                    New Zealand
    +                
    +            
    +            
    +                
    +                    Oman
    +                
    +            
    +            
    +                
    +                    Panama
    +                
    +            
    +            
    +                
    +                    Peru
    +                
    +            
    +            
    +                
    +                    Papua New Guinea
    +                
    +            
    +            
    +                
    +                    Philippines
    +                
    +            
    +            
    +                
    +                    Pakistan
    +                
    +            
    +            
    +                
    +                    Poland
    +                
    +            
    +            
    +                
    +                    Puerto Rico
    +                
    +            
    +            
    +                
    +                    Palestinian Territory, Occupied
    +                
    +            
    +            
    +                
    +                    Portugal
    +                
    +            
    +            
    +                
    +                    Palau
    +                
    +            
    +            
    +                
    +                    Paraguay
    +                
    +            
    +            
    +                
    +                    Qatar
    +                
    +            
    +            
    +                
    +                    Romania
    +                
    +            
    +            
    +                
    +                    Serbia
    +                
    +            
    +            
    +                
    +                    Russian Federation
    +                
    +            
    +            
    +                
    +                    Rwanda
    +                
    +            
    +            
    +                
    +                    Saudi Arabia
    +                
    +            
    +            
    +                
    +                    Solomon Islands
    +                
    +            
    +            
    +                
    +                    Seychelles
    +                
    +            
    +            
    +                
    +                    Sudan
    +                
    +            
    +            
    +                
    +                    Sweden
    +                
    +            
    +            
    +                
    +                    Singapore
    +                
    +            
    +            
    +                
    +                    Slovenia
    +                
    +            
    +            
    +                
    +                    Slovakia
    +                
    +            
    +            
    +                
    +                    Sierra Leone
    +                
    +            
    +            
    +                
    +                    San Marino
    +                
    +            
    +            
    +                
    +                    Senegal
    +                
    +            
    +            
    +                
    +                    Somalia
    +                
    +            
    +            
    +                
    +                    Suriname
    +                
    +            
    +            
    +                
    +                    Sao Tome and Principe
    +                
    +            
    +            
    +                
    +                    El Salvador
    +                
    +            
    +            
    +                
    +                    Syrian Arab Republic
    +                
    +            
    +            
    +                
    +                    Swaziland
    +                
    +            
    +            
    +                
    +                    Chad
    +                
    +            
    +            
    +                
    +                    Togo
    +                
    +            
    +            
    +                
    +                    Thailand
    +                
    +            
    +            
    +                
    +                    Tajikistan
    +                
    +            
    +            
    +                
    +                    Timor-Leste
    +                
    +            
    +            
    +                
    +                    Turkmenistan
    +                
    +            
    +            
    +                
    +                    Tunisia
    +                
    +            
    +            
    +                
    +                    Tonga
    +                
    +            
    +            
    +                
    +                    Turkey
    +                
    +            
    +            
    +                
    +                    Trindidad and Tobago
    +                
    +            
    +            
    +                
    +                    Tuvalu
    +                
    +            
    +            
    +                
    +                    Tanzania, United republic of
    +                
    +            
    +            
    +                
    +                    Ukraina
    +                
    +            
    +            
    +                
    +                    Uganda
    +                
    +            
    +            
    +                
    +                    United States
    +                
    +            
    +            
    +                
    +                    Uruguay
    +                
    +            
    +            
    +                
    +                    Uzbekistan
    +                
    +            
    +            
    +                
    +                    Holy See (Vatican City State)
    +                
    +            
    +            
    +                
    +                    Saint Vincent and the Granadines
    +                
    +            
    +            
    +                
    +                    Venezuela
    +                
    +            
    +            
    +                
    +                    Viet Nam
    +                
    +            
    +            
    +                
    +                    Vanuatu
    +                
    +            
    +            
    +                
    +                    Samoa
    +                
    +            
    +            
    +                
    +                    Yemen
    +                
    +            
    +            
    +                
    +                    South Africa
    +                
    +            
    +            
    +                
    +                    Zambia
    +                
    +            
    +            
    +                
    +                    Zimbabwe
    +                
    +            
    +        
    +    
    +    
    +        
    +            Type of course unit
    +        
    +        
    +            
    +                
    +                    Compulsory
    +                
    +            
    +            
    +                
    +                    Optional
    +                
    +            
    +        
    +    
    +    
    +        
    +            Date format yyyy-mm-dd. Ex.: 2013-05-04, ...
    +        
    +        
    +    
    +    
    +        
    +            ECTS grading scale
    +        
    +        
    +            
    +                
    +                    Top 10%
    +                
    +            
    +            
    +                
    +                    Next 25%
    +                
    +            
    +            
    +                
    +                    Next 30%
    +                
    +            
    +            
    +                
    +                    Next 25%
    +                
    +            
    +            
    +                
    +                    Lowest 10%
    +                
    +            
    +            
    +                
    +                    Fail
    +                
    +            
    +            
    +                
    +                    Fail
    +                
    +            
    +        
    +    
    +    
    +        
    +            E-Mail address constraint
    +        
    +        
    +    
    +    
    +        
    +            EHEA Framework (Bologna: Framework of Qualifications/European Qualifications Framework)
    +        
    +        
    +            
    +                
    +                    First Cycle
    +                
    +            
    +            
    +                
    +                    Second Cycle
    +                
    +            
    +            
    +                
    +                    Third Cycle
    +                
    +            
    +        
    +    
    +    
    +        
    +            Empty text constraint
    +        
    +        
    +            
    +                Empty text constraint
    +            
    +            
    +        
    +    
    +    
    +        
    +            Gender
    +        
    +        
    +            
    +                
    +                    Female
    +                
    +            
    +            
    +                
    +                    Male
    +                
    +            
    +        
    +    
    +    
    +        
    +            MIME: Type image
    +        
    +        
    +            
    +                
    +                    GIF image
    +                
    +            
    +            
    +                
    +                    JPEG JFIF image
    +                
    +            
    +            
    +                
    +                    JPEG JFIF image
    +                
    +            
    +            
    +                
    +                    Portable Network Graphics
    +                
    +            
    +            
    +                
    +                    Tag Image File Format
    +                
    +            
    +        
    +    
    +    
    +        
    +            International Standard Classification of Education (ISCED) 1997
    +        
    +        
    +            
    +                
    +                    Level 0: Pre-primary education
    +                
    +            
    +            
    +                
    +                    Level 1: Primary education or first stage of basic education
    +                
    +            
    +            
    +                
    +                    Level 2: Lower secondary education or second stage of basic education
    +                
    +            
    +            
    +                
    +                    Level 3: Upper secondary education
    +                
    +            
    +            
    +                
    +                    Level 4: Post-secondary non-tertiary education
    +                
    +            
    +            
    +                
    +                    Level 5A: First stage of tertiary education: largely theoretically based programmes intended to provide qualifications for gaining entry into more advanced research programmes and professions with higher skills requirements
    +                
    +            
    +            
    +                
    +                    Level 5B: First stage of tertiary education: shorter, more practical/technical/occupationally specific prgrammes leading to professional qualifications
    +                
    +            
    +            
    +                
    +                    Level 6: Second stage of tertiary education (leading to an advanced research qualification)
    +                
    +            
    +        
    +    
    +    
    +        
    +            International Standard Classification of Education (ISCED) 2011
    +        
    +        
    +            
    +                
    +                    Level 0: Early childhood Education
    +                
    +            
    +            
    +                
    +                    Level 1: Primary education
    +                
    +            
    +            
    +                
    +                    Level 2: Lower secondary education
    +                
    +            
    +            
    +                
    +                    Level 3: Upper secondary education
    +                
    +            
    +            
    +                
    +                    Level 4: Post-secondary non-tertiary education
    +                
    +            
    +            
    +                
    +                    Level 5: Short-cycle teriary education
    +                
    +            
    +            
    +                
    +                    Level 6: Bachelor or equivalent
    +                
    +            
    +            
    +                
    +                    Level 7: Master or equivalent
    +                
    +            
    +            
    +                
    +                    Level 8: Doctoral or equivalent
    +                
    +            
    +        
    +    
    +    
    +        
    +            ISO 639-1 languages
    +        
    +        
    +            
    +                
    +                    Abkhazian
    +                
    +            
    +            
    +                
    +                    Afrikaans
    +                
    +            
    +            
    +                
    +                    Aragonese
    +                
    +            
    +            
    +                
    +                    Arabic
    +                
    +            
    +            
    +                
    +                    Assamese
    +                
    +            
    +            
    +                
    +                    Azerbaijani
    +                
    +            
    +            
    +                
    +                    Belarusian
    +                
    +            
    +            
    +                
    +                    Bulgarian
    +                
    +            
    +            
    +                
    +                    Bengali
    +                
    +            
    +            
    +                
    +                    Tibetan
    +                
    +            
    +            
    +                
    +                    Breton
    +                
    +            
    +            
    +                
    +                    Bosnian
    +                
    +            
    +            
    +                
    +                    Catalan / Valencian
    +                
    +            
    +            
    +                
    +                    Chechen
    +                
    +            
    +            
    +                
    +                    Corsican
    +                
    +            
    +            
    +                
    +                    Czech
    +                
    +            
    +            
    +                
    +                    Welsh
    +                
    +            
    +            
    +                
    +                    Danish
    +                
    +            
    +            
    +                
    +                    German
    +                
    +            
    +            
    +                
    +                    Greek
    +                
    +            
    +            
    +                
    +                    English
    +                
    +            
    +            
    +                
    +                    Spanish / Castilian
    +                
    +            
    +            
    +                
    +                    Estonian
    +                
    +            
    +            
    +                
    +                    Basque
    +                
    +            
    +            
    +                
    +                    Persian
    +                
    +            
    +            
    +                
    +                    Finnish
    +                
    +            
    +            
    +                
    +                    Fijian
    +                
    +            
    +            
    +                
    +                    Faroese
    +                
    +            
    +            
    +                
    +                    French
    +                
    +            
    +            
    +                
    +                    Western Frisian
    +                
    +            
    +            
    +                
    +                    Irish
    +                
    +            
    +            
    +                
    +                    Gaelic / Scottish Gaelic
    +                
    +            
    +            
    +                
    +                    Galician
    +                
    +            
    +            
    +                
    +                    Manx
    +                
    +            
    +            
    +                
    +                    Ancient Greek
    +                
    +            
    +            
    +                
    +                    Alemanic; Swiss German
    +                
    +            
    +            
    +                
    +                    Hebrew
    +                
    +            
    +            
    +                
    +                    Hindi
    +                
    +            
    +            
    +                
    +                    Croatian
    +                
    +            
    +            
    +                
    +                    Haitian; Haitian Creole
    +                
    +            
    +            
    +                
    +                    Hungarian
    +                
    +            
    +            
    +                
    +                    Armenian
    +                
    +            
    +            
    +                
    +                    Indonesian
    +                
    +            
    +            
    +                
    +                    Icelandic
    +                
    +            
    +            
    +                
    +                    Italian
    +                
    +            
    +            
    +                
    +                    Japanese
    +                
    +            
    +            
    +                
    +                    Javanese
    +                
    +            
    +            
    +                
    +                    Georgian
    +                
    +            
    +            
    +                
    +                    Kongo
    +                
    +            
    +            
    +                
    +                    Korean
    +                
    +            
    +            
    +                
    +                    Kurdish
    +                
    +            
    +            
    +                
    +                    Cornish
    +                
    +            
    +            
    +                
    +                    Kirghiz
    +                
    +            
    +            
    +                
    +                    Luxembourgish; Letzeburgesch
    +                
    +            
    +            
    +                
    +                    Limburgan; Limburger; Limburgish
    +                
    +            
    +            
    +                
    +                    Lingala
    +                
    +            
    +            
    +                
    +                    Lithuanian
    +                
    +            
    +            
    +                
    +                    Latvian
    +                
    +            
    +            
    +                
    +                    Malagasy
    +                
    +            
    +            
    +                
    +                    Macedonian
    +                
    +            
    +            
    +                
    +                    Mongolian
    +                
    +            
    +            
    +                
    +                    Moldavian
    +                
    +            
    +            
    +                
    +                    Malay
    +                
    +            
    +            
    +                
    +                    Maltese
    +                
    +            
    +            
    +                
    +                    Burmese
    +                
    +            
    +            
    +                
    +                    Norwegian (Bokmål)
    +                
    +            
    +            
    +                
    +                    Nepali
    +                
    +            
    +            
    +                
    +                    Dutch
    +                
    +            
    +            
    +                
    +                    Norwegian (Nynorsk)
    +                
    +            
    +            
    +                
    +                    Norwegian
    +                
    +            
    +            
    +                
    +                    Polish
    +                
    +            
    +            
    +                
    +                    Portuguese
    +                
    +            
    +            
    +                
    +                    Raeto-Romance
    +                
    +            
    +            
    +                
    +                    Romanian
    +                
    +            
    +            
    +                
    +                    Russian
    +                
    +            
    +            
    +                
    +                    Sardinian
    +                
    +            
    +            
    +                
    +                    Northern Sami
    +                
    +            
    +            
    +                
    +                    Slovak
    +                
    +            
    +            
    +                
    +                    Slovenian
    +                
    +            
    +            
    +                
    +                    Somali
    +                
    +            
    +            
    +                
    +                    Albanian
    +                
    +            
    +            
    +                
    +                    Serbian
    +                
    +            
    +            
    +                
    +                    Swedish
    +                
    +            
    +            
    +                
    +                    Swahili
    +                
    +            
    +            
    +                
    +                    Turkmen
    +                
    +            
    +            
    +                
    +                    Turkish
    +                
    +            
    +            
    +                
    +                    Tahitian
    +                
    +            
    +            
    +                
    +                    Ukrainian
    +                
    +            
    +            
    +                
    +                    Urdu
    +                
    +            
    +            
    +                
    +                    Uzbek
    +                
    +            
    +            
    +                
    +                    Vietnamese
    +                
    +            
    +            
    +                
    +                    Yiddish
    +                
    +            
    +            
    +                
    +                    Chinese
    +                
    +            
    +            
    +                
    +                    Church Slavic
    +                
    +            
    +            
    +                
    +                    Esperanto
    +                
    +            
    +            
    +                
    +                    Latin
    +                
    +            
    +            
    +                
    +                    Occitan (post 1500); Provençal
    +                
    +            
    +            
    +                
    +                    VVolapük
    +                
    +            
    +        
    +    
    +    
    +        
    +            MIME types
    +        
    +        
    +            
    +                
    +                    GIF image
    +                
    +            
    +            
    +                
    +                    JPEG JFIF image
    +                
    +            
    +            
    +                
    +                    JPEG JFIF image
    +                
    +            
    +            
    +                
    +                    Portable Network Graphics
    +                
    +            
    +            
    +                
    +                    Tag Image File Format
    +                
    +            
    +            
    +                
    +                    HTML
    +                
    +            
    +            
    +                
    +                    Portable Document Format
    +                
    +            
    +        
    +    
    +    
    +        
    +            Mode of study
    +        
    +        
    +            
    +                
    +                    Full time
    +                
    +            
    +            
    +                
    +                    Par time
    +                
    +            
    +            
    +                
    +                    Distance
    +                
    +            
    +            
    +                
    +                    eLearning
    +                
    +            
    +            
    +                
    +                    Another
    +                
    +            
    +        
    +    
    +    
    +        
    +            Model of delivery
    +        
    +        
    +            
    +                
    +                    Face-to-face
    +                
    +            
    +            
    +                
    +                    Distance learning
    +                
    +            
    +        
    +    
    +    
    +        
    +            National Framework of Qualifications (NFQ) Level 
    +        
    +        
    +    
    +    
    +        
    +            Plain text constraint
    +        
    +        
    +            
    +                Non empty text
    +            
    +            
    +        
    +    
    +    
    +        
    +            Percent constraint
    +        
    +        
    +            
    +                Restriction between 0 and 100
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            Positive decimal number
    +        
    +        
    +            
    +                Positive decimal numbers restriction
    +            
    +            
    +        
    +    
    +    
    +        
    +            Positive integer number
    +        
    +        
    +            
    +                Positive integer numbers restriction
    +            
    +            
    +        
    +    
    +    
    +        
    +            Source of the course unit performance
    +        
    +        
    +            
    +                
    +                    Recognized
    +                
    +            
    +            
    +                
    +                    Course unit attended in mobility programme
    +                
    +            
    +            
    +                
    +                    Another
    +                
    +            
    +        
    +    
    +    
    +        
    +            Uniform Resource Locator (URL)
    +        
    +        
    +            
    +                http and https restriction
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            Additional information
    +        
    +        
    +            
    +                
    +                    Specific information
    +                
    +            
    +            
    +                
    +                    Other sources
    +                
    +            
    +        
    +    
    +    
    +        
    +            Address
    +        
    +        
    +            
    +                
    +                    Name, street, PO box, ...
    +                
    +            
    +            
    +                
    +                    City
    +                
    +            
    +            
    +                
    +                    State or region
    +                
    +            
    +            
    +                
    +                    Postal code
    +                
    +            
    +            
    +                
    +                    Country
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Country code ISO 3166-1-alpha-2
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Data file
    +        
    +        
    +            
    +                
    +                    Description
    +                
    +            
    +            
    +                
    +                    MIME type code
    +                
    +            
    +            
    +                
    +                    Base64 binary data
    +                
    +            
    +        
    +    
    +    
    +        
    +            URL reference to the file
    +        
    +        
    +            
    +                
    +                    Description
    +                
    +            
    +            
    +                
    +                    MIME type code
    +                
    +            
    +            
    +                
    +                    URL
    +                
    +            
    +        
    +    
    +    
    +        
    +            Image data file
    +        
    +        
    +            
    +                
    +                    Description
    +                
    +            
    +            
    +                
    +                    MIME type image code
    +                
    +            
    +            
    +                
    +                    Base64 binary data
    +                
    +            
    +        
    +    
    +    
    +        
    +            URL reference to the image file
    +        
    +        
    +            
    +                
    +                    Description
    +                
    +            
    +            
    +                
    +                    MIME type image code
    +                
    +            
    +            
    +                
    +                    URL
    +                
    +            
    +        
    +    
    +    
    +        
    +            Attachment resource
    +        
    +        
    +            
    +                
    +                    Data file
    +                
    +            
    +            
    +                
    +                    URL reference to the file
    +                
    +            
    +            
    +                
    +                    Image data file
    +                
    +            
    +            
    +                
    +                    URL reference to the image file
    +                
    +            
    +        
    +        
    +            
    +                Attached identifier
    +            
    +        
    +    
    +    
    +        
    +            Attachments resources
    +        
    +        
    +            
    +                
    +                    Attachment resource
    +                
    +            
    +        
    +    
    +    
    +        
    +            Certification of the Supplement
    +        
    +        
    +            
    +                
    +                    Date was issued
    +                
    +            
    +            
    +                
    +                    Officials certifying
    +                
    +            
    +            
    +                
    +                    Official stamp or seal of the institution
    +                
    +            
    +        
    +    
    +    
    +        
    +            Contact information
    +        
    +        
    +            
    +                
    +                    Address
    +                
    +            
    +            
    +                
    +                    Phone number
    +                
    +            
    +            
    +                
    +                    E-Mail address
    +                
    +            
    +            
    +                
    +                    Web site
    +                
    +            
    +        
    +    
    +    
    +        
    +            
    +                
    +                    Mobility programme
    +                
    +            
    +        
    +    
    +    
    +        
    +            Course structure diagram
    +        
    +        
    +            
    +                
    +                    Courses groups
    +                
    +            
    +            
    +                
    +                    Course units
    +                
    +                
    +                    
    +                        Unique: Course unit code
    +                    
    +                    
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Course units
    +        
    +        
    +            
    +                
    +                    Course unit
    +                
    +            
    +        
    +    
    +    
    +        
    +            Language of instruction
    +        
    +        
    +            
    +                
    +                    Language of instruction
    +                
    +            
    +        
    +    
    +    
    +        
    +            Student performance
    +        
    +        
    +            
    +                
    +                    Local grade
    +                
    +            
    +            
    +                
    +                    ECTS grade
    +                
    +            
    +        
    +    
    +    
    +        
    +            Course unit
    +        
    +        
    +            
    +                
    +                    Course unit code
    +                
    +            
    +            
    +            
    +                
    +                    Course unit title
    +                
    +            
    +            
    +                
    +                    Theme (example: Academic project)
    +                
    +            
    +            
    +                
    +                    Type of course unit
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Type of course unit code
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Year of study
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Year of study
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Level of course unit
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    EHEA Framework code
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Number of ECTS credits
    +                
    +            
    +            
    +                
    +                    Number of local credits
    +                
    +            
    +            
    +                
    +                    Number of hours
    +                
    +            
    +            
    +                
    +                    Languages of instruction
    +                
    +                
    +                    
    +                        Unique: Language
    +                    
    +                    
    +                    
    +                
    +            
    +            
    +                
    +                    Mode of delivery
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Mode of delivery oode
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Work placements
    +                
    +            
    +            
    +                
    +                    Student performance
    +                
    +            
    +            
    +                
    +                    Name of lecturer(s)
    +                
    +            
    +            
    +                
    +                    Learning outcomes of the course unit
    +                
    +            
    +            
    +                
    +                    Prerequisites and co-requisites
    +                
    +            
    +            
    +                
    +                    Recomended optional programme components
    +                
    +            
    +            
    +                
    +                    Course contents
    +                
    +            
    +            
    +                
    +                    Recomended or required reading
    +                
    +            
    +            
    +                
    +                    Planed learning activities and teaching method
    +                
    +            
    +            
    +                
    +                    Assesment methods and criteria
    +                
    +            
    +            
    +                
    +                    Observations
    +                
    +            
    +        
    +        
    +            
    +                Group identifier
    +            
    +        
    +        
    +            
    +                Institution administering studies identifier 
    +            
    +        
    +        
    +            
    +                Is required by the programme?
    +            
    +        
    +    
    +    
    +        
    +            Course unit work placements
    +        
    +        
    +            
    +                
    +                    Work placement
    +                
    +            
    +        
    +    
    +    
    +        
    +            Course unit work placement
    +        
    +        
    +            
    +                
    +                    Name of collaborating institution
    +                
    +            
    +            
    +                
    +                    Date from
    +                
    +            
    +            
    +                
    +                    Date to
    +                
    +            
    +            
    +                
    +                    Training Hours
    +                
    +            
    +        
    +    
    +    
    +        
    +            Language of instruction
    +        
    +        
    +            
    +                
    +                    
    +                        Language code ISO 639-1 of the Supplement
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Diploma Supplement
    +        
    +        
    +            
    +                
    +                    Information identifying the holder of the qualification
    +                
    +            
    +            
    +                
    +                    Information identifying the qualification
    +                
    +            
    +            
    +                
    +                    Information on the level of the qualification
    +                
    +            
    +            
    +                
    +                    Information on the contents and results gained
    +                
    +            
    +            
    +                
    +                    Information on the function of the qualification
    +                
    +            
    +            
    +                
    +                    Additional informationType
    +                
    +            
    +            
    +                
    +                    Certification of the Supplement
    +                
    +            
    +            
    +                
    +                    Information on the national higher education system
    +                
    +            
    +            
    +                
    +                    Attachments resources
    +                
    +            
    +            
    +                
    +                    Extension content
    +                
    +            
    +            
    +                
    +                    Digital signature
    +                
    +            
    +        
    +        
    +            
    +                Language code ISO 639-1 of the Supplement
    +            
    +        
    +        
    +            
    +                Indicate if language is the original language
    +            
    +        
    +    
    +    
    +        
    +            Extension content
    +        
    +        
    +            
    +        
    +        
    +    
    +    
    +        
    +            Family name(s)
    +        
    +        
    +            
    +                
    +                    Surname
    +                
    +            
    +        
    +    
    +    
    +        
    +            Given name(s)
    +        
    +        
    +            
    +                
    +                    Name
    +                
    +            
    +        
    +    
    +    
    +        
    +            Grading scheme and grade distribution guidance
    +        
    +        
    +            
    +                
    +                    Grading scheme
    +                
    +            
    +            
    +                
    +                    Grade distribution guidance
    +                
    +            
    +        
    +    
    +    
    +        
    +            Courses groups
    +        
    +        
    +            
    +                
    +                    Groups set name
    +                
    +            
    +            
    +                
    +                    Header information
    +                
    +            
    +            
    +                
    +                    Courses group
    +                
    +            
    +            
    +                
    +                    Footer information
    +                
    +            
    +        
    +    
    +    
    +        
    +            Courses group
    +        
    +        
    +            
    +                
    +                    Name of the group
    +                
    +            
    +            
    +                
    +                    Header information
    +                
    +            
    +            
    +                
    +                    Courses group
    +                
    +            
    +            
    +                
    +                    Footer information
    +                
    +            
    +        
    +        
    +            
    +                Group identifier
    +            
    +        
    +    
    +    
    +        
    +            Information identifying the holder of the qualification
    +        
    +        
    +            
    +                
    +                    Family name(s)
    +                
    +            
    +            
    +                
    +                    Given name(s)
    +                
    +            
    +            
    +                
    +                    Date of birth
    +                
    +            
    +            
    +                
    +                    Student identification number or code
    +                
    +            
    +            
    +                
    +                    Country of birth
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Country code ISO 3166-1-alpha-2
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Place of birth
    +                
    +            
    +            
    +                
    +                    Gender
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Gender code
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Information identifying the qualification
    +        
    +        
    +            
    +                
    +                    Qualification
    +                
    +            
    +            
    +                
    +                    Title conferred
    +                
    +            
    +            
    +                
    +                    Main fields of study
    +                
    +            
    +            
    +                
    +                    Name and status of awarding institution
    +                
    +            
    +            
    +                
    +                    Name and status of institution administering studies
    +                
    +            
    +            
    +                
    +                    Language of instruction and examination
    +                
    +                
    +                    
    +                        Unique: Language of instruction and examinatio
    +                    
    +                    
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Information on the contents and results gained
    +        
    +        
    +            
    +                
    +                    Mode of study
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Mode of study
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Programme requirements
    +                
    +            
    +            
    +                
    +                    Programme details
    +                
    +            
    +            
    +                
    +                    Grading scheme and grade distribution guidance
    +                
    +            
    +            
    +                
    +                    Overall classification of the qualification
    +                
    +            
    +        
    +    
    +    
    +        
    +            Information on the function of the qualification type
    +        
    +        
    +            
    +                
    +                    Access to further study
    +                
    +            
    +            
    +                
    +                    Professional status
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Is regulated profession
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Information on the level of the qualification
    +        
    +        
    +            
    +                
    +                    Level ff the qualification
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    ISCED 1997 code
    +                                
    +                            
    +                            
    +                                
    +                                    ISCED 2011 code
    +                                
    +                            
    +                            
    +                                
    +                                    EHEA Framework code
    +                                
    +                            
    +                            
    +                                
    +                                    NFQ code
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Official length of programme
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Number of ECTS credits
    +                                
    +                            
    +                            
    +                                
    +                                    Number of years
    +                                
    +                            
    +                            
    +                                
    +                                    Number of semesters
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Access requirements
    +                
    +            
    +        
    +    
    +    
    +        
    +            Name and status of the institution
    +        
    +        
    +            
    +                
    +                    Name of the institution
    +                
    +            
    +            
    +                
    +                    Status of the institution
    +                
    +            
    +            
    +                
    +                    Country of the institution
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Country code ISO 3166-1-alpha-2
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Additional Information about the institution
    +                
    +            
    +            
    +                
    +                    Contact information
    +                
    +            
    +            
    +                
    +                    Logo of the institution reference
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Attached identifier reference
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +        
    +            
    +                National identification code or number of the institution
    +            
    +        
    +        
    +            
    +                ERASMUS code of the institution
    +            
    +        
    +    
    +    
    +        
    +            Language of instruction and examination
    +        
    +        
    +            
    +                
    +                    Language of instruction and examination
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Language code ISO 639-1
    +                                
    +                            
    +                            
    +                                
    +                                    Percent
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Local grade
    +        
    +        
    +            
    +                
    +                    Academic year
    +                
    +            
    +            
    +                
    +                    Date issued
    +                
    +            
    +            
    +                
    +                    Grade
    +                
    +            
    +            
    +                
    +                    Source grade
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Source grade code
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Mobility programme courses units
    +        
    +        
    +            
    +                
    +                    Course unit
    +                
    +            
    +        
    +    
    +    
    +        
    +            Mobility programme course unit
    +        
    +        
    +            
    +                
    +                    Course unit code
    +                
    +            
    +            
    +                
    +                    Course unit title
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Language code ISO 639-1
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Number of ECTS credits
    +                
    +            
    +            
    +                
    +                    Additional information
    +                
    +            
    +        
    +        
    +            
    +                Is in the learning agreement?
    +            
    +        
    +    
    +    
    +        
    +            Mobility programme
    +        
    +        
    +            
    +                
    +                    Mobility programme type (e.g. ERASMUS, ISEP, ...)
    +                
    +            
    +            
    +                
    +                    Field of study
    +                
    +            
    +            
    +                
    +                    Country
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Country code ISO 3166-1-alpha-2
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    Receiving institution
    +                
    +            
    +            
    +                
    +                    Academic year
    +                
    +            
    +            
    +                
    +                    Study period (Date from)
    +                
    +            
    +            
    +                
    +                    Study period (Date to)
    +                
    +            
    +            
    +                
    +                    Course units
    +                
    +            
    +        
    +    
    +    
    +        
    +            Multilingual Diploma Supplement (DS)
    +        
    +        
    +            
    +                
    +                    Diploma Supplement
    +                
    +            
    +            
    +                
    +                    Digital signature
    +                
    +            
    +        
    +    
    +    
    +        
    +            Name and status of awarding institution
    +        
    +        
    +            
    +                
    +                    Awarding institution
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Awarding institution identifier
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Name and status of institution administering studies
    +        
    +        
    +            
    +                
    +                    Institution administering studies
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Institution administering studies identifier
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Official certifying the DS
    +        
    +        
    +            
    +                
    +                    Family name(s)
    +                
    +            
    +            
    +                
    +                    Given name(s)
    +                
    +            
    +            
    +                
    +                    Official capacity
    +                
    +            
    +        
    +        
    +            
    +                Identifier of awarding institution
    +            
    +        
    +    
    +    
    +        
    +            Officials certifying
    +        
    +        
    +            
    +                
    +                    Official certifying
    +                
    +            
    +        
    +    
    +    
    +        
    +            Official stamp or seal of the institution
    +        
    +        
    +            
    +                
    +                    Stamp description
    +                
    +            
    +        
    +        
    +            
    +                Identifier of awarding institution
    +            
    +        
    +    
    +    
    +        
    +            Programme details
    +        
    +        
    +            
    +                
    +                    Course structure diagram
    +                
    +            
    +            
    +                
    +                    Courses attended in other institution in mobility programs
    +                
    +            
    +        
    +    
    +    
    +        
    +            Programme requirements
    +        
    +        
    +            
    +                
    +                    Programme requirements
    +                
    +            
    +            
    +                
    +                    Key learning outcomes of the programme
    +                
    +            
    +        
    +    
    +    
    +        
    +            Qualification
    +        
    +        
    +            
    +                
    +                    Name of the qualification
    +                
    +            
    +            
    +                
    +                    Additional information about the qualification
    +                
    +            
    +        
    +        
    +            
    +                Local identification code or number of the qualification
    +            
    +        
    +        
    +            
    +                National identification code or number of the qualification
    +            
    +        
    +    
    +    
    +        
    +            Rich text tag
    +        
    +        
    +            
    +                
    +                    Specifies bold text
    +                
    +            
    +            
    +                
    +                    Specifies break line
    +                
    +            
    +            
    +                
    +                    Specifies italic text
    +                
    +            
    +            
    +                
    +                    Specifies underline text
    +                
    +            
    +            
    +                
    +                    Specifies reference to the attached resource 
    +                
    +                
    +                    
    +                        
    +                            
    +                                
    +                                    Attached identifier reference
    +                                
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +    
    +        
    +            Title conferred
    +        
    +        
    +            
    +                
    +                    Name of the title conferred
    +                
    +            
    +        
    +    
    +    
    +        
    +            Diploma Supplement
    +        
    +        
    +        
    +            
    +                Primary Key: Group identifier
    +            
    +            
    +            
    +        
    +        
    +            
    +                Primary Key: Awarding institution identifier
    +            
    +            
    +            
    +        
    +        
    +            
    +                Primary Key: Intitution administering studies identifier
    +            
    +            
    +            
    +        
    +        
    +        
    +            
    +                Foreign Key: Group identifier
    +            
    +            
    +            
    +        
    +        
    +            
    +                Foreign Key: Awarding institution (Official Stamp) identifier
    +            
    +            
    +            
    +        
    +        
    +            
    +                Foreign Key: Awarding institution (Official Stamp) identifier
    +            
    +            
    +            
    +        
    +        
    +            
    +                Foreign Key: Institution administering studies identifier
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            Multilingual Diploma Supplement
    +        
    +        
    +        
    +            
    +                Unique: Diploma Supplement language
    +            
    +            
    +            
    +        
    +    
     
    diff --git a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
    index ee46caf60..b1c0b060f 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
    @@ -1,1819 +1,1686 @@
     
    -
    -
    -	
    -
    -	
    -		
    -	
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -	
    -	
    -		
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -		
    -	
    -	
    -		
    -			
    -		
    -	
    -	
    -		
    -			
    -		
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -	
    -		
    -	
    -
    -
    -
    -
    -	
    -
    -	
    -		
    -			
    -				
    -				
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -		
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -				
    -					
    -					
    -				
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -		
    -		
    -		
    -		
    -		
    -		
    -	
    -
    -
    -
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -				
    -				
    -			
    -		
    -	
    -
    -
    -	
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -		
    -		
    -		
    -		
    -	
    -
    -
    -	
    -	
    -		
    -			
    -		
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -		
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -				
    -					
    -					
    -				
    -			
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -				
    -					
    -						
    -							
    -							
    -							
    -							
    -							
    -							
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -							
    -							
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -			
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -		
    -		
    -		
    -		
    -	
    -
    -
    -	
    -	
    -		
    -			
    -				
    -					
    -						
    -							
    -							
    -							
    -							
    -							
    -							
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -			
    -			
    -			
    -			
    -		
    -		
    -		
    -	
    -
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -
    -	
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -		
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -	
    -		
    -			
    -			
    -		
    -		
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -		
    -		
    -		
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -				
    -					
    -						
    -							
    -							
    -						
    -					
    -				
    -			
    -		
    -	
    -
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -
    -
    -
    -	
    -
    -	
    -		 
    -		
    -			
    -			
    -		
    -		
    -			
    -			
    -		
    -		
    -			
    -			
    -		
    -		
    -		
    -			
    -			
    -		
    -		
    -			
    -			
    -		
    -		
    -			
    -			
    -		
    -		
    -			
    -			
    -		
    -	
    -
    -
    -	
    -
    -	
    -		 
    -		
    -			
    -			
    -		
    -	
    +
    +		
    +    
    +	
    +    
    +        
    +    
    +	
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +    
    +    
    +        
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +        
    +    
    +    
    +        
    +            
    +        
    +    
    +    
    +        
    +            
    +        
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +    
    +        
    +    
    + 
    + 
    + 
    + 
    +    
    +  
    +    
    +        
    +            
    +                
    +                
    +            
    +        
    +    
    + 
    + 
    +     
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +        
    +        
    +    
    + 
    + 
    +    
    +        
    +            
    +            
    +        
    +    
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    + 
    +
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +                
    +                    
    +                    
    +                
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +        
    +        
    +        
    +        
    +        
    +        
    +    
    + 
    + 
    + 
    + 
    + 
    +    
    +        
    +            
    +            
    +        
    +    
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    + 
    +    
    +        
    +            
    +                
    +                
    +            
    +        
    +    
    +
    +
    +    
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +             
    +            
    +            
    +            
    +        
    +        
    +        
    +        
    +        
    +    
    + 
    + 
    +    
    +    
    +        
    +            
    +        
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +        
    +        
    +    
    +
    + 
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +
    + 
    +    
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +                
    +                    
    +                    
    +                
    +            
    +        
    +    
    +
    +
    +
    +    
    +        
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +
    +    
    +        
    +            
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +
    +
    +
    +    
    +        
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                            
    +                            
    +                            
    +                            
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                            
    +                            
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +            
    +        
    +    
    + 
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +        
    +        
    +        
    +        
    +    
    +
    +
    +    
    +    
    +        
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                            
    +                            
    +                            
    +                            
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +            
    +            
    +            
    +            
    +        
    +        
    +        
    +    
    + 
    + 
    + 
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +
    +    
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +    
    +    
    +        
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +
    +    
    +    
    +        
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +        
    +        
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    +
    +
    +    
    +    
    +        
    +            
    +            
    +        
    +        
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +        
    +        
    +        
    +        
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +            
    +                
    +                    
    +                        
    +                            
    +                            
    +                        
    +                    
    +                
    +            
    +        
    +    
    +
    +
    +    
    +        
    +            
    +            
    +        
    +    
    + 
    + 
    + 
    + 
    +    
    +
    +    
    +         
    +        
    +            
    +            
    +        
    +        
    +            
    +            
    +        
    +        
    +            
    +            
    +        
    +        
    +        
    +            
    +            
    +        
    +        
    +            
    +            
    +        
    +        
    +            
    +            
    +        
    +        
    +            
    +            
    +        
    +    
    + 
    + 
    +    
    +
    +    
    +         
    +        
    +            
    +            
    +        
    +    
     
     
     
    diff --git a/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd b/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
    index de4ac928a..54527e0bc 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
    @@ -1,302 +1,309 @@
     
     
    -
    -
    -
    -
    -
    -	
    -
    -	
    -		
    -		
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -		
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -				
    -			
    -		
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -		
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -		
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -		
    -		
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -		
    -		
    -		
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -		
    -		
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -		
    -		
    -	
    -
    -	
    -	
    -		
    -	
    -
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -			
    -		
    -		
    -	
    -
    -	
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -			
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -		
    -		
    -		
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -				
    -				
    -				
    -				
    -				
    -				
    -			
    -		
    -	
    -
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -				
    -				
    -				
    -			
    -			
    -				
    -				
    -			
    -		
    -	
    -
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -	
    -
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -		
    -		
    -		 
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -		
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -		
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -		
    -		
    -		
    -	
    -
    -	
    -
    -	
    -
    -	
    -		
    -	
    -
    -	
    -
    -	
    -	
    -		
    -			
    -				
    -				
    -			
    -			
    -			
    -			
    -			
    -				
    -				
    -			
    -		
    -	
    -
    -	
    -	
    -		
    -			
    -			
    -		
    -	
    -
    -	
    -
    -	
    +
    +
    +
    +
    +
    +    
    +
    +    
    +        
    +        
    +    
    +
    +    
    +
    +    
    +    
    +         
    +             
    +             
    +             
    +             
    +          
    +        
    +    
    +
    +     
    +    
    +        
    +            
    +                
    +            
    +        
    +    
    +
    +    
    +
    +    
    +    
    +         
    +             
    +             
    +             
    +          
    +         
    +    
    +
    +     
    +    
    +        
    +            
    +            
    +        
    +         
    +    
    +
    +    
    +    
    +        
    +            
    +            
    +            
    +        
    +         
    +    
    +
    +    
    +
    +    
    +    
    +         
    +             
    +             
    +             
    +        
    +         
    +         
    +         
    +    
    +
    +    
    +    
    +        
    +              
    +        
    +    
    +
    +    
    +    
    +         
    +            
    +            
    +             
    +        
    +         
    +    
    +
    +    
    +
    +    
    +     
    +        
    +            
    +            
    +         
    +    
    +
    +    
    +    
    +        
    +    
    +
    +    
    +
    +    
    +
    +     
    +    
    +             
    +             
    +             
    +             
    +             
    +             
    +            
    +            
    +            
    +            
    +        
    +         
    +    
    +
    +    
    +    
    +
    +     
    +    
    +        
    +            
    +            
    +            
    +        
    +    
    +
    +     
    +    
    +        
    +             
    +          
    +        
    +        
    +    
    +
    +    
    +
    +     
    +    
    +        
    +            
    +                
    +                
    +                
    +                
    +                
    +                
    +            
    +        
    +    
    +
    +     
    +         
    +             
    +             
    +        
    +    
    +
    +    
    +
    +    
    +
    +     
    +     
    +        
    +            
    +                 
    +                 
    +                
    +            
    +            
    +                 
    +                
    +            
    +        
    +    
    +
    +    
    +
    +    
    +
    +     
    +    
    +        
    +            
    +            
    +        
    +     
    +
    +    
    +
    +    
    +
    +    
    +
    +     
    +    
    +        
    +            
    +        
    +         
    +         
    +         
    +    
    +
    +     
    +    
    +        
    +             
    +        
    +         
    +    
    +
    +     
    +    
    +        
    +             
    +        
    +         
    +    
    +
    +     
    +    
    +        
    +            
    +            
    +        
    +         
    +         
    +    
    +
    +    
    +
    +    
    +
    +    
    +        
    +    
    +
    +    
    +
    +    
    +    
    +        
    +            
    +                
    +                
    +            
    +            
    +            
    +            
    +            
    +                
    +                
    +            
    +        
    +    
    +
    +    
    +    
    +        
    +             
    +             
    +        
    +     
    +
    +    
    +
    +    
     
     
    diff --git a/id/server/stork2-commons/src/test/resources/log4j.xml b/id/server/stork2-commons/src/test/resources/log4j.xml
    index 0ad2ea9a4..2bba8b69f 100644
    --- a/id/server/stork2-commons/src/test/resources/log4j.xml
    +++ b/id/server/stork2-commons/src/test/resources/log4j.xml
    @@ -2,18 +2,18 @@
     
     
     
    -	
    -		
    -		
    -		
    -		
    -			
    -		
    -	
    +    
    +        
    +        
    +        
    +        
    +            
    +        
    +    
     
    -	
    -		
    -		
    -	
    +    
    +        
    +        
    +    
     
     
    -- 
    cgit v1.2.3
    
    
    From 7696a5956a8d28a0015ef028ac0225fbaddf6c4d Mon Sep 17 00:00:00 2001
    From: Florian Reimair 
    Date: Tue, 11 Aug 2015 11:54:15 +0200
    Subject: approved some more java changes
    
    ---
     .../peps/auth/commons/PersonalAttributeList.java   | 38 ++++++++++++----------
     .../peps/auth/commons/STORKAttrQueryRequest.java   | 15 +--------
     .../peps/auth/commons/STORKAttrQueryResponse.java  | 16 ++-------
     .../peps/auth/commons/STORKLogoutResponse.java     | 21 ++++++++++++
     4 files changed, 44 insertions(+), 46 deletions(-)
    
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
    index 233cdebd0..1ddc02e15 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
    @@ -53,7 +53,7 @@ public final class PersonalAttributeList extends ConcurrentHashMap attrAliasNumber = new HashMap();
    +	private final Map> attrAliasNumber = new HashMap>();
     
     	/**
     	 * Default constructor.
    @@ -123,28 +123,30 @@ public final class PersonalAttributeList extends ConcurrentHashMap valTemp : val.getComplexValues()) {
    +						if (!attr.getComplexValues().contains(valTemp)) {
    +							attr.setComplexValue(valTemp);
    +						}
    +					}
     				} else {
    -					final PersonalAttribute attr = super.get(key);
    -					if (!attr.isEmptyValue() && StringUtils.isNumeric(attr.getValue().get(0))) {
    -						attrAlias = key + attr.getValue().get(0);
    -						super.put(key, (PersonalAttribute) attr);
    -						this.attrAliasNumber.put(key, null);
    +					if (STORKStatusCode.STATUS_NOT_AVAILABLE.toString().equals(attr.getStatus())) {
    +						attr = val;
     					}
     				}
     			}
    -			return super.put(attrAlias, val);
    -		} else {
    -			return null;
     		}
    +		return super.put(key, attr);
     	}
     
     	/**
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java
    index 566817747..33ae4c743 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java
    @@ -2,18 +2,11 @@ package eu.stork.peps.auth.commons;
     
     import java.io.Serializable;
     
    -import org.apache.log4j.Logger;
    -
     public class STORKAttrQueryRequest implements Serializable, Cloneable {
     
     	/** The Constant serialVersionUID. */
     	private static final long serialVersionUID = 4778480781609392750L;
     
    -	/**
    -	 * Logger object.
    -	 */
    -	private static final Logger LOG = Logger.getLogger(STORKAttrQueryRequest.class.getName());
    -
     	/** The samlId. */
     	private String samlId;
     
    @@ -290,13 +283,7 @@ public class STORKAttrQueryRequest implements Serializable, Cloneable {
     	 * @see IPersonalAttributeList
     	 */
     	public IPersonalAttributeList getPersonalAttributeList() {
    -		IPersonalAttributeList personnalAttributeList = null;
    -		try {
    -			personnalAttributeList = (IPersonalAttributeList) attributeList.clone();
    -		} catch (CloneNotSupportedException e1) {
    -			LOG.trace("[PersonalAttribute] Nothing to do.");
    -		}
    -		return personnalAttributeList;
    +		return (IPersonalAttributeList) attributeList.clone();
     	}
     
     	/**
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
    index cd54fb8b7..ac4663eaf 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
    @@ -164,13 +164,7 @@ public class STORKAttrQueryResponse implements Serializable {
     	 * @see PersonalAttributeList
     	 */
     	public IPersonalAttributeList getPersonalAttributeList() {
    -		IPersonalAttributeList personnalAttributeList = null;
    -		try {
    -			personnalAttributeList = (IPersonalAttributeList) attributeList.clone();
    -		} catch (CloneNotSupportedException e1) {
    -			LOG.trace("[PersonalAttribute] Nothing to do.");
    -		}
    -		return personnalAttributeList;
    +		return (IPersonalAttributeList) attributeList.clone();
     	}
     
     	/**
    @@ -354,13 +348,7 @@ public class STORKAttrQueryResponse implements Serializable {
     	 * @see PersonalAttributeList
     	 */
     	public IPersonalAttributeList getTotalPersonalAttributeList() {
    -		IPersonalAttributeList personnalAttributeList = null;
    -		try {
    -			personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone();
    -		} catch (CloneNotSupportedException e1) {
    -			LOG.trace("[PersonalAttribute] Nothing to do.");
    -		}
    -		return personnalAttributeList;
    +		return (IPersonalAttributeList) totalAttributeList.clone();
     	}
     
     	/**
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java
    index fe90056bf..8606b6389 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java
    @@ -38,6 +38,9 @@ public class STORKLogoutResponse implements Serializable, Cloneable {
     	/** Logout failed? */
     	private boolean fail;
     
    +    /** The inResponseTo */
    +    private String inResponseTo;
    +
     	/**
     	 * Gets the SP's Certificate Alias.
     	 * 
    @@ -257,4 +260,22 @@ public class STORKLogoutResponse implements Serializable, Cloneable {
     		return storkLogoutResponse;
     	}
     
    +
    +    /**
    +     * Getter for the inResponseTo value.
    +     *
    +     * @return The inResponseTo value.
    +     */
    +    public String getInResponseTo() {
    +        return inResponseTo;
    +    }
    +
    +    /**
    +     * Setter for the inResponseTo value.
    +     *
    +     * @param inResponseTo the new inResponseTo value.
    +     */
    +    public void setInResponseTo(String inResponseTo) {
    +        this.inResponseTo = inResponseTo;
    +    }
     }
    -- 
    cgit v1.2.3
    
    
    From 9f2beccee247fb30235aeae28ecb91789e39cbe3 Mon Sep 17 00:00:00 2001
    From: Florian Reimair 
    Date: Tue, 11 Aug 2015 13:26:30 +0200
    Subject: approved some more changes
    
    ---
     id/server/stork2-commons/pom.xml                   | 27 ++++++----------------
     .../java/eu/stork/peps/auth/commons/Linker.java    |  5 ++--
     .../tc/stork/_1_0/assertion/ObjectFactory.java     | 18 +++++++--------
     id/server/stork2-saml-engine/pom.xml               |  9 ++------
     4 files changed, 20 insertions(+), 39 deletions(-)
    
    diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
    index 1a8dfd786..c4eea5152 100644
    --- a/id/server/stork2-commons/pom.xml
    +++ b/id/server/stork2-commons/pom.xml
    @@ -20,21 +20,13 @@
             The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine.
       
        
    -  
    -		
    -			shibboleth.internet2.edu
    -			Internet2
    -			https://build.shibboleth.net/nexus/content/groups/public/
    -		
    -	 
    -   
     	
     
     		
     		
     			joda-time
     			joda-time
    -			${jodatime.version}
    +			2.3
     		
     
     		
    @@ -62,8 +54,9 @@
     		
     
     		
    -  		org.opensaml
    -  		opensaml
    +			org.opensaml
    +			opensaml
    +			${opensaml.version}
     			
     				
     				    org.slf4j
    @@ -88,12 +81,6 @@
     						
     		
     
    -		
    -		
    -			org.bouncycastle
    -			bcprov-jdk16
    -		
    -
     		
     		
     		
    @@ -128,7 +115,6 @@
     					
     						1.7
     						1.7
    -                        UTF-8
     					
     				
     				
    @@ -136,7 +122,7 @@
     					maven-surefire-plugin
     					
                 			reversealphabetical
    -						false
    +						true
               				
                                 reversealphabetical
     				            **/PEPSUtilTest.java
    @@ -178,8 +164,9 @@
     				
     					
     						http://commons.apache.org/lang/api/
    +						http://java.sun.com/j2se/1.6.0/docs/api/
     						http://www.bouncycastle.org/docs/docs1.6/
    -						http://docs.oracle.com/javase/7/docs/api/
    +						http://docs.oracle.com/javase/6/docs/api/
     					
     				
     			
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
    index 87ab4275f..f326ccfe9 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
    @@ -251,10 +251,9 @@ public final class Linker implements Serializable {
     		originalAssertions = new ArrayList();
     
     		// Gather all assertions
    -		for (STORKAttrQueryResponse element : this.assertions.values()) {
    -			originalAssertions.add(element);
    +		for (List element : this.assertions.values()) {
    +			originalAssertions.addAll(element);
     		}
    -
     		return originalAssertions;
     	}
     
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    index 82ec6d3b4..c656f81ee 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    @@ -375,15 +375,6 @@ public class ObjectFactory {
     		return new JAXBElement(_CurrentStudiesSupplement_QNAME, CurrentStudiesType.class, null, value);
     	}
     
    -	/**
    -	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
    -	 * 
    -	 */
    -	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
    -	public JAXBElement createMandate(MandateType value) {
    -		return new JAXBElement(_Mandate_QNAME, MandateType.class, null, value);
    -	}
    -
     	/**
     	 * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}
     	 * 
    @@ -393,6 +384,15 @@ public class ObjectFactory {
     		return new JAXBElement(_RequestedAttribute_QNAME, RequestedAttributeType.class, null, value);
     	}
     
    +	/**
    +	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
    +	 *
    +	 */
    +	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
    +	public JAXBElement createMandate(MandateType value) {
    +		return new JAXBElement(_Mandate_QNAME, MandateType.class, null, value);
    +	}
    +
     	/**
     	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
     	 * 
    diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
    index 36df747e4..590e8f4c3 100644
    --- a/id/server/stork2-saml-engine/pom.xml
    +++ b/id/server/stork2-saml-engine/pom.xml
    @@ -13,7 +13,7 @@
     	STORKSAMLEngine
     	
     		UTF-8
    -		1.4.0
    +		1.5.1
     		0.5.2
     		0.5.1
     		1.4.0
    @@ -49,17 +49,12 @@
     			eu.stork
     			Commons
     			${commons.version}
    -
     		
     
     		
     			org.opensaml
     			opensaml
    +			${opensaml.version}
     			
     				
     					org.slf4j
    -- 
    cgit v1.2.3
    
    
    From 7d6f5207275778350bff8f23087fe1c905210e2b Mon Sep 17 00:00:00 2001
    From: Florian Reimair 
    Date: Tue, 11 Aug 2015 13:38:53 +0200
    Subject: accepted complex attributes xsd
    
    ---
     .../tc/stork/_1_0/assertion/ObjectFactory.java     |  26 ---
     .../resources/schema/StorkcomplexAttributes.xsd    | 240 ++++++++++-----------
     .../peps/configuration/ConfigurationCreator.java   |   1 +
     3 files changed, 114 insertions(+), 153 deletions(-)
    
    diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    index c656f81ee..02db708c6 100644
    --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
    @@ -31,7 +31,6 @@ public class ObjectFactory {
     	private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel");
     	private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff");
     	private final static QName _MandateContent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandateContent");
    -	private final static QName _IsHealthCareProfessionalDeprecated_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional_deprecated");
     	private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress");
     	private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry");
     	private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff");
    @@ -118,14 +117,6 @@ public class ObjectFactory {
     		return new CanonicalAddressType();
     	}
     
    -	/**
    -	 * Create an instance of {@link IsHealthCareProfessionalDeprecatedType }
    -	 * 
    -	 */
    -	public IsHealthCareProfessionalDeprecatedType createIsHealthCareProfessionalDeprecatedType() {
    -		return new IsHealthCareProfessionalDeprecatedType();
    -	}
    -
     	/**
     	 * Create an instance of {@link MandateContentType }
     	 * 
    @@ -230,14 +221,6 @@ public class ObjectFactory {
     		return new TransactionLimitRestrictionType();
     	}
     
    -	/**
    -	 * Create an instance of {@link IsHCPType }
    -	 * 
    -	 */
    -	// public IsHCPType createIsHCPType() {
    -	// return new IsHCPType();
    -	// }
    -
     	/**
     	 * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >}
     	 * 
    @@ -301,15 +284,6 @@ public class ObjectFactory {
     		return new JAXBElement(_MandateContent_QNAME, MandateContentType.class, null, value);
     	}
     
    -	/**
    -	 * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalDeprecatedType }{@code >}
    -	 * 
    -	 */
    -	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional_deprecated")
    -	public JAXBElement createIsHealthCareProfessionalDeprecated(IsHealthCareProfessionalDeprecatedType value) {
    -		return new JAXBElement(_IsHealthCareProfessionalDeprecated_QNAME, IsHealthCareProfessionalDeprecatedType.class, null, value);
    -	}
    -
     	/**
     	 * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}
     	 * 
    diff --git a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
    index d1c782f52..6db304388 100644
    --- a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
    +++ b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
    @@ -1,15 +1,9 @@
     
    -
    -	
    -	
    +
    +	
    +	
     	
    -	
    +	
     	
     	
     	
    @@ -21,10 +15,8 @@
     	
     	
     	
    -	
    -	
    +	
    +	
     	
     	
     	
    @@ -35,11 +27,8 @@
     	
     	
     	
    -	
     	
    -	
    +	
     	
     	
     	
    @@ -120,15 +109,12 @@
     		
     			
     			
    -			
    +			
     			
     			
     			
    -			
    -			
    +			
    +			
     		
     	
     	
    @@ -137,18 +123,15 @@
     			
     			
     			
    -			
    +			
     		
     	
     	
     		
     			
     			
    -			
    -			
    +			
    +			
     		
     	
     	
    @@ -156,43 +139,37 @@
     			
     			
     			
    -			
    +			
     		
     	
     	
     		
     			
    -			
    +			
     		
     	
     	
     		
     			
    -			
    +			
     		
     	
     	
     		
     			
    -			
    +			
     		
     	
     	
     		
     			
    -			
    +			
     		
     	
     	
     		
     			
    -			
    +			
     		
     	
     	
    @@ -200,8 +177,7 @@
     			
     			
     			
    -			
    +			
     		
     	
     	
    @@ -233,42 +209,39 @@
     			
     		
     	
    -	
    -	
    -	
    -	
    -	
    -	
    -	
    -	
    -	
    -	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
    +	
     	
     		
     			
    -			
    +			
     			
     			
    -
     			
    -			
    +			
     			
     			
     			
     			
     			
    -			
    +			
     		
     	
     	
     		
     			
     			
    -			
    +			
     			
    -			
    +			
     		
     	
     	
    @@ -291,24 +264,44 @@
     			
     			
     			
    -			
    +			
     		
     	
     	
     		
     			
    -			
    +			
     		
     	
    -	
    +	
     		
    +			
    +				
    +					
    +						
    +						
    +						
    +						
    +						
    +						
    +						
    +						
    +					
    +				
    +			
     			
    -			
    -			
    -			
    +			
    +				
    +					
    +						
    +						
    +						
    +						
    +						
    +					
    +				
    +			
    +			
     		
     	
     	
    @@ -319,8 +312,7 @@
     				
     				
     			
    -			
    +			
     			
     		
     	
    @@ -332,30 +324,57 @@
     			
     			
     			
    -			
    +			
     			
     		
     	
     	
    -	
    +	
     	
     	
     		
    @@ -363,37 +382,4 @@
     			
     		
     	
    -
    -	
    -		
    -			
    -				
    -					
    -						
    -						
    -						
    -						
    -						
    -						
    -						
    -						
    -					
    -				
    -			
    -			
    -			
    -				
    -					
    -						
    -						
    -						
    -						
    -						
    -					
    -				
    -			
    -			
    -		
    -	
    -
    +
    \ No newline at end of file
    diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    index c0197b9db..e513c6add 100644
    --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
    @@ -14,6 +14,7 @@
      */
     package eu.stork.peps.configuration;
     
    +import java.io.FileInputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.util.HashMap;
    -- 
    cgit v1.2.3
    
    
    From 04381eb4e2d67ced539b34747403bb06cdf36c53 Mon Sep 17 00:00:00 2001
    From: Florian Reimair 
    Date: Tue, 11 Aug 2015 14:30:07 +0200
    Subject: poms
    
    ---
     id/server/stork2-commons/pom.xml     | 26 +-----------------------
     id/server/stork2-saml-engine/pom.xml | 39 ++++++++----------------------------
     2 files changed, 9 insertions(+), 56 deletions(-)
    
    diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
    index c4eea5152..3bc3dae77 100644
    --- a/id/server/stork2-commons/pom.xml
    +++ b/id/server/stork2-commons/pom.xml
    @@ -12,8 +12,7 @@
     	Stork Commons
     	
     		UTF-8
    -		1.4.0
    -		2.6.3
    +		1.5.1
     	
     	${stork.version}
       
    @@ -56,7 +55,6 @@
     		
     			org.opensaml
     			opensaml
    -			${opensaml.version}
     			
     				
     				    org.slf4j
    @@ -86,7 +84,6 @@
     		
     			javax.servlet
     			servlet-api
    -			2.5
     			provided
     		
     
    @@ -136,27 +133,6 @@
     			
     		
     		
    -		
    -		           	 
    -
    -		
     			
     				org.apache.maven.plugins
     				maven-javadoc-plugin
    diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
    index 590e8f4c3..4effa9d1c 100644
    --- a/id/server/stork2-saml-engine/pom.xml
    +++ b/id/server/stork2-saml-engine/pom.xml
    @@ -16,8 +16,7 @@
     		1.5.1
     		0.5.2
     		0.5.1
    -		1.4.0
    -		2.6.2
    +		1.5.1
     		${maven.build.timestamp}
     		${basedir}/../../../repository
     	
    @@ -50,11 +49,16 @@
     			Commons
     			${commons.version}
     		
    +		
    +		
    +			org.opensaml
    +			xmltooling
    +        
    +		
     
     		
     			org.opensaml
     			opensaml
    -			${opensaml.version}
     			
     				
     					org.slf4j
    @@ -83,11 +87,6 @@
     			
     		
     
    -        
    -            org.opensaml
    -            xmltooling
    -            
    -
     		
     			org.slf4j
     			slf4j-api
    @@ -101,10 +100,9 @@
     			org.slf4j
     			jcl-over-slf4j
     		
    -
     		
     			org.slf4j
    @@ -148,30 +146,9 @@
     						true
     					
     				
    -										
     			
     		
     		
    -		
    -
    -		
     			
     				org.apache.maven.plugins
     				maven-source-plugin
    -- 
    cgit v1.2.3